Merge remote-tracking branch 'upstream/pull/1707'

diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js
index 00e6a9d32a0d815b05676e0428540fc6a82ac16a..4ea643b261e68b676ae640c9e01cc9e24ba48449 100644 (file)
--- a/app/assets/javascripts/index.js
+++ b/app/assets/javascripts/index.js
@@ -241,9 +241,7 @@ $(document).ready(function () {
 
   function remoteEditHandler(bbox, object) {
     var loaded = false,
-        url = document.location.protocol === "https:" ?
-        "https://127.0.0.1:8112/load_and_zoom?" :
-        "http://127.0.0.1:8111/load_and_zoom?",
+        url = "http://127.0.0.1:8111/load_and_zoom?",
         query = {
           left: bbox.getWest() - 0.0001,
           top: bbox.getNorth() + 0.0001,

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 9d1338ab5741fedac275827427294587176bb31b..a51dad8755f7ad8494cf919e9e86b7b94a18f595 100644 (file)
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -413,7 +413,7 @@ class ApplicationController < ActionController::Base
 
   def map_layout
     append_content_security_policy_directives(
-      :child_src => %w[127.0.0.1:8111 127.0.0.1:8112],
+      :child_src => %w[127.0.0.1:8111],
       :connect_src => %w[nominatim.openstreetmap.org overpass-api.de router.project-osrm.org],
       :form_action => %w[render.openstreetmap.org],
       :script_src => %w[graphhopper.com open.mapquestapi.com],