jQuery UI Development

Timestamp:

03/20/10 07:57:06 (7 days ago)

Author:

joern.zaefferer

Message:

autocomplete: pass through mouse and key events to menu methods in order to differentiate between key and mouse events in autocomplete

Files:

• trunk/ui/jquery.ui.autocomplete.js (modified) (9 diffs)

trunk/ui/jquery.ui.autocomplete.js

@@ -103 +103 @@
                                         var item = ui.item.data( "item.autocomplete" );
                                         if ( false !== self._trigger( "focus", null, { item: item } ) ) {
-                                                // use value to match what will end up in the input
-                                                self.element.val( item.value );
+                                                // use value to match what will end up in the input, if it was a key event
+                                                if ( /^key/.test(event.originalEvent.type) ) {
+                                                        self.element.val( item.value );
+                                                }
                                         }
                                 },
@@ -287 +289 @@
                         return;
                 }
-                this.menu[ direction ]();
+                this.menu[ direction ]( event );
         },
 
@@ -351 +353 @@
                         .attr("tabindex", -1)
                         // mouseenter doesn't work with event delegation
-                        .mouseenter(function() {
-                                self.activate($(this).parent());
+                        .mouseenter(function( event ) {
+                                self.activate( event, $(this).parent() );
                         })
                         .mouseleave(function() {
@@ -359 +361 @@
         },
 
-        activate: function(item) {
+        activate: function( event, item ) {
                 this.deactivate();
                 if (this.hasScroll()) {
@@ -376 +378 @@
                                 .attr("id", "ui-active-menuitem")
                         .end();
-                this._trigger("focus", null, { item: item });
+                this._trigger("focus", event, { item: item });
         },
 
@@ -389 +391 @@
         },
 
-        next: function() {
-                this.move("next", "li:first");
-        },
-
-        previous: function() {
-                this.move("prev", "li:last");
+        next: function(event) {
+                this.move("next", "li:first", event);
+        },
+
+        previous: function(event) {
+                this.move("prev", "li:last", event);
         },
 
@@ -405 +407 @@
         },
 
-        move: function(direction, edge) {
+        move: function(direction, edge, event) {
                 if (!this.active) {
-                        this.activate(this.element.children(edge));
+                        this.activate(event, this.element.children(edge));
                         return;
                 }
                 var next = this.active[direction]();
                 if (next.length) {
-                        this.activate(next);
+                        this.activate(event, next);
                 } else {
-                        this.activate(this.element.children(edge));
+                        this.activate(event, this.element.children(edge));
                 }
         },
 
         // TODO merge with previousPage
-        nextPage: function() {
+        nextPage: function(event) {
                 if (this.hasScroll()) {
                         // TODO merge with no-scroll-else
                         if (!this.active || this.last()) {
-                                this.activate(this.element.children(":first"));
+                                this.activate(event, this.element.children(":first"));
                                 return;
                         }
@@ -438 +440 @@
                                 result = this.element.children(":last");
                         }
-                        this.activate(result);
+                        this.activate(event, result);
                 } else {
-                        this.activate(this.element.children(!this.active || this.last() ? ":first" : ":last"));
+                        this.activate(event, this.element.children(!this.active || this.last() ? ":first" : ":last"));
                 }
         },
 
         // TODO merge with nextPage
-        previousPage: function() {
+        previousPage: function(event) {
                 if (this.hasScroll()) {
                         // TODO merge with no-scroll-else
                         if (!this.active || this.first()) {
-                                this.activate(this.element.children(":last"));
+                                this.activate(event, this.element.children(":last"));
                                 return;
                         }
@@ -465 +467 @@
                                 result = this.element.children(":first");
                         }
-                        this.activate(result);
+                        this.activate(event, result);
                 } else {
-                        this.activate(this.element.children(!this.active || this.first() ? ":last" : ":first"));
+                        this.activate(event, this.element.children(!this.active || this.first() ? ":last" : ":first"));
                 }
         },