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.

3 files changed, 3 insertions, 14 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;
diff --git a/web/viewsjs/relation.js.erb b/web/viewsjs/relation.js.erb
index ad34fc3..2a23d57 100644
--- a/web/viewsjs/relation.js.erb
+++ b/web/viewsjs/relation.js.erb
@@ -259,11 +259,7 @@ function create_role_chart(data) {
 }
 
 function page_init() {
-    jQuery('#josm_button').bind('click', function() {
-        jQuery('#josmiframe')[0].src = jQuery('#josm_button')[0].href;
-        return false;
-    });
-
     up = function() { window.location = '/relations'; };
+    activate_josm_button();
     page_init2();
 }
diff --git a/web/viewsjs/tag.js.erb b/web/viewsjs/tag.js.erb
index 4cf5908..ebefcc1 100644
--- a/web/viewsjs/tag.js.erb
+++ b/web/viewsjs/tag.js.erb
@@ -134,10 +134,7 @@ var create_flexigrid_for = {
 };
 
 function page_init() {
-    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;