Changeset 28780 for trunk/themes/default/js/ui/jquery.ui.menu.js

Timestamp:

Jun 24, 2014, 10:16:59 PM (10 years ago)

Author:

rvelices

Message:

upgrade jquery ui from 1.10.1 to 1.10.4

File:

• trunk/themes/default/js/ui/jquery.ui.menu.js (modified) (6 diffs)

trunk/themes/default/js/ui/jquery.ui.menu.js

@@ -1 +1 @@
 /*!
- * jQuery UI Menu 1.10.1
+ * jQuery UI Menu 1.10.4
  * http://jqueryui.com
  *
- * Copyright 2013 jQuery Foundation and other contributors
+ * Copyright 2014 jQuery Foundation and other contributors
  * Released under the MIT license.
  * http://jquery.org/license
@@ -17 +17 @@
 
 $.widget( "ui.menu", {
-        version: "1.10.1",
+        version: "1.10.4",
         defaultElement: "<ul>",
         delay: 300,
@@ -76 +76 @@
                                 var target = $( event.target ).closest( ".ui-menu-item" );
                                 if ( !this.mouseHandled && target.not( ".ui-state-disabled" ).length ) {
-                                        this.mouseHandled = true;
-
                                         this.select( event );
+
+                                        // Only set the mouseHandled flag if the event will bubble, see #9469.
+                                        if ( !event.isPropagationStopped() ) {
+                                                this.mouseHandled = true;
+                                        }
+
                                         // Open submenu on click
                                         if ( target.has( ".ui-menu" ).length ) {
                                                 this.expand( event );
-                                        } else if ( !this.element.is( ":focus" ) ) {
+                                        } else if ( !this.element.is( ":focus" ) && $( this.document[ 0 ].activeElement ).closest( ".ui-menu" ).length ) {
+
                                                 // Redirect focus to the menu
                                                 this.element.trigger( "focus", [ true ] );
@@ -175 +180 @@
 
         _keydown: function( event ) {
-                /*jshint maxcomplexity:20*/
                 var match, prev, character, skip, regex,
                         preventDefault = true;
@@ -283 +287 @@
                         icon = this.options.icons.submenu,
                         submenus = this.element.find( this.options.menus );
+
+                this.element.toggleClass( "ui-menu-icons", !!this.element.find( ".ui-icon" ).length );
 
                 // Initialize nested menus
@@ -384 +390 @@
 
                 nested = item.children( ".ui-menu" );
-                if ( nested.length && ( /^mouse/.test( event.type ) ) ) {
+                if ( nested.length && event && ( /^mouse/.test( event.type ) ) ) {
                         this._startOpening(nested);
                 }