Remove use of jQuery toggle() function

diff --git a/app/assets/javascripts/index/browse.js b/app/assets/javascripts/index/browse.js
index 5ca29e56822292812b2ba061f50eefd609378180..dcea8e0c0b209ca1528c7765f8efa933bc0a4552 100644 (file)
--- a/app/assets/javascripts/index/browse.js
+++ b/app/assets/javascripts/index/browse.js
@@ -69,10 +69,10 @@ $(document).ready(function () {
     map.on("moveend", updateData);
     updateData();
 
     map.on("moveend", updateData);
     updateData();
 

-    $("#browse_filter_toggle").toggle(enableFilter, disableFilter);
+    $("#browse_filter_toggle").click(toggleFilter);

 
     $("#browse_hide_areas_box").html(I18n.t('browse.start_rjs.hide_areas'));
 
     $("#browse_hide_areas_box").html(I18n.t('browse.start_rjs.hide_areas'));

-    $("#browse_hide_areas_box").toggle(hideAreas, showAreas);
+    $("#browse_hide_areas_box").click(toggleAreas);

 
     $("#sidebar").one("closed", function () {
       map.removeLayer(dataLayer);
 
     $("#sidebar").one("closed", function () {
       map.removeLayer(dataLayer);


@@ -96,28 +96,28 @@ $(document).ready(function () {
     }
   }
 
     }
   }
 

-  function enableFilter() {
-    $("#browse_filter_toggle").html(I18n.t('browse.start_rjs.view_data'));
-    locationFilter.setBounds(map.getBounds().pad(-0.2));
-    locationFilter.enable();
-    getData();
-  }
+  function toggleFilter() {
+    if (locationFilter.isEnabled()) {
+      $("#browse_filter_toggle").html(I18n.t('browse.start_rjs.manually_select'));
+      locationFilter.disable();
+    } else {
+      $("#browse_filter_toggle").html(I18n.t('browse.start_rjs.view_data'));
+      locationFilter.setBounds(map.getBounds().pad(-0.2));
+      locationFilter.enable();
+    }

 
 

-  function disableFilter() {
-    $("#browse_filter_toggle").html(I18n.t('browse.start_rjs.manually_select'));
-    locationFilter.disable();

     getData();
   }
 
     getData();
   }
 

-  function hideAreas() {
-    $("#browse_hide_areas_box").html(I18n.t('browse.start_rjs.show_areas'));
-    areasHidden = true;
-    getData();
-  }
+  function toggleAreas() {
+    if (areasHidden) {
+      $("#browse_hide_areas_box").html(I18n.t('browse.start_rjs.hide_areas'));
+      areasHidden = false;
+    } else {
+      $("#browse_hide_areas_box").html(I18n.t('browse.start_rjs.show_areas'));
+      areasHidden = true;
+    }

 
 

-  function showAreas() {
-    $("#browse_hide_areas_box").html(I18n.t('browse.start_rjs.hide_areas'));
-    areasHidden = false;

     getData();
   }
 
     getData();
   }