Remove use of jQuery toggle() function

This commit is contained in:
Tom Hughes 2013-02-12 10:31:38 +00:00
parent 42cab8d852
commit 456d41e189

View file

@ -69,10 +69,10 @@ $(document).ready(function () {
map.on("moveend", updateData); map.on("moveend", updateData);
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 () { $("#sidebar").one("closed", function () {
map.removeLayer(dataLayer); map.removeLayer(dataLayer);
@ -96,28 +96,28 @@ $(document).ready(function () {
} }
} }
function enableFilter() { 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')); $("#browse_filter_toggle").html(I18n.t('browse.start_rjs.view_data'));
locationFilter.setBounds(map.getBounds().pad(-0.2)); locationFilter.setBounds(map.getBounds().pad(-0.2));
locationFilter.enable(); locationFilter.enable();
}
getData(); getData();
} }
function disableFilter() { function toggleAreas() {
$("#browse_filter_toggle").html(I18n.t('browse.start_rjs.manually_select')); if (areasHidden) {
locationFilter.disable();
getData();
}
function hideAreas() {
$("#browse_hide_areas_box").html(I18n.t('browse.start_rjs.show_areas'));
areasHidden = true;
getData();
}
function showAreas() {
$("#browse_hide_areas_box").html(I18n.t('browse.start_rjs.hide_areas')); $("#browse_hide_areas_box").html(I18n.t('browse.start_rjs.hide_areas'));
areasHidden = false; areasHidden = false;
} else {
$("#browse_hide_areas_box").html(I18n.t('browse.start_rjs.show_areas'));
areasHidden = true;
}
getData(); getData();
} }