Merge lp:~salgado/lazr-js/picker-double-search into lp:lazr-js

[Guilherme Salgado]

[Guilherme Salgado (salgado)]

Fix the bug by firing the search event in _defaultSearchUserAction
instead of upon value change on the current_search_string property.

--
Guilherme Salgado <email address hidden>

[Edwin Grubbs (edwin-grubbs)]

Hi Salgado,

Thanks for fixing these problems in the picker.

merge-approved

-Edwin

review: Approve (code)

=== modified file 'src-js/lazrjs/picker/picker.js'
--- src-js/lazrjs/picker/picker.js	2009-11-13 15:34:09 +0000
+++ src-js/lazrjs/picker/picker.js	2009-11-13 16:55:17 +0000
@@ -529,12 +529,6 @@
         this.after('errorChange', function (e) {
             this._syncErrorUI();
         });
-
-        // Fire search event whenever the "current_search_string" property
-        // is changed.
-        this.after('current_search_stringChange', function(e) {
-            this.fire(SEARCH, this.get(CURRENT_SEARCH_STRING));
-        });
     },
 
     /**
@@ -564,11 +558,12 @@
      * @protected
      */
     _clear: function() {
+        this.set(CURRENT_SEARCH_STRING, '');
+        this.set(ERROR, '');
+        this.set(RESULTS, [{}]);
+        this.set(BATCHES, []);
         this._search_input.set('value', '');
-        this.set('error', '');
-        this.set('results', [{}]);
         this._results_box.set('innerHTML', '');
-        this.set('batches', []);
     },
 
     /**
@@ -589,6 +584,7 @@
             this.set(ERROR, msg);
         } else {
             this.set(CURRENT_SEARCH_STRING, search_string);
+            this.fire(SEARCH, search_string);
         }
     },
 

=== modified file 'src-js/lazrjs/picker/tests/picker.js'
--- src-js/lazrjs/picker/tests/picker.js	2009-11-13 15:38:17 +0000
+++ src-js/lazrjs/picker/tests/picker.js	2009-11-13 16:55:17 +0000
@@ -240,7 +240,7 @@
             "Search button wasn't re-enabled.");
     },
 
-    test_hitting_enter_in_search_input_fires_save_event: function () {
+    test_hitting_enter_in_search_input_fires_search_event: function () {
         this.picker.render();
 
         var bb = this.picker.get('boundingBox');
@@ -480,31 +480,6 @@
             "The no-results CSS class should have been removed.");
     },
 
-    test_setting_currentsearchstring_fires_search_event: function () {
-        this.picker.render();
-
-        Assert.areEqual(
-            '',
-            this.picker.get('current_search_string'),
-            "current_search_string should be empty.");
-
-        this.picker.subscribe('search', function(ev) {
-            this.resume(function() {
-                Assert.areEqual(
-                    'foo search string', ev.details[0],
-                    'Search event is missing the search string.');
-            });
-        }, this);
-        this.picker.set('current_search_string', 'foo search string');
-        Assert.areEqual(
-            'foo search string',
-            this.picker.get('current_search_string'),
-            "current_search_string should be set.");
-        this.wait(function () {
-            Assert.fail("search event wasn't fired");
-        }, 3000);
-    },
-
     test_setting_search_slot_updates_ui: function () {
         this.picker.render();
         var filler = '<span>hello</span>';