jquery-archive · gseguin · Jan 13, 2014 · Jan 10, 2014
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -642,9 +642,8 @@ module.exports = function( grunt ) {
 					baseUrl: ".",
 					src: [
 						"js/**/*.js",
-						"!js/jquery.js",
-						"!js/**/jquery.ui*.js",
-						"!js/jquery.hashchange.js"
+						"!js/jquery.tag.inserter.js",
+						"!js/requirejs.config.js"
 					],
 					instrumentedFiles: "temp/",
 					htmlReport: "build/report/coverage",
@@ -740,39 +739,30 @@ module.exports = function( grunt ) {
 			options: {
 
 				// Bower components folder will be removed afterwards
-				clean: true
+				clean: true,
+				destPrefix: "external"
 			},
 			tests: {
-				options: {
-					destPrefix: "external"
-				},
 				files: {
-					"qunit.js": "qunit/qunit/qunit.js",
-					"qunit.css": "qunit/qunit/qunit.css",
+					"qunit/qunit.js": "qunit/qunit/qunit.js",
+					"qunit/qunit.css": "qunit/qunit/qunit.css",
 					"jshint/jshint.js": "jshint/dist/jshint.js"
 				}
 			},
 			requirejs: {
-				options: {
-					destPrefix: "external"
-				},
 				files: {
 					"requirejs/require.js": "requirejs/require.js",
 					"requirejs/plugins/text.js": "requirejs-text/text.js",
 					"requirejs/plugins/json.js": "requirejs-plugins/src/json.js"
 				}
 			},
 			jquery: {
-				options: {
-					destPrefix: "js"
-				},
 				files: {
-					"jquery.js": "jquery/jquery.js"
+					"jquery/jquery.js": "jquery/jquery.js"
 				}
 			},
 			"jquery-ui": {
 				options: {
-					destPrefix: "js",
 					copyOptions: {
 						process: function( content ) {
 							var version = grunt.file.readJSON( "bower.json" ).dependencies[ "jquery-ui" ];
@@ -784,13 +774,12 @@ module.exports = function( grunt ) {
 					}
 				},
 				files: {
-					"jquery.ui.core.js": "jquery-ui/ui/jquery.ui.core.js",
-					"jquery.ui.widget.js": "jquery-ui/ui/jquery.ui.widget.js"
+					"jquery-ui/jquery.ui.core.js": "jquery-ui/ui/jquery.ui.core.js",
+					"jquery-ui/jquery.ui.widget.js": "jquery-ui/ui/jquery.ui.widget.js"
 				}
 			},
 			"jquery-ui-tabs": {
 				options: {
-					destPrefix: "js",
 					copyOptions: {
 						process: function( content ) {
 							var version = grunt.file.readJSON( "bower.json" ).dependencies[ "jquery-ui-tabs" ];
@@ -802,15 +791,12 @@ module.exports = function( grunt ) {
 					}
 				},
 				files: {
-					"widgets/jquery.ui.tabs.js": "jquery-ui-tabs/ui/jquery.ui.tabs.js"
+					"jquery-ui/jquery.ui.tabs.js": "jquery-ui-tabs/ui/jquery.ui.tabs.js"
 				}
 			},
 			"jquery-plugins": {
-				options: {
-					destPrefix: "js"
-				},
 				files: {
-					"jquery.hashchange.js": "jquery-hashchange/jquery.ba-hashchange.js"
+					"jquery/plugins/jquery.hashchange.js": "jquery-hashchange/jquery.ba-hashchange.js"
 				}
 			}
 		},

diff --git a/demos/listview-autodividers-linkbar/autodividers-linkbar-demo.html b/demos/listview-autodividers-linkbar/autodividers-linkbar-demo.html
@@ -9,7 +9,7 @@
 	<link rel="stylesheet" href="../../css/themes/default/jquery.mobile.css">
 	<link rel="stylesheet" href="../_assets/css/jqm-demos.css">
 	<link rel="stylesheet" href="autodividers-linkbar.css">
-	<script src="../../js/jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../_assets/js/"></script>
 	<script src="../../js/"></script>
 	<script src="autodividers-linkbar.js"></script>

diff --git a/demos/listview-grid/listview-grid.html b/demos/listview-grid/listview-grid.html
@@ -7,7 +7,7 @@
 	<link rel="shortcut icon" href="../favicon.ico">
 	<link rel="stylesheet" href="../../css/themes/default/jquery.mobile.css">
 	<link rel="stylesheet" href="listview-grid.css">
-	<script src="../../js/jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../../js/"></script>
 </head>
 <body>

diff --git a/demos/pages-dialog/dialog-alt.html b/demos/pages-dialog/dialog-alt.html
@@ -7,7 +7,7 @@
 	<link rel="stylesheet" href="../../css/themes/default/jquery.mobile.css">
 	<link rel="stylesheet" href="../_assets/css/jqm-demos.css">
 	<link rel="shortcut icon" href="../favicon.ico">
-	<script src="../../js/jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../_assets/js/"></script>
 	<script src="../../js/"></script>
 </head>

diff --git a/demos/pages-dialog/dialog-buttons.html b/demos/pages-dialog/dialog-buttons.html
@@ -7,7 +7,7 @@
 	<link rel="stylesheet" href="../../css/themes/default/jquery.mobile.css">
 	<link rel="stylesheet" href="../_assets/css/jqm-demos.css">
 	<link rel="shortcut icon" href="../favicon.ico">
-	<script src="../../js/jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../_assets/js/"></script>
 	<script src="../../js/"></script>
     <style>

diff --git a/demos/pages-dialog/dialog-corners.html b/demos/pages-dialog/dialog-corners.html
@@ -7,7 +7,7 @@
 	<link rel="stylesheet" href="../../css/themes/default/jquery.mobile.css">
 	<link rel="stylesheet" href="../_assets/css/jqm-demos.css">
 	<link rel="shortcut icon" href="../favicon.ico">
-	<script src="../../js/jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../_assets/js/"></script>
 	<script src="../../js/"></script>
 </head>

diff --git a/demos/pages-dialog/dialog-noclosebtn.html b/demos/pages-dialog/dialog-noclosebtn.html
@@ -7,7 +7,7 @@
 	<link rel="stylesheet" href="../../css/themes/default/jquery.mobile.css">
 	<link rel="stylesheet" href="../_assets/css/jqm-demos.css">
 	<link rel="shortcut icon" href="../favicon.ico">
-	<script src="../../js/jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../_assets/js/"></script>
 	<script src="../../js/"></script>
 </head>

diff --git a/demos/pages-dialog/dialog-overlay.html b/demos/pages-dialog/dialog-overlay.html
@@ -7,7 +7,7 @@
 	<link rel="stylesheet" href="../../css/themes/default/jquery.mobile.css">
 	<link rel="stylesheet" href="../_assets/css/jqm-demos.css">
 	<link rel="shortcut icon" href="../favicon.ico">
-	<script src="../../js/jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../_assets/js/"></script>
 	<script src="../../js/"></script>
 </head>

diff --git a/demos/pages-dialog/dialog-rightclosebtn.html b/demos/pages-dialog/dialog-rightclosebtn.html
@@ -7,7 +7,7 @@
 	<link rel="stylesheet" href="../../css/themes/default/jquery.mobile.css">
 	<link rel="stylesheet" href="../_assets/css/jqm-demos.css">
 	<link rel="shortcut icon" href="../favicon.ico">
-	<script src="../../js/jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../_assets/js/"></script>
 	<script src="../../js/"></script>
 </head>

diff --git a/demos/pages-dialog/dialog-success.html b/demos/pages-dialog/dialog-success.html
@@ -7,7 +7,7 @@
 	<link rel="stylesheet" href="../../css/themes/default/jquery.mobile.css">
 	<link rel="stylesheet" href="../_assets/css/jqm-demos.css">
 	<link rel="shortcut icon" href="../favicon.ico">
-	<script src="../../js/jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../_assets/js/"></script>
 	<script src="../../js/"></script>
     <style>

diff --git a/demos/pages-dialog/dialog-with-select.html b/demos/pages-dialog/dialog-with-select.html
@@ -7,7 +7,7 @@
 	<link rel="stylesheet" href="../../css/themes/default/jquery.mobile.css">
 	<link rel="stylesheet" href="../_assets/css/jqm-demos.css">
 	<link rel="shortcut icon" href="../favicon.ico">
-	<script src="../../js/jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../_assets/js/"></script>
 	<script src="../../js/"></script>
 </head>

diff --git a/demos/pages-dialog/dialog.html b/demos/pages-dialog/dialog.html
@@ -7,7 +7,7 @@
 	<link rel="stylesheet" href="../../css/themes/default/jquery.mobile.css">
 	<link rel="stylesheet" href="../_assets/css/jqm-demos.css">
 	<link rel="shortcut icon" href="../favicon.ico">
-	<script src="../../js/jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../_assets/js/"></script>
 	<script src="../../js/"></script>
 </head>

diff --git a/demos/pages-multi-page/index.html b/demos/pages-multi-page/index.html
@@ -8,7 +8,7 @@
 	<link rel="stylesheet" href="../../css/themes/default/jquery.mobile.css">
 	<link rel="stylesheet" href="../_assets/css/jqm-demos.css">
 	<link rel="shortcut icon" href="../favicon.ico">
-	<script src="../../js/jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../_assets/js/"></script>
 	<script src="../../js/"></script>
 </head>

diff --git a/demos/pages-single-page/index.html b/demos/pages-single-page/index.html
@@ -8,7 +8,7 @@
 	<link rel="stylesheet" href="../../css/themes/default/jquery.mobile.css">
 	<link rel="stylesheet" href="../_assets/css/jqm-demos.css">
 	<link rel="shortcut icon" href="../favicon.ico">
-	<script src="../../js/jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../_assets/js/"></script>
 	<script src="../../js/"></script>
 </head>

diff --git a/demos/pages/samepagetransition.html b/demos/pages/samepagetransition.html
@@ -6,7 +6,7 @@
   <meta name="viewport" content="width=device-width, initial-scale=1">
   <link rel="shortcut icon" href="../favicon.ico">
   <link rel="stylesheet" href="../../css/themes/default/jquery.mobile.css">
-  <script src="../../js/jquery.js"></script>
+  <script src="../../external/jquery/jquery.js"></script>
   <script src="../../js/"></script>
   <script>
     // JS

diff --git a/demos/pages/startpage.html b/demos/pages/startpage.html
@@ -6,7 +6,7 @@
   <meta name="viewport" content="width=device-width, initial-scale=1">
   <link rel="shortcut icon" href="../favicon.ico">
   <link rel="stylesheet" href="../../css/themes/default/jquery.mobile.css">
-  <script src="../../js/jquery.js"></script>
+  <script src="../../external/jquery/jquery.js"></script>
   <script src="../../js/"></script>
   <script>
 $('#page1').on('pagecreate', function() {

diff --git a/demos/panel-external-internal/index.html b/demos/panel-external-internal/index.html
@@ -6,7 +6,7 @@
 	<link rel="shortcut icon" href="../favicon.ico">
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 	<link rel="stylesheet" href="../../css/themes/default/jquery.mobile.css">
-	<script src="../../js/jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../../js/"></script>
 	<script>
 		$( document ).on( "pagecreate", function() {

diff --git a/demos/panel-external-internal/page-b.html b/demos/panel-external-internal/page-b.html
@@ -6,7 +6,7 @@
 	<link rel="shortcut icon" href="../favicon.ico">
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 	<link rel="stylesheet" href="../../css/themes/default/jquery.mobile.css">
-	<script src="../../js/jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../../js/"></script>
 	<script>
 		$( document ).on( "pagecreate", function() {

diff --git a/demos/panel-external-internal/page-c.html b/demos/panel-external-internal/page-c.html
@@ -6,7 +6,7 @@
 	<link rel="shortcut icon" href="../favicon.ico">
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 	<link rel="stylesheet" href="../../css/themes/default/jquery.mobile.css">
-	<script src="../../js/jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../../js/"></script>
 	<script>
 		$( document ).on( "pagecreate", function() {

diff --git a/demos/swipe-page/buenosaires.html b/demos/swipe-page/buenosaires.html
@@ -8,7 +8,7 @@
 	<link rel="stylesheet" href="../_assets/css/jqm-demos.css">
 	<link rel="stylesheet" href="swipe-page.css">
 	<link rel="shortcut icon" href="../favicon.ico">
-	<script src="../../js/jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../_assets/js/"></script>
 	<script src="../../js/"></script>
 	<script src="swipe-page.js"></script>

diff --git a/demos/swipe-page/capetown.html b/demos/swipe-page/capetown.html
@@ -8,7 +8,7 @@
 	<link rel="stylesheet" href="../_assets/css/jqm-demos.css">
 	<link rel="stylesheet" href="swipe-page.css">
 	<link rel="shortcut icon" href="../favicon.ico">
-	<script src="../../js/jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../_assets/js/"></script>
 	<script src="../../js/"></script>
 	<script src="swipe-page.js"></script>

diff --git a/demos/swipe-page/newyork.html b/demos/swipe-page/newyork.html
@@ -8,7 +8,7 @@
 	<link rel="stylesheet" href="../_assets/css/jqm-demos.css">
 	<link rel="stylesheet" href="swipe-page.css">
 	<link rel="shortcut icon" href="../favicon.ico">
-	<script src="../../js/jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../_assets/js/"></script>
 	<script src="../../js/"></script>
 	<script src="swipe-page.js"></script>

diff --git a/demos/swipe-page/paris.html b/demos/swipe-page/paris.html
@@ -8,7 +8,7 @@
 	<link rel="stylesheet" href="../_assets/css/jqm-demos.css">
 	<link rel="stylesheet" href="swipe-page.css">
 	<link rel="shortcut icon" href="../favicon.ico">
-	<script src="../../js/jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../_assets/js/"></script>
 	<script src="../../js/"></script>
 	<script src="swipe-page.js"></script>

diff --git a/demos/swipe-page/seoul.html b/demos/swipe-page/seoul.html
@@ -8,7 +8,7 @@
 	<link rel="stylesheet" href="../_assets/css/jqm-demos.css">
 	<link rel="stylesheet" href="swipe-page.css">
 	<link rel="shortcut icon" href="../favicon.ico">
-	<script src="../../js/jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../_assets/js/"></script>
 	<script src="../../js/"></script>
 	<script src="swipe-page.js"></script>

diff --git a/demos/swipe-page/sydney.html b/demos/swipe-page/sydney.html
@@ -8,7 +8,7 @@
 	<link rel="stylesheet" href="../_assets/css/jqm-demos.css">
 	<link rel="stylesheet" href="swipe-page.css">
 	<link rel="shortcut icon" href="../favicon.ico">
-	<script src="../../js/jquery.js"></script>
+	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../_assets/js/"></script>
 	<script src="../../js/"></script>
 	<script src="swipe-page.js"></script>

diff --git a/js/jquery.ui.core.js → external/jquery-ui/jquery.ui.core.js b/js/jquery.ui.core.js → external/jquery-ui/jquery.ui.core.js
diff --git a/js/widgets/jquery.ui.tabs.js → external/jquery-ui/jquery.ui.tabs.js b/js/widgets/jquery.ui.tabs.js → external/jquery-ui/jquery.ui.tabs.js
diff --git a/js/jquery.ui.widget.js → external/jquery-ui/jquery.ui.widget.js b/js/jquery.ui.widget.js → external/jquery-ui/jquery.ui.widget.js
diff --git a/js/jquery.js → external/jquery/jquery.js b/js/jquery.js → external/jquery/jquery.js
diff --git a/js/jquery.hashchange.js → external/jquery/plugins/jquery.hashchange.js b/js/jquery.hashchange.js → external/jquery/plugins/jquery.hashchange.js
diff --git a/external/qunit.css → external/qunit/qunit.css b/external/qunit.css → external/qunit/qunit.css
diff --git a/external/qunit.js → external/qunit/qunit.js b/external/qunit.js → external/qunit/qunit.js
diff --git a/js/events/navigate.js b/js/events/navigate.js
@@ -6,7 +6,7 @@
 // TODO break out pushstate support test so we don't depend on the whole thing
 define([
 	"jquery",
-	"jquery.hashchange",
+	"jquery-plugins/jquery.hashchange",
 	"./../jquery.mobile.ns",
 	"./../jquery.mobile.support" ], function( jQuery ) {
 //>>excludeEnd("jqmBuildExclude");

diff --git a/js/jquery.mobile.helpers.js b/js/jquery.mobile.helpers.js
@@ -5,7 +5,7 @@
 //>>css.structure: ../css/structure/jquery.mobile.core.css
 //>>css.theme: ../css/themes/default/jquery.mobile.theme.css
 
-define( [ "jquery", "./jquery.mobile.ns", "./jquery.ui.core" ], function( jQuery ) {
+define( [ "jquery", "./jquery.mobile.ns", "jquery-ui/jquery.ui.core" ], function( jQuery ) {
 //>>excludeEnd("jqmBuildExclude");
 (function( $, window, undefined ) {
 

diff --git a/js/jquery.mobile.init.js b/js/jquery.mobile.init.js
@@ -5,7 +5,7 @@
 
 define([
 	"jquery",
-	"./jquery.ui.core",
+	"jquery-ui/jquery.ui.core",
 	"./jquery.mobile.defaults",
 	"./jquery.mobile.helpers",
 	"./jquery.mobile.data",
@@ -16,7 +16,7 @@ define([
 	"./jquery.mobile.navigation",
 	"./widgets/loader",
 	"./jquery.mobile.vmouse",
-	"jquery.hashchange" ], function( jQuery ) {
+	"jquery-plugins/jquery.hashchange" ], function( jQuery ) {
 //>>excludeEnd("jqmBuildExclude");
 (function( $, window, undefined ) {
 	var	$html = $( "html" ),

diff --git a/js/jquery.mobile.js b/js/jquery.mobile.js
@@ -49,7 +49,6 @@ define([
 	"./widgets/table.reflow",
 	"./widgets/filterable",
 	"./widgets/filterable.backcompat",
-	"./widgets/jquery.ui.tabs",
 	"./widgets/tabs",
 	"./jquery.mobile.zoom",
 	"./jquery.mobile.zoom.iosorientationfix"

diff --git a/js/jquery.mobile.navigation.js b/js/jquery.mobile.navigation.js
@@ -12,7 +12,7 @@ define( [
 	"./navigation/method",
 	"./jquery.mobile.events",
 	"./jquery.mobile.support",
-	"jquery.hashchange",
+	"jquery-plugins/jquery.hashchange",
 	"./widgets/pagecontainer",
 	"./widgets/page",
 	"./transitions/handlers" ], function( jQuery ) {

diff --git a/js/jquery.mobile.widget.js b/js/jquery.mobile.widget.js
@@ -6,7 +6,7 @@
 
 define( [ "jquery",
 	"./jquery.mobile.ns",
-	"jquery.ui.widget",
+	"jquery-ui/jquery.ui.widget",
 	"./jquery.mobile.data" ], function( jQuery ) {
 //>>excludeEnd("jqmBuildExclude");
 (function( $, undefined ) {

diff --git a/js/jquery.tag.inserter.js b/js/jquery.tag.inserter.js
@@ -8,7 +8,7 @@
 		version = "",
 		myScriptTag = document.getElementsByTagName( "script" )[document.getElementsByTagName( "script" ).length - 1],
 		baseUrl = myScriptTag.src.replace( /(.*)\/.*$/, "$1/" ),
-		url = baseUrl + "jquery.js";
+		url = baseUrl + "../external/jquery/jquery.js";
 
 	if ( results ) {
 		version = decodeURIComponent( results[results.length - 1].replace( /\+/g, " " ) );

diff --git a/js/requirejs.config.js b/js/requirejs.config.js
@@ -2,12 +2,16 @@ requirejs.config({
 	"paths": {
 		// requireJS plugins
 		"text": "../external/requirejs/plugins/text",
-		"json": "../external/requirejs/plugins/json"
+		"json": "../external/requirejs/plugins/json",
+
+		"jquery": "../external/jquery/jquery",
+		"jquery-ui": "../external/jquery-ui",
+		"jquery-plugins": "../external/jquery/plugins"
 	},
 	"shim": {
-		"jquery.hashchange": [ "jquery" ],
-		"jquery.ui.widget": [ "jquery" ],
-		"widgets/jquery.ui.tabs": [ "jquery.ui.widget" ],
-		"widgets/jquery.ui.core": [ "jquery" ]
+		"jquery-plugins/jquery.hashchange": [ "jquery" ],
+		"jquery-ui/jquery.ui.widget": [ "jquery" ],
+		"jquery-ui/jquery.ui.tabs": [ "jquery-ui/jquery.ui.widget" ],
+		"jquery-ui/jquery.ui.core": [ "jquery" ]
 	}
 });