From: Tom Hughes <tom@compton.nu>
Date: Tue, 1 Apr 2014 18:17:15 +0000 (+0100)
Subject: Add support for remote edit over https on port 8112
X-Git-Tag: live~4450
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/5e5c6b3a29ac682227b7224f08f4f3b22b925385

Add support for remote edit over https on port 8112
---

diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 6ac398fc5..09ae367f4 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -22,19 +22,22 @@ var querystring = require('querystring-component');
 
 function remoteEditHandler(bbox, object) {
   var loaded = false,
-      query = {
-          left: bbox.getWest() - 0.0001,
-          top: bbox.getNorth() + 0.0001,
-          right: bbox.getEast() + 0.0001,
-          bottom: bbox.getSouth() - 0.0001
-      };
+    url = document.location.protocol === "https:" ?
+            "https://127.0.0.1:8112/load_and_zoom?" :
+            "http://127.0.0.1:8111/load_and_zoom?",
+    query = {
+        left: bbox.getWest() - 0.0001,
+        top: bbox.getNorth() + 0.0001,
+        right: bbox.getEast() + 0.0001,
+        bottom: bbox.getSouth() - 0.0001
+    };
 
   if (object) query.select = object.type + object.id;
 
   var iframe = $('<iframe>')
     .hide()
     .appendTo('body')
-    .attr("src", "http://127.0.0.1:8111/load_and_zoom?" + querystring.stringify(query))
+    .attr("src", url + querystring.stringify(query))
     .on('load', function() {
       $(this).remove();
       loaded = true;