Add "Center map on marker" option

[rails.git] / app / assets / javascripts / leaflet.share.js

diff --git a/app/assets/javascripts/leaflet.share.js b/app/assets/javascripts/leaflet.share.js
index 1f13bf60966ca8e74338a82b453510cb7f976012..4264e56161f1c921b94163f3d8cf5a629da67963 100644 (file)
--- 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')));
 
         $('<h4>')
           .text(I18n.t('javascripts.share.title')));
 

-    // Link
+    // Link / Embed

 
     var $linkSection = $('<div>')
       .attr('class', 'section share-link')
 
     var $linkSection = $('<div>')
       .attr('class', 'section share-link')


@@ -61,47 +61,56 @@ L.OSM.share = function (options) {
               .bind('change', toggleMarker))
           .append(I18n.t('javascripts.share.include_marker')));
 
               .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);
-
-    $form = $('<form>')
-      .attr('class', 'standard-form')
-      .appendTo($embedSection);
-

     $('<div>')
       .attr('class', 'form-row')
       .appendTo($form)
       .append(
         $('<label>')
     $('<div>')
       .attr('class', 'form-row')
       .appendTo($form)
       .append(
         $('<label>')

-          .attr('for', 'embed_marker')
+          .attr('for', 'center_marker')

           .append(
             $('<input>')
           .append(
             $('<input>')

-              .attr('id', 'embed_marker')
+              .attr('id', 'center_marker')

               .attr('type', 'checkbox')
               .attr('type', 'checkbox')

-              .bind('change', toggleMarker))
-          .append(I18n.t('javascripts.share.include_marker')));
+              .prop('checked', true)
+              .bind('change', update))
+          .append(I18n.t('javascripts.share.center_marker')));
+
+    $('<div>')
+      .attr('class', 'form-row')
+      .appendTo($form)
+      .append($('<label>')
+        .attr('for', 'long_input')
+        .text(I18n.t('javascripts.share.long_link')))
+      .append($('<a>')
+        .attr('id', 'long_link')
+        .append($('<span>')
+          .attr('class', 'icon link')))
+      .append($('<input>')
+        .attr('id', 'long_input')
+        .attr('type', 'text')
+        .on('click', select));
+
+    $('<div>')
+      .attr('class', 'form-row')
+      .appendTo($form)
+      .append($('<label>')
+        .attr('for', 'short_input')
+        .text(I18n.t('javascripts.share.short_link')))
+      .append($('<a>')
+        .attr('id', 'short_link')
+        .append($('<span>')
+          .attr('class', 'icon link')))
+      .append($('<input>')
+        .attr('id', 'short_input')
+        .attr('type', 'text')
+        .on('click', select));

 
     $('<div>')
       .attr('class', 'form-row')
       .appendTo($form)
 
     $('<div>')
       .attr('class', 'form-row')
       .appendTo($form)

+      .append($('<label>')
+        .attr('for', 'embed_html')
+        .text(I18n.t('javascripts.share.embed')))

       .append(
         $('<textarea>')
           .attr('id', 'embed_html')
       .append(
         $('<textarea>')
           .attr('id', 'embed_html')


@@ -110,7 +119,7 @@ L.OSM.share = function (options) {
     $('<p>')
       .attr('class', 'deemphasize')
       .text(I18n.t('javascripts.share.paste_html'))
     $('<p>')
       .attr('class', 'deemphasize')
       .text(I18n.t('javascripts.share.paste_html'))

-      .appendTo($embedSection);
+      .appendTo($linkSection);

 
     // Image
 
 
     // Image
 


@@ -248,20 +257,27 @@ L.OSM.share = function (options) {
     }
 
     function update() {
     }
 
     function update() {

+      if (map.hasLayer(marker) && $('#center_marker').is(':checked')) {
+        map.panTo(marker.getLatLng());
+      }
+

       var bounds = map.getBounds();
 
       var bounds = map.getBounds();
 

-      $('#link_marker, #embed_marker')
+      $('#link_marker')

         .prop('checked', map.hasLayer(marker));
 
         .prop('checked', map.hasLayer(marker));
 

+      $('#center_marker')
+        .prop('disabled', !map.hasLayer(marker));
+

       $('#image_filter')
         .prop('checked', locationFilter.isEnabled());
 
       $('#image_filter')
         .prop('checked', locationFilter.isEnabled());
 

-      // Link
-
-      $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(),
 
       var params = {
         bbox: bounds.toBBoxString(),