jquery · arschmitz · Jul 15, 2015 · Jul 15, 2015 · Jul 15, 2015 · Jul 16, 2015
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -150,16 +150,6 @@ grunt.initConfig({
 },
 compare_size: compareFiles,
 concat: {
-ui: {
-options: {
-banner: createBanner( uiFiles ),
-stripBanners: {
-block: true
-}
-},
-src: uiFiles,
-dest: "dist/jquery-ui.js"
-},
 i18n: {
 options: {
 banner: createBanner( allI18nFiles )
@@ -178,6 +168,27 @@ grunt.initConfig({
 dest: "dist/jquery-ui.css"
 }
 },
+requirejs: {
+js: {
+options: {
+baseUrl: "./",
+paths: {
+jquery: "./external/jquery/jquery",
+external: "./external/"
+},
+preserveLicenseComments: false,
+optimize: "none",
+findNestedDependencies: true,
+skipModuleInsertion: true,
+exclude: [ "jquery" ],
+include: expandFiles( [ "ui/**/*.js", "!ui/i18n/*" ] ),
+out: "dist/jquery-ui.js",
+wrap: {
+start: createBanner( uiFiles ),
+}
+}
+}
+},
 
 // Remove the requireSpacesInsideParentheses override once everything is fixed
 jscs: {
@@ -455,10 +466,10 @@ grunt.registerTask( "update-authors", function() {
 });
 });
 
-grunt.registerTask( "default", [ "lint", "test" ]);
+grunt.registerTask( "default", [ "lint", "requirejs", "test" ]);
 grunt.registerTask( "lint", [ "asciilint", "jshint", "jscs", "csslint", "htmllint" ]);
 grunt.registerTask( "test", [ "qunit" ]);
-grunt.registerTask( "sizer", [ "concat:ui", "uglify:main", "compare_size:all" ]);
-grunt.registerTask( "sizer_all", [ "concat:ui", "uglify", "compare_size" ]);
+grunt.registerTask( "sizer", [ "requirejs:js", "uglify:main", "compare_size:all" ]);
+grunt.registerTask( "sizer_all", [ "requirejs:js", "uglify", "compare_size" ]);
 
 };
diff --git a/demos/bootstrap.js b/demos/bootstrap.js
@@ -9,21 +9,61 @@ var script = scripts[ scripts.length - 1 ];
 var modules = script.getAttribute( "data-modules" );
 var pathParts = window.location.pathname.split( "/" );
 var effectsAll = [
-"effect-blind",
-"effect-bounce",
-"effect-clip",
-"effect-drop",
-"effect-explode",
-"effect-fade",
-"effect-fold",
-"effect-highlight",
-"effect-puff",
-"effect-pulsate",
-"effect-scale",
-"effect-shake",
-"effect-size",
-"effect-slide"
+"effects/effect-blind",
+"effects/effect-bounce",
+"effects/effect-clip",
+"effects/effect-drop",
+"effects/effect-explode",
+"effects/effect-fade",
+"effects/effect-fold",
+"effects/effect-highlight",
+"effects/effect-puff",
+"effects/effect-pulsate",
+"effects/effect-scale",
+"effects/effect-shake",
+"effects/effect-size",
+"effects/effect-slide"
 ];
+var widgets = [
+"accordion",
+"autocomplete",
+"button",
+"datepicker",
+"dialog",
+"draggable",
+"droppable",
+"menu",
+"mouse",
+"progressbar",
+"resizable",
+"selectable",
+"selectmenu",
+"slider",
+"sortable",
+"spinner",
+"tabs",
+"tooltip"
+];
+
+function getPath( module ) {
+for ( var i = 0; i < widgets.length; i++ ) {
+if ( widgets[ i ] === module ) {
+return "widgets/" + module;
+}
+}
+for ( var j = 0; j < effectsAll.length; j++ ) {
+if ( module !== "effect" && effectsAll[ j ].indexOf( module ) !== -1 ) {
+return "effects/" + module;
+}
+}
+return module;
+}
+function fixPaths( modules ) {
+for ( var i = 0; i < modules.length; i++ ) {
+modules[ i ] = getPath( modules[ i ] );
+}
+return modules;
+}
 
 // Hide the page while things are loading to prevent a FOUC
 document.documentElement.className = "demo-loading";
@@ -40,13 +80,15 @@ require.config( {
 }
 } );
 
+
 // Replace effects all shortcut modules with all the effects modules
 if ( modules && modules.indexOf( "effects-all" ) !== -1 ) {
 modules = modules.replace( /effects-all/, effectsAll.join( " " ) );
 }
 
 modules = modules ? modules.replace( /^\s+|\s+$/g, "" ).split( /\s+/ ) : [];
 modules.push( pathParts[ pathParts.length - 2 ] );
+modules = fixPaths( modules );
 
 require( modules, function() {
 var newScript = document.createElement( "script" );

diff --git a/package.json b/package.json
@@ -64,6 +64,7 @@
 "grunt-contrib-csslint": "0.2.0",
 "grunt-contrib-jshint": "0.7.1",
 "grunt-contrib-qunit": "0.6.0",
+"grunt-contrib-requirejs": "0.4.4",
 "grunt-contrib-uglify": "0.1.1",
 "grunt-esformatter": "0.2.0",
 "grunt-git-authors": "2.0.0",

diff --git a/tests/lib/common.js b/tests/lib/common.js
@@ -67,7 +67,7 @@ function testBasicUsage( widget ) {
 exports.testWidget = function( widget, settings ) {
 module( widget + ": common widget" );
 
-exports.testJshint( widget );
+exports.testJshint( "/widgets/" + widget );
 testWidgetDefaults( widget, settings.defaults );
 testWidgetOverrides( widget );
 testBasicUsage( widget );

diff --git a/tests/unit/accordion/common.js b/tests/unit/accordion/common.js
@@ -1,6 +1,6 @@
 define( [
 "lib/common",
-"ui/accordion"
+"ui/widgets/accordion"
 ], function( common ) {
 
 common.testWidget( "accordion", {

diff --git a/tests/unit/accordion/core.js b/tests/unit/accordion/core.js
@@ -1,7 +1,7 @@
 define( [
 "jquery",
 "./helper",
-"ui/accordion"
+"ui/widgets/accordion"
 ], function( $, testHelper ) {
 
 var setupTeardown = testHelper.setupTeardown,

diff --git a/tests/unit/accordion/events.js b/tests/unit/accordion/events.js
@@ -1,7 +1,7 @@
 define( [
 "jquery",
 "./helper",
-"ui/accordion"
+"ui/widgets/accordion"
 ], function( $, testHelper ) {
 
 var setupTeardown = testHelper.setupTeardown,

diff --git a/tests/unit/accordion/helper.js b/tests/unit/accordion/helper.js
@@ -1,7 +1,7 @@
 define( [
 "jquery",
 "lib/helper",
-"ui/accordion"
+"ui/widgets/accordion"
 ], function( $, helper ) {
 
 return $.extend( helper, {

diff --git a/tests/unit/accordion/methods.js b/tests/unit/accordion/methods.js
@@ -1,7 +1,7 @@
 define( [
 "jquery",
 "./helper",
-"ui/accordion"
+"ui/widgets/accordion"
 ], function( $, testHelper ) {
 
 var equalHeight = testHelper.equalHeight,

diff --git a/tests/unit/accordion/options.js b/tests/unit/accordion/options.js
@@ -1,7 +1,7 @@
 define( [
 "jquery",
 "./helper",
-"ui/accordion"
+"ui/widgets/accordion"
 ], function( $, testHelper ) {
 
 var equalHeight = testHelper.equalHeight,

diff --git a/tests/unit/autocomplete/common.js b/tests/unit/autocomplete/common.js
@@ -1,6 +1,6 @@
 define( [
 "lib/common",
-"ui/autocomplete"
+"ui/widgets/autocomplete"
 ], function( common ) {
 
 common.testWidget( "autocomplete", {

diff --git a/tests/unit/autocomplete/core.js b/tests/unit/autocomplete/core.js
@@ -1,6 +1,6 @@
 define( [
 "jquery",
-"ui/autocomplete"
+"ui/widgets/autocomplete"
 ], function( $ ) {
 
 module( "autocomplete: core" );

diff --git a/tests/unit/autocomplete/events.js b/tests/unit/autocomplete/events.js
@@ -1,6 +1,6 @@
 define( [
 "jquery",
-"ui/autocomplete"
+"ui/widgets/autocomplete"
 ], function( $ ) {
 
 module( "autocomplete: events" );

diff --git a/tests/unit/autocomplete/methods.js b/tests/unit/autocomplete/methods.js
@@ -1,6 +1,6 @@
 define( [
 "jquery",
-"ui/autocomplete"
+"ui/widgets/autocomplete"
 ], function( $ ) {
 
 module( "autocomplete: methods" );

diff --git a/tests/unit/autocomplete/options.js b/tests/unit/autocomplete/options.js
@@ -1,6 +1,6 @@
 define( [
 "jquery",
-"ui/autocomplete"
+"ui/widgets/autocomplete"
 ], function( $ ) {
 
 module( "autocomplete: options" );

diff --git a/tests/unit/button/common.js b/tests/unit/button/common.js
@@ -1,6 +1,6 @@
 define( [
 "lib/common",
-"ui/button"
+"ui/widgets/button"
 ], function( common ) {
 
 common.testWidget( "button", {

diff --git a/tests/unit/button/core.js b/tests/unit/button/core.js
@@ -1,6 +1,6 @@
 define( [
 "jquery",
-"ui/button"
+"ui/widgets/button"
 ], function( $ ) {
 
 module("button: core");

diff --git a/tests/unit/button/events.js b/tests/unit/button/events.js
@@ -1,6 +1,6 @@
 define( [
 "jquery",
-"ui/button"
+"ui/widgets/button"
 ], function( $ ) {
 
 module("button: events");

diff --git a/tests/unit/button/methods.js b/tests/unit/button/methods.js
@@ -1,6 +1,6 @@
 define( [
 "jquery",
-"ui/button"
+"ui/widgets/button"
 ], function( $ ) {
 
 module("button: methods");

diff --git a/tests/unit/button/options.js b/tests/unit/button/options.js
@@ -1,6 +1,6 @@
 define( [
 "jquery",
-"ui/button"
+"ui/widgets/button"
 ], function( $ ) {
 
 module( "button: options" );

diff --git a/tests/unit/core/core.js b/tests/unit/core/core.js
@@ -1,7 +1,9 @@
 define( [
 "jquery",
 "lib/common",
-"ui/core"
+"ui/form",
+"ui/labels",
+"ui/unique-id"
 ], function( $, common ) {
 
 module( "core - jQuery extensions" );

diff --git a/tests/unit/core/selector.js b/tests/unit/core/selector.js
@@ -1,6 +1,9 @@
 define( [
 "jquery",
-"ui/core"
+"ui/data",
+"ui/escape-selector",
+"ui/focusable",
+"ui/tabbable"
 ], function( $ ) {
 
 module( "core - selectors" );

diff --git a/tests/unit/datepicker/core.js b/tests/unit/datepicker/core.js
@@ -2,7 +2,7 @@ define( [
 "jquery",
 "lib/common",
 "./helper",
-"ui/datepicker",
+"ui/widgets/datepicker",
 "ui/i18n/datepicker-he"
 ], function( $, common, testHelper ) {
 

diff --git a/tests/unit/datepicker/events.js b/tests/unit/datepicker/events.js
@@ -1,7 +1,7 @@
 define( [
 "jquery",
 "./helper",
-"ui/datepicker"
+"ui/widgets/datepicker"
 ], function( $, testHelper ) {
 
 module("datepicker: events");

diff --git a/tests/unit/datepicker/helper.js b/tests/unit/datepicker/helper.js
@@ -1,7 +1,7 @@
 define( [
 "jquery",
 "lib/helper",
-"ui/datepicker"
+"ui/widgets/datepicker"
 ], function( $, helper ) {
 
 return $.extend( helper, {

diff --git a/tests/unit/datepicker/methods.js b/tests/unit/datepicker/methods.js
@@ -1,7 +1,7 @@
 define( [
 "jquery",
 "./helper",
-"ui/datepicker"
+"ui/widgets/datepicker"
 ], function( $, testHelper ) {
 
 module("datepicker: methods");

diff --git a/tests/unit/datepicker/options.js b/tests/unit/datepicker/options.js
@@ -1,7 +1,7 @@
 define( [
 "jquery",
 "./helper",
-"ui/datepicker",
+"ui/widgets/datepicker",
 "ui/i18n/datepicker-fr",
 "ui/i18n/datepicker-he",
 "ui/i18n/datepicker-zh-CN"

diff --git a/tests/unit/dialog/common-deprecated.js b/tests/unit/dialog/common-deprecated.js
@@ -1,6 +1,6 @@
 define( [
 "lib/common",
-"ui/dialog"
+"ui/widgets/dialog"
 ], function( common ) {
 
 common.testWidget( "dialog", {

diff --git a/tests/unit/dialog/common.js b/tests/unit/dialog/common.js
@@ -1,6 +1,6 @@
 define( [
 "lib/common",
-"ui/dialog"
+"ui/widgets/dialog"
 ], function( common ) {
 
 common.testWidget( "dialog", {

diff --git a/tests/unit/dialog/core.js b/tests/unit/dialog/core.js
@@ -1,6 +1,6 @@
 define( [
 "jquery",
-"ui/dialog"
+"ui/widgets/dialog"
 ], function( $ ) {
 
 // TODO add teardown callback to remove dialogs

diff --git a/tests/unit/dialog/deprecated.js b/tests/unit/dialog/deprecated.js
@@ -1,6 +1,6 @@
 define( [
 "jquery",
-"ui/dialog"
+"ui/widgets/dialog"
 ], function( $ ) {
 
 module( "dialog (deprecated): options" );