Avoid mixed content warnings for the MapQuest logo

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

diff --git a/app/assets/javascripts/leaflet.layers.js b/app/assets/javascripts/leaflet.layers.js
index d6276919c892da8065691009ae6770a41d3d9917..443e47e7600d1d313b7dec25bf8063df56d79e67 100644 (file)
--- a/app/assets/javascripts/leaflet.layers.js
+++ b/app/assets/javascripts/leaflet.layers.js
@@ -121,9 +121,7 @@ L.OSM.layers = function(options) {
         .appendTo(overlaySection);
 
       function addOverlay(layer, name, maxArea) {
         .appendTo(overlaySection);
 
       function addOverlay(layer, name, maxArea) {

-        var refName = name.split(' ').join('_').toLowerCase();

         var item = $('<li>')
         var item = $('<li>')

-          .attr('class', refName)

           .tooltip({
             placement: 'top'
           })
           .tooltip({
             placement: 'top'
           })


@@ -139,7 +137,7 @@ L.OSM.layers = function(options) {
           .prop('checked', checked)
           .appendTo(label);
 
           .prop('checked', checked)
           .appendTo(label);
 

-        label.append(name);
+        label.append(I18n.t('javascripts.map.layers.' + name));

 
         input.on('change', function() {
           checked = input.is(':checked');
 
         input.on('change', function() {
           checked = input.is(':checked');


@@ -168,16 +166,14 @@ L.OSM.layers = function(options) {
               .trigger('change');
           }
 
               .trigger('change');
           }
 

-          layer.fire('statechange', {disabled: disabled, checked: checked});
-

           $(item).attr('class', disabled ? 'disabled' : '');
           item.attr('data-original-title', disabled ?
           $(item).attr('class', disabled ? 'disabled' : '');
           item.attr('data-original-title', disabled ?

-            I18n.t('javascripts.site.' + refName + '_zoom_in_tooltip') : '');
+            I18n.t('javascripts.site.map_' + name + '_zoom_in_tooltip') : '');

         });
       }
 
         });
       }
 

-      addOverlay(map.noteLayer, I18n.t('javascripts.map.layers.notes'), OSM.MAX_NOTE_REQUEST_AREA);
-      addOverlay(map.dataLayer, I18n.t('javascripts.map.layers.data'), OSM.MAX_REQUEST_AREA);
+      addOverlay(map.noteLayer, 'notes', OSM.MAX_NOTE_REQUEST_AREA);
+      addOverlay(map.dataLayer, 'data', OSM.MAX_REQUEST_AREA);

     }
 
     options.sidebar.addPane($ui);
     }
 
     options.sidebar.addPane($ui);