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

Ref #9647

diff --git a/ui/accordion.js b/ui/accordion.js
index a9b843cd5975d601abf5f95e43cfe44439f12576..5a2c128c6b7466fc78af6ce9a7ce0a823a7973f7 100644 (file)
--- 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
index de173cc4f8bfb9726213b450bd602b539e57a560..1bf8c84be6cd6b4fdccc31bd7a67a4afda79d599 100644 (file)
--- 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
index 70cc31680346d6a7060dd4de27c7a073873c95da..34228e2da590131270004fe5d44163888347de17 100644 (file)
--- 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
index 9ac196d38f8d077bb552c7f3c7e65213eca6b748..a529f35db55885fe51718882b9f66df950980ee7 100644 (file)
--- a/ui/core.js
+++ b/ui/core.js
@@ -18,7 +18,9 @@
        if ( typeof define === "function" && define.amd ) {
 
                // AMD. Register as an anonymous module.
-               define( [ "jquery" ], factory );
+               define( [
+                       "jquery",
+                       "./version" ], factory );
        } else {
 
                // Browser globals
@@ -26,11 +28,7 @@
        }
 }( 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
index cf63cbb208642b96e2eca0dae204d991b1cfa502..372d87c60545d420c5b197360651e136951d2a7c 100644 (file)
--- 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
index e58e0c8cc0d25dfb78e7e7f8b0633d1d7251319e..11ff77c6b501b34bb0f3e23c4c4817c99447df55 100644 (file)
--- 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
index a3cd5ba7d17088945d603b9bd426604ea887bf2c..261be7b489146799711a7133ae4655edffaf17b8 100644 (file)
--- 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
index 74d54d077ac92226784b24456e6c32beb62695ce..c6bd3500408119de962cacfcffd3fe8e36120852 100644 (file)
--- 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
index 45358d7594f57bacebea1465fbb1e53d7a139c7d..87382615c0827fd0116649c4dec01ea92bd7b3fc 100644 (file)
--- 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
index 8a5d58e3010349605871dde30088c75b19d591d1..80206f62de77f68150c305a4b83bbf1f9df33d05 100644 (file)
--- 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
index 4eb24eb88e710d8f4bbdc88ee93303db7dcd44da..c24a764c899570a3c039224ac1bb1f181fa1e612 100644 (file)
--- 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
index 3ad90caa6fe486d3ee47e4869bec7be9b509fc9f..fa9ab7346cf6f36fc304c52c5fd5ec1201c6a5cf 100644 (file)
--- 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
index 3e468675afae622da31ccb7c97c96afbbd582c4c..918ad2c3b4c1c22609f3a1f36fb6c553aab1da08 100644 (file)
--- 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
index ecc44722a1ee45cc82abc8c6fef1f67479935cd7..5d0c7caa0ebbfe0eb04f419b3f2d82b752609a73 100644 (file)
--- 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
index a61eef0abb64061006254a842b4a23030a03d5c7..01aca3a61a911dfc0ca591de52965708a6369ea8 100644 (file)
--- 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
index 721a3a05b2b1cd98e94a61f453bb89487675f84a..ed903dc3d0927cbd0cf1ec4293c378f23c9a8d9e 100644 (file)
--- 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
index ac3f90a64d242f315beac5df9bfd041c7cb53bee..c1640a5d7af98393b00bacec0ab1b2e0ee3f839a 100644 (file)
--- 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
index f6f46da766b075d67803cd924a053aa60ff01edd..35e6d81ee140817675638d7dd31784156c71717a 100644 (file)
--- 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
index 5d76ac166afab1ecba1425f219f5c4154e031568..8602aeeb42c8fb8bc2191124b6c841dd99f8642f 100644 (file)
--- 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
index 52240fed0a785c2db21e6f24117f6af0d12b9a90..0fe27e2b653c5e730acadd0471e3e8b4fad5350e 100644 (file)
--- 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
index 16a2adac1b9cc79c9e23be485d2652b5585f30b7..0fe8f120f3dbc39e8da7db828ddaaf3d69a456a8 100644 (file)
--- 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
index 1f401305848b1f0089522400756b9945239dda08..9d62f2228b3cfecf8d19484566520cb31c9bd05e 100644 (file)
--- 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
index 41208b9e688042d03716f2b38b36f90a47775bb4..9ac9398c08b5cb077463163730d895e4d7b4b157 100644 (file)
--- 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
index 86afea226a3099e0080c049eb56f657067e48cbd..7fa45cfc0c6d41bdacbc144c56c9b50f67f77532 100644 (file)
--- 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
index a751f7f2a97c085a1fa86bd35fcb331e8cf556cb..423a35538a4a6c0749e718d949758049fc391ec7 100644 (file)
--- 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
index 89281e4f00bbe1b4feb94b6dddc7cfd1993ca769..e39fb0bdb85a35552153467c5b440b7011d48295 100644 (file)
--- 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
index f9c2595526d1674665df266de3a7e9467caefbde..e197fd60aa80ce1b88fea4ced78b56b627fb1197 100644 (file)
--- 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
index 172503fefaf2cd2587c711507b2a3e9607fd2c52..e9e805bb6ad734830c4edeaeac1eee414bde7733 100644 (file)
--- a/ui/position.js
+++ b/ui/position.js
@@ -19,7 +19,7 @@
        if ( typeof define === "function" && define.amd ) {
 
                // AMD. Register as an anonymous module.
-               define( [ "jquery" ], factory );
+               define( [ "jquery", "./version" ], factory );
        } else {
 
                // Browser globals
@@ -27,9 +27,6 @@
        }
 }( function( $ ) {
 ( function() {
-
-$.ui = $.ui || {};
-
 var cachedScrollbarWidth, supportsOffsetFractions,
        max = Math.max,
        abs = Math.abs,

diff --git a/ui/progressbar.js b/ui/progressbar.js
index 4dc44d22ab39f44965ac07bde8200fff90005774..7b1cc93517f170f9944f595f2ab197a7aef14437 100644 (file)
--- 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
index 6e51f4aac9faff0b062bfbcc109c49a5d8493c78..6b4fd1013156f52fcdce8df5b757567a6780b133 100644 (file)
--- 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
index c1d4459546dd46a9b0102acae338db2f4bba5b77..ec4895d15015c4ecbe548be86691e933931cc7ae 100644 (file)
--- 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
index db2cea712aadea14194befa256f5d7b44410f11f..227d87ae78c736a588feebc812794510d259dbdd 100644 (file)
--- 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
index 830c1cbd7d20027d26c30414212589333c5b289b..db5f341b3ca5acb9973856befbd92dfbcf9fca10 100644 (file)
--- 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
index bf1bf6a8925f3d4ede73afb6f1d40b8fcf57c476..0c638906da4ca83a522161ed789348600e783417 100644 (file)
--- 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
index c56d2c918bf08dad1060c9a1302f3cf9274dcda1..fa07c9ab1c46c28df919ffaa8c8b8d2e66f55ba5 100644 (file)
--- 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
index f267ad4bf30f3dca233af4d11f2437eec22a8562..5aaa8c5fa6f06640f5f22fe6d5f9df2007483a27 100644 (file)
--- 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
index e18f3e19d8542a7bf79097ee01fef946e7648e0d..c58bc65dc836a9ff505323e0b2b04932cf24410e 100644 (file)
--- 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
new file mode 100644 (file)
index 0000000..fdd99f7
--- /dev/null
+++ 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
index 603a49136ed476d1cd210cffadc83c911ea2b098..c6f228efd0a1511317bbe45917c700b9f79a9f90 100644 (file)
--- 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