Merge lp:~salgado/lazr-js/bug-474459 into lp:lazr-js

[Guilherme Salgado]

[Guilherme Salgado (salgado)]

This branch fixes bug 474459 by dropping the click-anywhere-in-the-overlay-to-focus-text-input feature from the picker.

[Māris Fogels (mars)]

Hi Salgado,

This looks good. Please change the call on line 35 from Node.query() to Node.one().

r=mars

Maris

review: Approve

[lp:~salgado/lazr-js/bug-474459]

132. By Guilherme Salgado on 2009-11-13

merge from mainline

133. By Guilherme Salgado on 2009-11-13

replace a .query() with .one()

=== modified file 'src-js/lazrjs/picker/picker.js'
--- src-js/lazrjs/picker/picker.js	2009-11-13 01:44:48 +0000
+++ src-js/lazrjs/picker/picker.js	2009-11-13 15:40:27 +0000
@@ -469,14 +469,6 @@
             'key', this._defaultSearchUserAction, this._search_input,
             'down:13', this);
 
-        // Give the focus to the search input.
-        Y.on('focus', function (e) {
-            if (e.target !== this._search_input){
-                e.halt();
-                this._search_input.focus();
-            }
-        }, this.get(BOUNDING_BOX), this);
-
         // Focus search box when the widget is first displayed.
         this.after('visibleChange', function (e) {
             var change = e.details[0];

=== modified file 'src-js/lazrjs/picker/tests/picker.js'
--- src-js/lazrjs/picker/tests/picker.js	2009-11-13 01:44:19 +0000
+++ src-js/lazrjs/picker/tests/picker.js	2009-11-13 15:40:27 +0000
@@ -776,17 +776,17 @@
             "There should be no next button.");
     },
 
-    test_widget_focus_goes_to_search_input: function () {
+    test_text_input_on_footer_can_be_focused: function () {
         this.picker.render();
-
-        var bb = this.picker.get('boundingBox');
-        var search_input = bb.query('.yui-picker-search');
+        this.picker.set('footer_slot', Y.Node.create(
+            '<input class="extra-input" name="extra_input" type="text" />'));
+        var extra_input = this.picker.get('boundingBox').one('.extra-input');
         var got_focus = false;
-        search_input.on('focus', function(e) {
+        extra_input.on('focus', function(e) {
             got_focus = true;
         });
-        bb.focus();
-        Assert.isTrue(got_focus, "focus didn't go to the search input.");
+        extra_input.focus();
+        Assert.isTrue(got_focus, "focus didn't go to the extra input.");
     },
 
     test_overlay_progress_value: function () {