Add a close icon to the feature warning panel
authorTom Hughes <tom@compton.nu>
Wed, 18 Dec 2013 00:14:29 +0000 (00:14 +0000)
committerTom Hughes <tom@compton.nu>
Wed, 18 Dec 2013 00:14:29 +0000 (00:14 +0000)
Fixes #660

app/assets/javascripts/index/browse.js

index 47d8418b1ae1e9dd58da5a9e1eeb2f147fb068e0..5db23a975f5d8bebee6e29f54f5edca31d6056ef 100644 (file)
@@ -47,14 +47,17 @@ function initializeBrowse(map) {
     }
   }
 
-  function displayFeatureWarning(count, limit, callback) {
+  function displayFeatureWarning(count, limit, add, cancel) {
     $('#browse_status').html(
       $("<p class='warning'></p>")
         .text(I18n.t("browse.start_rjs.feature_warning", { num_features: count, max_features: limit }))
+        .prepend(
+          $("<span class='icon close'></span>")
+            .click(cancel))
         .append(
           $("<input type='submit'>")
             .val(I18n.t('browse.start_rjs.load_data'))
-            .click(callback)));
+            .click(add)));
   }
 
   var dataLoader;
@@ -91,16 +94,20 @@ function initializeBrowse(map) {
         function addFeatures() {
           $('#browse_status').empty();
           dataLayer.addData(features);
+          browseBounds = bounds;
+        }
+
+        function cancelAddFeatures() {
+          $('#browse_status').empty();
         }
 
         if (features.length < maxFeatures) {
           addFeatures();
         } else {
-          displayFeatureWarning(features.length, maxFeatures, addFeatures);
+          displayFeatureWarning(features.length, maxFeatures, addFeatures, cancelAddFeatures);
         }
 
         dataLoader = null;
-        browseBounds = bounds;
       }
     });
   }