From: Tom Hughes Date: Sat, 13 Jan 2018 10:35:42 +0000 (+0000) Subject: Merge remote-tracking branch 'upstream/pull/1707' X-Git-Tag: live~3232 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/9cf698322ce70e2fdb718be6624b0ac4e8eaf285?hp=d98741690124a266da0d1a0cfe348f7ec78e5e9f Merge remote-tracking branch 'upstream/pull/1707' --- diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js index 00e6a9d32..4ea643b26 100644 --- 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 9d1338ab5..a51dad875 100644 --- 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],