aboutsummaryrefslogtreecommitdiffstats
path: root/ui/jquery.ui.core.js
diff options
context:
space:
mode:
authorFelix Nagel <info@felixnagel.com>2012-07-12 23:57:55 +0200
committerFelix Nagel <info@felixnagel.com>2012-07-12 23:57:55 +0200
commit5092d0296a010280ee9d004f2fe06afbf1c45db5 (patch)
treeac6b97b4551b4aebf8d90cc35add82fc7088e0a3 /ui/jquery.ui.core.js
parent39532f0a8e70e21e33aab03f08136f662d03a4a1 (diff)
parente054e28836e616ed03561d5a8195bbea525866d1 (diff)
downloadjquery-ui-5092d0296a010280ee9d004f2fe06afbf1c45db5.tar.gz
jquery-ui-5092d0296a010280ee9d004f2fe06afbf1c45db5.zip
Merge branch 'master' into selectmenu
Diffstat (limited to 'ui/jquery.ui.core.js')
-rw-r--r--ui/jquery.ui.core.js18
1 files changed, 13 insertions, 5 deletions
diff --git a/ui/jquery.ui.core.js b/ui/jquery.ui.core.js
index a511de24b..3e102f181 100644
--- a/ui/jquery.ui.core.js
+++ b/ui/jquery.ui.core.js
@@ -1,7 +1,8 @@
/*!
- * jQuery UI @VERSION
+ * jQuery UI Core @VERSION
+ * http://jqueryui.com
*
- * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
+ * Copyright 2012 jQuery Foundation and other contributors
* Dual licensed under the MIT or GPL Version 2 licenses.
* http://jquery.org/license
*
@@ -215,9 +216,16 @@ function visible( element ) {
}
$.extend( $.expr[ ":" ], {
- data: function( elem, i, match ) {
- return !!$.data( elem, match[ 3 ] );
- },
+ data: $.expr.createPseudo ?
+ $.expr.createPseudo(function( dataName ) {
+ return function( elem ) {
+ return !!$.data( elem, dataName );
+ };
+ }) :
+ // support: jQuery <1.8
+ function( elem, i, match ) {
+ return !!$.data( elem, match[ 3 ] );
+ },
focusable: function( element ) {
return focusable( element, !isNaN( $.attr( element, "tabindex" ) ) );