Skip to content
This repository has been archived by the owner on Oct 8, 2021. It is now read-only.

Commit

Permalink
Source tree: Moved third party code to external directory
Browse files Browse the repository at this point in the history 
Fixes gh-6871
  • Loading branch information
@gseguin
gseguin committed Jan 13, 2014
1 parent dfc5d32 commit abc9754
Show file tree
Hide file tree
Showing 130 changed files with 210 additions and 221 deletions.
36 changes: 11 additions & 25 deletions Gruntfile.js
View file
Expand Up @@ -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",
Expand Down Expand Up @@ -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" ];
Expand All @@ -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" ];
Expand All @@ -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"
}
}
},
Expand Down
2 changes: 1 addition & 1 deletion demos/listview-autodividers-linkbar/autodividers-linkbar-demo.html
View file
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion demos/listview-grid/listview-grid.html
View file
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion demos/pages-dialog/dialog-alt.html
View file
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion demos/pages-dialog/dialog-buttons.html
View file
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion demos/pages-dialog/dialog-corners.html
View file
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion demos/pages-dialog/dialog-noclosebtn.html
View file
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion demos/pages-dialog/dialog-overlay.html
View file
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion demos/pages-dialog/dialog-rightclosebtn.html
View file
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion demos/pages-dialog/dialog-success.html
View file
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion demos/pages-dialog/dialog-with-select.html
View file
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion demos/pages-dialog/dialog.html
View file
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion demos/pages-multi-page/index.html
View file
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion demos/pages-single-page/index.html
View file
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion demos/pages/samepagetransition.html
View file
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion demos/pages/startpage.html
View file
Expand Up @@ -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() {
Expand Down
2 changes: 1 addition & 1 deletion demos/panel-external-internal/index.html
View file
Expand Up @@ -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() {
Expand Down
2 changes: 1 addition & 1 deletion demos/panel-external-internal/page-b.html
View file
Expand Up @@ -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() {
Expand Down
2 changes: 1 addition & 1 deletion demos/panel-external-internal/page-c.html
View file
Expand Up @@ -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() {
Expand Down
2 changes: 1 addition & 1 deletion demos/swipe-page/buenosaires.html
View file
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion demos/swipe-page/capetown.html
View file
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion demos/swipe-page/newyork.html
View file
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion demos/swipe-page/paris.html
View file
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion demos/swipe-page/seoul.html
View file
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion demos/swipe-page/sydney.html
View file
Expand Up @@ -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>
Expand Down
0 js/jquery.ui.core.js → external/jquery-ui/jquery.ui.core.js
View file
File renamed without changes.
0 js/widgets/jquery.ui.tabs.js → external/jquery-ui/jquery.ui.tabs.js
View file
File renamed without changes.
0 js/jquery.ui.widget.js → external/jquery-ui/jquery.ui.widget.js
View file
File renamed without changes.
0 js/jquery.js → external/jquery/jquery.js
View file
File renamed without changes.
0 js/jquery.hashchange.js → external/jquery/plugins/jquery.hashchange.js
View file
File renamed without changes.
0 external/qunit.css → external/qunit/qunit.css
View file
File renamed without changes.
0 external/qunit.js → external/qunit/qunit.js
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion js/events/navigate.js
View file
Expand Up @@ -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");
Expand Down
2 changes: 1 addition & 1 deletion js/jquery.mobile.helpers.js
View file
Expand Up @@ -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 ) {

Expand Down
4 changes: 2 additions & 2 deletions js/jquery.mobile.init.js
View file
Expand Up @@ -5,7 +5,7 @@

define([
"jquery",
"./jquery.ui.core",
"jquery-ui/jquery.ui.core",
"./jquery.mobile.defaults",
"./jquery.mobile.helpers",
"./jquery.mobile.data",
Expand All @@ -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" ),
Expand Down
1 change: 0 additions & 1 deletion js/jquery.mobile.js
View file
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion js/jquery.mobile.navigation.js
View file
Expand Up @@ -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 ) {
Expand Down
2 changes: 1 addition & 1 deletion js/jquery.mobile.widget.js
View file
Expand Up @@ -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 ) {
Expand Down
2 changes: 1 addition & 1 deletion js/jquery.tag.inserter.js
View file
Expand Up @@ -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, " " ) );
Expand Down
14 changes: 9 additions & 5 deletions js/requirejs.config.js
View file
Expand Up @@ -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" ]
}
});

0 comments on commit abc9754

Please sign in to comment.