commit 3d7bfe533d66f17396c562dba11389ce3b41051c
author Eugenia Gabrielova <genia.likes.science@gmail.com> Mon Oct 28 02:36:44 2013 -0700
committer Eugenia Gabrielova <genia.likes.science@gmail.com> Mon Oct 28 02:36:44 2013 -0700
tree 52e3e3f35fd559e1f435580a8ef0c5d52b0a1a13
parent b2457984f02aa79e084bffd5cbc1d1d223ced3cb

More refactoring

asterix-examples/src/main/resources/black-cherry/static/js/cherry.js

diff --git a/asterix-examples/src/main/resources/black-cherry/static/js/cherry.js b/asterix-examples/src/main/resources/black-cherry/static/js/cherry.js
index 52ddadf..fb8ba0d 100755
--- a/asterix-examples/src/main/resources/black-cherry/static/js/cherry.js
+++ b/asterix-examples/src/main/resources/black-cherry/static/js/cherry.js
@@ -180,13 +180,13 @@
     end_dp.val(dateOptions.defaultDate);
     
     // Explore Mode: Toggle Selection/Location Search
-    $('#selection-button').on('click', function (e) {
+    $('#selection-button').on('change', function (e) {
         $("#location-text-box").attr("disabled", "disabled");
         if (selectionRect) {
             selectionRect.setMap(map);
         }
     });
-    $('#location-button').on('click', function (e) {
+    $('#location-button').on('change', function (e) {
         $("#location-text-box").removeAttr("disabled");
         if (selectionRect) {
             selectionRect.setMap(null);
@@ -229,7 +229,9 @@
         var bounds;
         if ($('#selection-button').hasClass("active") && selectionRect) {
             bounds = selectionRect.getBounds();
+            alert("using rectangle");
         } else {
+            alert("Using map");
             bounds = map.getBounds();
         }
         
@@ -270,7 +272,6 @@
         // Clears selection rectangle on query execution, rather than waiting for another clear call.
         if (selectionRect) {
             selectionRect.setMap(null);
-            selectionRect = null;
         }
     });
 }
@@ -1081,7 +1082,6 @@
 
     if (selectionRect) {
         selectionRect.setMap(null);
-        selectionRect = null;
     }
     
     mapWidgetClearMap();
@@ -1183,4 +1183,4 @@
   var c = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1 - a));
   var d = R * c;
   return d;
-};
\ No newline at end of file
+};