X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/6dcd087abcf718fcaf9aca9283b6b39b9dbbcdcb..98cd01c40dde8ddf41d9f2c50329004840aa9856:/app/assets/javascripts/leaflet.share.js

diff --git a/app/assets/javascripts/leaflet.share.js b/app/assets/javascripts/leaflet.share.js
index a9fe4dccf..a32dfc20b 100644
--- a/app/assets/javascripts/leaflet.share.js
+++ b/app/assets/javascripts/leaflet.share.js
@@ -34,7 +34,7 @@ L.OSM.share = function (options) {
         $('<h4>')
           .text(I18n.t('javascripts.share.title')));
 
-    // Link
+    // Link / Embed
 
     var $linkSection = $('<div>')
       .attr('class', 'section share-link')
@@ -61,56 +61,67 @@ L.OSM.share = function (options) {
               .bind('change', toggleMarker))
           .append(I18n.t('javascripts.share.include_marker')));
 
-    var $shortLink, $longLink;
-
-    $('<ul>')
-      .appendTo($linkSection)
-      .append($('<li>')
-        .append($longLink = $('<a>')
-          .text(I18n.t('javascripts.share.long_link'))))
-      .append($('<li>')
-        .append($shortLink = $('<a>')
-          .text(I18n.t('javascripts.share.short_link'))));
-
-    // Embeddable HTML
-
-    var $embedSection = $('<div>')
-      .attr('class', 'section share-html')
-      .appendTo($ui);
-
-    $('<h4>')
-      .text(I18n.t('javascripts.share.embed'))
-      .appendTo($embedSection);
+    $('<div>')
+      .attr('class', 'share-tabs')
+      .appendTo($form)
+      .append($('<label>')
+        .attr('class', 'active')
+        .attr('for', 'long_input')
+        .text(I18n.t('javascripts.share.long_link')))
+      .append($('<label>')
+        .attr('for', 'short_input')
+        .text(I18n.t('javascripts.share.short_link')))
+      .append($('<label>')
+        .attr('for', 'embed_html')
+        .text(I18n.t('javascripts.share.embed')))
+      .on('click', 'label', function() {
+        var id = '#' + $(this).attr('for');
+        $linkSection.find('.share-tabs label')
+          .removeClass('active');
+        $(this).addClass('active');
+        $linkSection.find('.share-tab').hide();
+        $linkSection.find('.share-tab:has(' + id + ')').show();
+      });
 
-    $form = $('<form>')
-      .attr('class', 'standard-form')
-      .appendTo($embedSection);
+    $('<div>')
+      .attr('class', 'form-row share-tab')
+      .css('display', 'block')
+      .appendTo($form)
+      .append($('<input>')
+        .attr('id', 'long_input')
+        .attr('type', 'text')
+        .on('click', select))
+      .append($('<a>')
+        .attr('id', 'long_link')
+        .on('click', function() { return false; })
+        .append($('<span>')
+          .attr('class', 'icon link')));
 
     $('<div>')
-      .attr('class', 'form-row')
+      .attr('class', 'form-row share-tab')
       .appendTo($form)
-      .append(
-        $('<label>')
-          .attr('for', 'embed_marker')
-          .append(
-            $('<input>')
-              .attr('id', 'embed_marker')
-              .attr('type', 'checkbox')
-              .bind('change', toggleMarker))
-          .append(I18n.t('javascripts.share.include_marker')));
+      .append($('<input>')
+        .attr('id', 'short_input')
+        .attr('type', 'text')
+        .on('click', select))
+      .append($('<a>')
+        .attr('id', 'short_link')
+        .on('click', function() { return false; })
+        .append($('<span>')
+          .attr('class', 'icon link')));
 
     $('<div>')
-      .attr('class', 'form-row')
+      .attr('class', 'form-row share-tab')
       .appendTo($form)
       .append(
         $('<textarea>')
           .attr('id', 'embed_html')
-          .on('click', select));
-
-    $('<p>')
-      .attr('class', 'deemphasize')
-      .text(I18n.t('javascripts.share.paste_html'))
-      .appendTo($embedSection);
+          .on('click', select))
+      .append(
+        $('<p>')
+          .attr('class', 'deemphasize')
+          .text(I18n.t('javascripts.share.paste_html'))
+          .appendTo($linkSection));
 
     // Image
 
@@ -226,6 +237,7 @@ L.OSM.share = function (options) {
 
     function toggleMarker() {
       if ($(this).is(':checked')) {
+        marker.setLatLng(map.getCenter());
         map.addLayer(marker);
       } else {
         map.removeLayer(marker);
@@ -247,17 +259,24 @@ L.OSM.share = function (options) {
     }
 
     function update() {
+      if (map.hasLayer(marker)) {
+        map.panTo(marker.getLatLng());
+      }
+
       var bounds = map.getBounds();
 
-      $('#link_marker, #embed_marker')
+      $('#link_marker')
         .prop('checked', map.hasLayer(marker));
 
-      // Link
+      $('#image_filter')
+        .prop('checked', locationFilter.isEnabled());
 
-      $shortLink.attr('href', map.getShortUrl(marker));
-      $longLink.attr('href', map.getUrl(marker));
+      // Link / Embed
 
-      // Embed
+      $('#short_input').val(map.getShortUrl(marker));
+      $('#long_input').val(map.getUrl(marker));
+      $('#short_link').attr('href', map.getShortUrl(marker));
+      $('#long_link').attr('href', map.getUrl(marker));
 
       var params = {
         bbox: bounds.toBBoxString(),
@@ -270,9 +289,9 @@ L.OSM.share = function (options) {
 
       $('#embed_html').val(
         '<iframe width="425" height="350" frameborder="0" scrolling="no" marginheight="0" marginwidth="0" src="' +
-          'http://' + OSM.SERVER_URL + '/export/embed.html?' + $.param(params) +
+          escapeHTML('http://' + OSM.SERVER_URL + '/export/embed.html?' + $.param(params)) +
           '" style="border: 1px solid black"></iframe><br/>' +
-          '<small><a href="' + map.getUrl(marker) + '</a></small>');
+          '<small><a href="' + escapeHTML(map.getUrl(marker)) + '</a></small>');
 
       // Image