cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Tom Hughes 2024-12-08 14:55:55 +00:00
commit 7b05c1c060
2 changed files with 5 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

18
app/assets/javascripts/index.js
View file

@ -255,20 +255,10 @@ $(document).ready(function () {
});
function sendRemoteEditCommand(url, callback) {
var iframe = $("<iframe>");
var timeoutId = setTimeout(function () {
alert(I18n.t("site.index.remote_failed"));
iframe.remove();
}, 5000);
iframe
.hide()
.appendTo("body")
.attr("src", url)
.on("load", function () {
clearTimeout(timeoutId);
iframe.remove();
if (callback) callback();
fetch(url, { mode: "no-cors", signal: AbortSignal.timeout(5000) })
.then(callback)
.catch(function () {
alert(I18n.t("site.index.remote_failed"));
});
}

4
app/controllers/application_controller.rb
View file

@ -253,9 +253,7 @@ class ApplicationController < ActionController::Base
def map_layout
policy = request.content_security_policy.clone
policy.child_src(*policy.child_src, "http://127.0.0.1:8111", "https://127.0.0.1:8112")
policy.frame_src(*policy.frame_src, "http://127.0.0.1:8111", "https://127.0.0.1:8112")
policy.connect_src(*policy.connect_src, Settings.nominatim_url, Settings.overpass_url, Settings.fossgis_osrm_url, Settings.graphhopper_url, Settings.fossgis_valhalla_url)
policy.connect_src(*policy.connect_src, "http://127.0.0.1:8111", Settings.nominatim_url, Settings.overpass_url, Settings.fossgis_osrm_url, Settings.graphhopper_url, Settings.fossgis_valhalla_url)
policy.form_action(*policy.form_action, "render.openstreetmap.org")
policy.style_src(*policy.style_src, :unsafe_inline)