Changeset 12526 for branches/2.3/themes/default/js/ui/jquery.ui.core.js

Timestamp:

Oct 28, 2011, 3:32:48 PM (13 years ago)

Author:

patdenice

Message:

merge r12525 from trunk to branch 2.3
feature:2487
Update jQuery to 1.6.4 and jQuery UI to 1.8.16

File:

• branches/2.3/themes/default/js/ui/jquery.ui.core.js (modified) (5 diffs)

branches/2.3/themes/default/js/ui/jquery.ui.core.js

@@ -1 +1 @@
 /*!
- * jQuery UI 1.8.10
+ * jQuery UI 1.8.16
  *
  * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
@@ -19 +19 @@
 
 $.extend( $.ui, {
-        version: "1.8.10",
+        version: "1.8.16",
 
         keyCode: {
@@ -59 +59 @@
 // plugins
 $.fn.extend({
+        propAttr: $.fn.prop || $.fn.attr,
+
         _focus: $.fn.focus,
         focus: function( delay, fn ) {
@@ -175 +177 @@
 
 // selectors
+function focusable( element, isTabIndexNotNaN ) {
+        var nodeName = element.nodeName.toLowerCase();
+        if ( "area" === nodeName ) {
+                var map = element.parentNode,
+                        mapName = map.name,
+                        img;
+                if ( !element.href || !mapName || map.nodeName.toLowerCase() !== "map" ) {
+                        return false;
+                }
+                img = $( "img[usemap=#" + mapName + "]" )[0];
+                return !!img && visible( img );
+        }
+        return ( /input|select|textarea|button|object/.test( nodeName )
+                ? !element.disabled
+                : "a" == nodeName
+                        ? element.href || isTabIndexNotNaN
+                        : isTabIndexNotNaN)
+                // the element and all of its ancestors must be visible
+                && visible( element );
+}
+
 function visible( element ) {
         return !$( element ).parents().andSelf().filter(function() {
@@ -188 +211 @@
 
         focusable: function( element ) {
-                var nodeName = element.nodeName.toLowerCase(),
-                        tabIndex = $.attr( element, "tabindex" );
-                if ( "area" === nodeName ) {
-                        var map = element.parentNode,
-                                mapName = map.name,
-                                img;
-                        if ( !element.href || !mapName || map.nodeName.toLowerCase() !== "map" ) {
-                                return false;
-                        }
-                        img = $( "img[usemap=#" + mapName + "]" )[0];
-                        return !!img && visible( img );
-                }
-                return ( /input|select|textarea|button|object/.test( nodeName )
-                        ? !element.disabled
-                        : "a" == nodeName
-                                ? element.href || !isNaN( tabIndex )
-                                : !isNaN( tabIndex ))
-                        // the element and all of its ancestors must be visible
-                        && visible( element );
+                return focusable( element, !isNaN( $.attr( element, "tabindex" ) ) );
         },
 
         tabbable: function( element ) {
-                var tabIndex = $.attr( element, "tabindex" );
-                return ( isNaN( tabIndex ) || tabIndex >= 0 ) && $( element ).is( ":focusable" );
+                var tabIndex = $.attr( element, "tabindex" ),
+                        isTabIndexNaN = isNaN( tabIndex );
+                return ( isTabIndexNaN || tabIndex >= 0 ) && focusable( element, !isTabIndexNaN );
         }
 });