From: Tom Hughes <tom@compton.nu>
Date: Mon, 5 Feb 2018 21:03:45 +0000 (+0000)
Subject: Use configured server protocol for shared URLs
X-Git-Tag: live~3173
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/83d97699ccde00436a5f08a9e35e1bc1cd26f2e3?ds=inline

Use configured server protocol for shared URLs

Closes #939
---

diff --git a/app/assets/javascripts/leaflet.share.js b/app/assets/javascripts/leaflet.share.js
index 7cfd50c8e..044c767cf 100644
--- a/app/assets/javascripts/leaflet.share.js
+++ b/app/assets/javascripts/leaflet.share.js
@@ -346,7 +346,7 @@ L.OSM.share = function (options) {
 
       $('#embed_html').val(
         '<iframe width="425" height="350" frameborder="0" scrolling="no" marginheight="0" marginwidth="0" src="' +
-          escapeHTML('http://' + OSM.SERVER_URL + '/export/embed.html?' + $.param(params)) +
+          escapeHTML(OSM.SERVER_PROTOCOL + '://' + OSM.SERVER_URL + '/export/embed.html?' + $.param(params)) +
           '" style="border: 1px solid black"></iframe><br/>' +
           '<small><a href="' + escapeHTML(map.getUrl(marker)) + '">' +
           escapeHTML(I18n.t('javascripts.share.view_larger_map')) + '</a></small>');
diff --git a/app/assets/javascripts/osm.js.erb b/app/assets/javascripts/osm.js.erb
index 971f80be3..a67117510 100644
--- a/app/assets/javascripts/osm.js.erb
+++ b/app/assets/javascripts/osm.js.erb
@@ -6,6 +6,7 @@ OSM = {
 <% end %>
 
   MAX_REQUEST_AREA:        <%= MAX_REQUEST_AREA.to_json %>,
+  SERVER_PROTOCOL:         <%= SERVER_PROTOCOL.to_json %>,
   SERVER_URL:              <%= SERVER_URL.to_json %>,
   API_VERSION:             <%= API_VERSION.to_json %>,
   STATUS:                  <%= STATUS.to_json %>,