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

Use https to launch the remote editor except for modern browsers

Browse source 
Currently only Chrome 53+ and Firefox 55+ are known to support loading
of http resources from localhost for an https page.
This commit is contained in:
Tom Hughes 2018-05-15 14:08:57 +01:00
parent c77c7d015f
commit 50f85248db
4 changed files with 632 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -20,6 +20,7 @@
//= require index/changeset
//= require index/query
//= require router
//= require bowser
$(document).ready(function () {
var loaderTimeout;
@ -241,7 +242,7 @@ $(document).ready(function () {
function remoteEditHandler(bbox, object) {
var loaded = false,
url = "http://127.0.0.1:8111/load_and_zoom?",
url,
query = {
left: bbox.getWest() - 0.0001,
top: bbox.getNorth() + 0.0001,
@ -249,6 +250,13 @@ $(document).ready(function () {
bottom: bbox.getSouth() - 0.0001
};
if (location.protocol === 'http' ||
bowser.check({chrome: "53", firefox: "55"})) {
url = "http://127.0.0.1:8111/load_and_zoom?";
} else {
url = "https://127.0.0.1:8112/load_and_zoom?";
}
if (object) query.select = object.type + object.id;
var iframe = $('<iframe>')