Core: Move data selector from core into its own module

Ref #9647
jquery · Jul 15, 2015 · f0260fd91b593ae56f68e1f33ca8496c1c4b0467 · f0260fd
1 parent 3d71fb8
commit f0260fd91b593ae56f68e1f33ca8496c1c4b0467
Unified Split

Showing with 45 additions and 13 deletions.

+2 −1 tests/unit/core/selector.js

+1 −0 ui/button.js

+1 −11 ui/core.js

+38 −0 ui/data.js

+2 −1 ui/draggable.js

+1 −0 ui/sortable.js
diff --git a/tests/unit/core/selector.js b/tests/unit/core/selector.js
@@ -1,6 +1,7 @@
 define( [
 	"jquery",
-	"ui/core"
+	"ui/core",
+	"ui/data"
 ], function( $ ) {

 module( "core - selectors" );
diff --git a/ui/button.js b/ui/button.js
@@ -23,6 +23,7 @@
 		define([
 			"jquery",
 			"./core",
+			"./data",
 			"./version",
 			"./widget"
 		], factory );
diff --git a/ui/core.js b/ui/core.js
@@ -20,6 +20,7 @@
 		// AMD. Register as an anonymous module.
 		define( [
 			"jquery",
+			"./data",
 			"./version" ], factory );
 	} else {

@@ -207,17 +208,6 @@ function visible( element ) {
 }

 $.extend( $.expr[ ":" ], {
-	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, $.attr( element, "tabindex" ) != null );
 	},
diff --git a/ui/data.js b/ui/data.js
@@ -0,0 +1,38 @@
+/*!
+ * jQuery UI :data @VERSION
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ */
+
+//>>label: :data
+//>>group: Core
+//>>description: Selects elements which have data stored under the specified key.
+//>>docs: http://api.jqueryui.com/data-selector/
+
+( function( factory ) {
+	if ( typeof define === "function" && define.amd ) {
+
+		// AMD. Register as an anonymous module.
+		define( [ "jquery", "./version" ], factory );
+	} else {
+
+		// Browser globals
+		factory( jQuery );
+	}
+} ( function( $ ) {
+return $.extend( $.expr[ ":" ], {
+	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 ] );
+		}
+} );
+} ) );
diff --git a/ui/draggable.js b/ui/draggable.js
@@ -21,8 +21,9 @@
 		define([
 			"jquery",
 			"./core",
-			"./version",
+			"./data",
 			"./mouse",
+			"./version",
 			"./widget"
 		], factory );
 	} else {
diff --git a/ui/sortable.js b/ui/sortable.js
@@ -21,6 +21,7 @@
 		define([
 			"jquery",
 			"./core",
+			"./data",
 			"./mouse",
 			"./version",
 			"./widget"