Core: Move version and creation of the ui namespace into its own module

Ref #9647
jquery · Aug 8, 2015 · 3d71fb83fe02a307823594f5905be9848cfa5506 · 3d71fb8 · yamass · Jul 11, 2016
1 parent cd6c751
commit 3d71fb83fe02a307823594f5905be9848cfa5506
Show file tree

Hide file tree

Showing 39 changed files with 60 additions and 17 deletions.
diff --git a/ui/accordion.js b/ui/accordion.js
@@ -23,6 +23,7 @@
 		define( [
 			"jquery",
 			"./core",
+			"./version",
 			"./widget"
 		], factory );
 	} else {

diff --git a/ui/autocomplete.js b/ui/autocomplete.js
@@ -25,6 +25,7 @@
 			"./core",
 			"./widget",
 			"./position",
+			"./version",
 			"./menu"
 		], factory );
 	} else {

diff --git a/ui/button.js b/ui/button.js
@@ -23,6 +23,7 @@
 		define([
 			"jquery",
 			"./core",
+			"./version",
 			"./widget"
 		], factory );
 	} else {

diff --git a/ui/core.js b/ui/core.js
@@ -18,19 +18,17 @@
 	if ( typeof define === "function" && define.amd ) {
 
 		// AMD. Register as an anonymous module.
-		define( [ "jquery" ], factory );
+		define( [
+			"jquery",
+			"./version" ], factory );
 	} else {
 
 		// Browser globals
 		factory( jQuery );
 	}
 }( function( $ ) {
 
-// $.ui might exist from components with no dependencies, e.g., $.ui.position
-$.ui = $.ui || {};
-
 $.extend( $.ui, {
-	version: "@VERSION",
 
 	keyCode: {
 		BACKSPACE: 8,

diff --git a/ui/datepicker.js b/ui/datepicker.js
@@ -22,7 +22,8 @@
 		// AMD. Register as an anonymous module.
 		define([
 			"jquery",
-			"./core"
+			"./core",
+			"./version"
 		], factory );
 	} else {
 

diff --git a/ui/dialog.js b/ui/dialog.js
@@ -28,7 +28,8 @@
 			"./draggable",
 			"./mouse",
 			"./position",
-			"./resizable"
+			"./resizable",
+			"./version"
 		], factory );
 	} else {
 

diff --git a/ui/draggable.js b/ui/draggable.js
@@ -21,6 +21,7 @@
 		define([
 			"jquery",
 			"./core",
+			"./version",
 			"./mouse",
 			"./widget"
 		], factory );

diff --git a/ui/droppable.js b/ui/droppable.js
@@ -19,7 +19,7 @@
 		// AMD. Register as an anonymous module.
 		define([
 			"jquery",
-			"./core",
+			"./version",
 			"./widget",
 			"./mouse",
 			"./draggable"

diff --git a/ui/effect-blind.js b/ui/effect-blind.js
@@ -19,6 +19,7 @@
 		// AMD. Register as an anonymous module.
 		define( [
 			"jquery",
+			"./version",
 			"./effect"
 		], factory );
 	} else {

diff --git a/ui/effect-bounce.js b/ui/effect-bounce.js
@@ -19,6 +19,7 @@
 		// AMD. Register as an anonymous module.
 		define( [
 			"jquery",
+			"./version",
 			"./effect"
 		], factory );
 	} else {

diff --git a/ui/effect-clip.js b/ui/effect-clip.js
@@ -19,6 +19,7 @@
 		// AMD. Register as an anonymous module.
 		define( [
 			"jquery",
+			"./version",
 			"./effect"
 		], factory );
 	} else {

diff --git a/ui/effect-drop.js b/ui/effect-drop.js
@@ -19,6 +19,7 @@
 		// AMD. Register as an anonymous module.
 		define( [
 			"jquery",
+			"./version",
 			"./effect"
 		], factory );
 	} else {

diff --git a/ui/effect-explode.js b/ui/effect-explode.js
@@ -19,6 +19,7 @@
 		// AMD. Register as an anonymous module.
 		define( [
 			"jquery",
+			"./version",
 			"./effect"
 		], factory );
 	} else {

diff --git a/ui/effect-fade.js b/ui/effect-fade.js
@@ -19,6 +19,7 @@
 		// AMD. Register as an anonymous module.
 		define( [
 			"jquery",
+			"./version",
 			"./effect"
 		], factory );
 	} else {

diff --git a/ui/effect-fold.js b/ui/effect-fold.js
@@ -19,6 +19,7 @@
 		// AMD. Register as an anonymous module.
 		define( [
 			"jquery",
+			"./version",
 			"./effect"
 		], factory );
 	} else {

diff --git a/ui/effect-highlight.js b/ui/effect-highlight.js
@@ -19,6 +19,7 @@
 		// AMD. Register as an anonymous module.
 		define( [
 			"jquery",
+			"./version",
 			"./effect"
 		], factory );
 	} else {

diff --git a/ui/effect-puff.js b/ui/effect-puff.js
@@ -19,6 +19,7 @@
 		// AMD. Register as an anonymous module.
 		define( [
 			"jquery",
+			"./version",
 			"./effect",
 			"./effect-scale"
 		], factory );

diff --git a/ui/effect-pulsate.js b/ui/effect-pulsate.js
@@ -19,6 +19,7 @@
 		// AMD. Register as an anonymous module.
 		define( [
 			"jquery",
+			"./version",
 			"./effect"
 		], factory );
 	} else {

diff --git a/ui/effect-scale.js b/ui/effect-scale.js
@@ -19,6 +19,7 @@
 		// AMD. Register as an anonymous module.
 		define( [
 			"jquery",
+			"./version",
 			"./effect",
 			"./effect-size"
 		], factory );

diff --git a/ui/effect-shake.js b/ui/effect-shake.js
@@ -19,6 +19,7 @@
 		// AMD. Register as an anonymous module.
 		define( [
 			"jquery",
+			"./version",
 			"./effect"
 		], factory );
 	} else {

diff --git a/ui/effect-size.js b/ui/effect-size.js
@@ -19,6 +19,7 @@
 		// AMD. Register as an anonymous module.
 		define( [
 			"jquery",
+			"./version",
 			"./effect"
 		], factory );
 	} else {

diff --git a/ui/effect-slide.js b/ui/effect-slide.js
@@ -19,6 +19,7 @@
 		// AMD. Register as an anonymous module.
 		define( [
 			"jquery",
+			"./version",
 			"./effect"
 		], factory );
 	} else {

diff --git a/ui/effect-transfer.js b/ui/effect-transfer.js
@@ -19,6 +19,7 @@
 		// AMD. Register as an anonymous module.
 		define( [
 			"jquery",
+			"./version",
 			"./effect"
 		], factory );
 	} else {

diff --git a/ui/effect.js b/ui/effect.js
@@ -17,7 +17,7 @@
 	if ( typeof define === "function" && define.amd ) {
 
 		// AMD. Register as an anonymous module.
-		define( [ "jquery" ], factory );
+		define( [ "jquery", "./version" ], factory );
 	} else {
 
 		// Browser globals

diff --git a/ui/form-reset-mixin.js b/ui/form-reset-mixin.js
@@ -4,7 +4,8 @@
 		// AMD. Register as an anonymous module.
 		define( [
 			"jquery",
-			"ui/core"
+			"ui/core",
+			"./version"
 		], factory );
 	} else {
 

diff --git a/ui/menu.js b/ui/menu.js
@@ -23,6 +23,7 @@
 		define( [
 			"jquery",
 			"./core",
+			"./version",
 			"./widget",
 			"./position"
 		], factory );

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

diff --git a/ui/position.js b/ui/position.js
@@ -19,17 +19,14 @@
 	if ( typeof define === "function" && define.amd ) {
 
 		// AMD. Register as an anonymous module.
-		define( [ "jquery" ], factory );
+		define( [ "jquery", "./version" ], factory );
 	} else {
 
 		// Browser globals
 		factory( jQuery );
 	}
 }( function( $ ) {
 ( function() {
-
-$.ui = $.ui || {};
-
 var cachedScrollbarWidth, supportsOffsetFractions,
 	max = Math.max,
 	abs = Math.abs,

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

diff --git a/ui/resizable.js b/ui/resizable.js
@@ -23,6 +23,7 @@
 		define([
 			"jquery",
 			"./core",
+			"./version",
 			"./mouse",
 			"./widget"
 		], factory );

diff --git a/ui/selectable.js b/ui/selectable.js
@@ -20,7 +20,7 @@
 		// AMD. Register as an anonymous module.
 		define([
 			"jquery",
-			"./core",
+			"./version",
 			"./mouse",
 			"./widget"
 		], factory );

diff --git a/ui/selectmenu.js b/ui/selectmenu.js
@@ -23,6 +23,7 @@
 		define( [
 			"jquery",
 			"./core",
+			"./version",
 			"./widget",
 			"./position",
 			"./menu"

diff --git a/ui/slider.js b/ui/slider.js
@@ -24,6 +24,7 @@
 			"jquery",
 			"./core",
 			"./mouse",
+			"./version",
 			"./widget"
 		], factory );
 	} else {

diff --git a/ui/sortable.js b/ui/sortable.js
@@ -22,6 +22,7 @@
 			"jquery",
 			"./core",
 			"./mouse",
+			"./version",
 			"./widget"
 		], factory );
 	} else {

diff --git a/ui/spinner.js b/ui/spinner.js
@@ -23,6 +23,7 @@
 		define( [
 			"jquery",
 			"./core",
+			"./version",
 			"./widget",
 			"./button"
 		], factory );

diff --git a/ui/tabs.js b/ui/tabs.js
@@ -23,6 +23,7 @@
 		define( [
 			"jquery",
 			"./core",
+			"./version",
 			"./widget"
 		], factory );
 	} else {

diff --git a/ui/tooltip.js b/ui/tooltip.js
@@ -23,6 +23,7 @@
 		define( [
 			"jquery",
 			"./core",
+			"./version",
 			"./widget",
 			"./position"
 		], factory );

diff --git a/ui/version.js b/ui/version.js
@@ -0,0 +1,17 @@
+( function( factory ) {
+	if ( typeof define === "function" && define.amd ) {
+
+		// AMD. Register as an anonymous module.
+		define( [ "jquery" ], factory );
+	} else {
+
+		// Browser globals
+		factory( jQuery );
+	}
+} ( function( $ ) {
+
+$.ui = $.ui || {};
+
+return $.ui.version = "@VERSION";
+
+} ) );
diff --git a/ui/widget.js b/ui/widget.js
@@ -17,7 +17,7 @@
 	if ( typeof define === "function" && define.amd ) {
 
 		// AMD. Register as an anonymous module.
-		define( [ "jquery" ], factory );
+		define( [ "jquery", "./version" ], factory );
 	} else {
 
 		// Browser globals