Merge branch 'master' into tag-colour-preview-rebase

[rails.git] / app / assets / javascripts / index / browse.js

diff --git a/app/assets/javascripts/index/browse.js b/app/assets/javascripts/index/browse.js
index 28a830858f2534168629fb1f86385b0d19285a69..6309444110a1206f7f22e57a2d54f02c3d5422ee 100644 (file)
--- a/app/assets/javascripts/index/browse.js
+++ b/app/assets/javascripts/index/browse.js
@@ -26,17 +26,17 @@ OSM.initializeBrowse = function (map) {
     onSelect(e.layer);
   });
 
     onSelect(e.layer);
   });
 

-  map.on('layeradd', function (e) {
+  map.on("layeradd", function (e) {

     if (e.layer === dataLayer) {
       map.on("moveend", updateData);
       updateData();
     }
   });
 
     if (e.layer === dataLayer) {
       map.on("moveend", updateData);
       updateData();
     }
   });
 

-  map.on('layerremove', function (e) {
+  map.on("layerremove", function (e) {

     if (e.layer === dataLayer) {
       map.off("moveend", updateData);
     if (e.layer === dataLayer) {
       map.off("moveend", updateData);

-      $('#browse_status').empty();
+      $("#browse_status").empty();

     }
   });
 
     }
   });
 


@@ -48,7 +48,7 @@ OSM.initializeBrowse = function (map) {
   }
 
   function displayFeatureWarning(count, limit, add, cancel) {
   }
 
   function displayFeatureWarning(count, limit, add, cancel) {

-    $('#browse_status').html(
+    $("#browse_status").html(

       $("<p class='warning'></p>")
         .text(I18n.t("browse.start_rjs.feature_warning", { num_features: count, max_features: limit }))
         .prepend(
       $("<p class='warning'></p>")
         .text(I18n.t("browse.start_rjs.feature_warning", { num_features: count, max_features: limit }))
         .prepend(


@@ -56,7 +56,7 @@ OSM.initializeBrowse = function (map) {
             .click(cancel))
         .append(
           $("<input type='submit'>")
             .click(cancel))
         .append(
           $("<input type='submit'>")

-            .val(I18n.t('browse.start_rjs.load_data'))
+            .val(I18n.t("browse.start_rjs.load_data"))

             .click(add)));
   }
 
             .click(add)));
   }
 


@@ -92,13 +92,13 @@ OSM.initializeBrowse = function (map) {
         var features = dataLayer.buildFeatures(xml);
 
         function addFeatures() {
         var features = dataLayer.buildFeatures(xml);
 
         function addFeatures() {

-          $('#browse_status').empty();
+          $("#browse_status").empty();

           dataLayer.addData(features);
           browseBounds = bounds;
         }
 
         function cancelAddFeatures() {
           dataLayer.addData(features);
           browseBounds = bounds;
         }
 
         function cancelAddFeatures() {

-          $('#browse_status').empty();
+          $("#browse_status").empty();

         }
 
         if (features.length < maxFeatures) {
         }
 
         if (features.length < maxFeatures) {


@@ -120,9 +120,9 @@ OSM.initializeBrowse = function (map) {
 
     // Redraw in selected style
     layer.originalStyle = layer.options;
 
     // Redraw in selected style
     layer.originalStyle = layer.options;

-    layer.setStyle({color: '#0000ff', weight: 8});
+    layer.setStyle({ color: "#0000ff", weight: 8 });

 
 

-    OSM.router.route('/' + layer.feature.type + '/' + layer.feature.id);
+    OSM.router.route("/" + layer.feature.type + "/" + layer.feature.id);

 
     // Stash the currently drawn feature
     selectedLayer = layer;
 
     // Stash the currently drawn feature
     selectedLayer = layer;