diff options
| author | Jochen Topf <jochen@topf.org> | 2015-03-06 14:31:01 +0100 |
|---|---|---|
| committer | Jochen Topf <jochen@topf.org> | 2015-03-06 14:31:01 +0100 |
| commit | 0e97f9b3773585d8fb76659dc710726a888c4851 (patch) | |
| tree | 3a661df17daeb5d5558f7d41530693e4e6631c53 /web/viewsjs/key.js.erb | |
| parent | 75a1deefaea0d94c2ef024bf272c6076447fa444 (diff) | |
| download | taginfo-0e97f9b3773585d8fb76659dc710726a888c4851.tar taginfo-0e97f9b3773585d8fb76659dc710726a888c4851.tar.gz | |
Make JOSM button work in https mode.
The JOSM button now contacts JOSM on http://localhost:8111/ if the taginfo page
is using http and https://localhost:8112/ if it is using https. This way we
don't have a problem with mixed content.
Also the way JOSM is called now works without the iframes which were a hack
around the (then) missing CORS ability.
Diffstat (limited to 'web/viewsjs/key.js.erb')
| -rw-r--r-- | web/viewsjs/key.js.erb | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/web/viewsjs/key.js.erb b/web/viewsjs/key.js.erb index 8f19ab2..e9886f1 100644 --- a/web/viewsjs/key.js.erb +++ b/web/viewsjs/key.js.erb @@ -218,11 +218,7 @@ function create_chart(params) { function page_init() { up = function() { window.location = '/keys'; } - - jQuery('#josm_button').bind('click', function() { - jQuery('#josmiframe')[0].src = jQuery('#josm_button')[0].href; - return false; - }); + activate_josm_button(); jQuery('#filter').bind('change', function() { var value = this.value; |