From abc97542dd55aef1c906d6cb3be07bc9c1720fce Mon Sep 17 00:00:00 2001 From: Ghislain Seguin Date: Fri, 10 Jan 2014 12:21:13 -0700 Subject: [PATCH] Source tree: Moved third party code to external directory Fixes gh-6871 --- Gruntfile.js | 36 ++++++------------- .../autodividers-linkbar-demo.html | 2 +- demos/listview-grid/listview-grid.html | 2 +- demos/pages-dialog/dialog-alt.html | 2 +- demos/pages-dialog/dialog-buttons.html | 2 +- demos/pages-dialog/dialog-corners.html | 2 +- demos/pages-dialog/dialog-noclosebtn.html | 2 +- demos/pages-dialog/dialog-overlay.html | 2 +- demos/pages-dialog/dialog-rightclosebtn.html | 2 +- demos/pages-dialog/dialog-success.html | 2 +- demos/pages-dialog/dialog-with-select.html | 2 +- demos/pages-dialog/dialog.html | 2 +- demos/pages-multi-page/index.html | 2 +- demos/pages-single-page/index.html | 2 +- demos/pages/samepagetransition.html | 2 +- demos/pages/startpage.html | 2 +- demos/panel-external-internal/index.html | 2 +- demos/panel-external-internal/page-b.html | 2 +- demos/panel-external-internal/page-c.html | 2 +- demos/swipe-page/buenosaires.html | 2 +- demos/swipe-page/capetown.html | 2 +- demos/swipe-page/newyork.html | 2 +- demos/swipe-page/paris.html | 2 +- demos/swipe-page/seoul.html | 2 +- demos/swipe-page/sydney.html | 2 +- {js => external/jquery-ui}/jquery.ui.core.js | 0 .../jquery-ui}/jquery.ui.tabs.js | 0 .../jquery-ui}/jquery.ui.widget.js | 0 {js => external/jquery}/jquery.js | 0 .../jquery/plugins}/jquery.hashchange.js | 0 external/{ => qunit}/qunit.css | 0 external/{ => qunit}/qunit.js | 0 js/events/navigate.js | 2 +- js/jquery.mobile.helpers.js | 2 +- js/jquery.mobile.init.js | 4 +-- js/jquery.mobile.js | 1 - js/jquery.mobile.navigation.js | 2 +- js/jquery.mobile.widget.js | 2 +- js/jquery.tag.inserter.js | 2 +- js/requirejs.config.js | 14 +++++--- js/widgets/pagecontainer.js | 2 +- js/widgets/popup.js | 2 +- js/widgets/tabs.js | 2 +- tests/functional/addrbar.html | 2 +- tests/functional/autodividers.html | 2 +- tests/functional/eventlogger.html | 2 +- tests/functional/gridlayout.html | 2 +- tests/functional/hashchange/hashchange.html | 2 +- tests/functional/hashchange/hashchange1.html | 2 +- tests/functional/hashchange/hashchange2.html | 2 +- tests/integration/checkboxradio/index.html | 4 +-- tests/integration/collapsible/index.html | 4 +-- tests/integration/core/index.html | 4 +-- tests/integration/degrade-inputs/index.html | 4 +-- tests/integration/dialog-extension/index.html | 4 +-- .../dialog-extension/no-hash-tests.html | 4 +-- tests/integration/dialog/index.html | 4 +-- tests/integration/dialog/no-hash-tests.html | 4 +-- tests/integration/filterable/index.html | 4 +-- tests/integration/fixed-toolbar/index.html | 4 +-- tests/integration/forms/index.html | 4 +-- tests/integration/listview/index.html | 4 +-- .../listview/push-state-disabled-tests.html | 2 +- tests/integration/navigation/base-tests.html | 4 +-- .../navigation/click-handler-tests.html | 4 +-- .../event/beforenavigate-tests.html | 4 +-- tests/integration/navigation/event/index.html | 4 +-- .../event/push-state-disabled-tests.html | 2 +- tests/integration/navigation/index.html | 4 +-- .../init-query-param-hash-tests.html | 2 +- .../init-tests/query-param-hash.html | 4 +-- .../integration/navigation/method/index.html | 4 +-- .../push-state-disabled-method-tests.html | 2 +- .../navigation/multipage/index.html | 4 +-- .../push-state-disabled-base-tests.html | 2 +- .../navigation/push-state-disabled-tests.html | 2 +- .../navigation/sequence/index.html | 4 +-- .../sequence-dialog-hash-key-tests.html | 2 +- ...nce-path1-path2-dialog-hash-key-tests.html | 2 +- ...-state-disabled-dialog-hash-key-tests.html | 2 +- ...led-path1-path2-dialog-hash-key-tests.html | 2 +- .../sequence-push-state-disabled-tests.html | 2 +- .../sequence/sequence-redirect.html | 4 +-- tests/integration/page/index.html | 4 +-- tests/integration/popup/index.html | 4 +-- tests/integration/select/cached-tests.html | 4 +-- tests/integration/select/index.html | 4 +-- tests/integration/toolbar/index.html | 4 +-- tests/integration/transitions/index.html | 4 +-- tests/unit/button-markup/index.html | 4 +-- tests/unit/button/index.html | 4 +-- tests/unit/checkboxradio/index.html | 4 +-- tests/unit/content/index.html | 4 +-- tests/unit/controlgroup/index.html | 4 +-- tests/unit/core/index.html | 4 +-- tests/unit/degrade-inputs/index.html | 4 +-- tests/unit/dialog/index.html | 4 +-- tests/unit/event/index.html | 4 +-- tests/unit/field-contain/index.html | 4 +-- tests/unit/filterable/index.html | 4 +-- tests/unit/fixed-toolbar/index.html | 4 +-- tests/unit/flipswitch/index.html | 4 +-- .../unit/individual-modules/button-tests.html | 4 +-- .../individual-modules/collapsible-tests.html | 4 +-- .../collapsibleset-tests.html | 4 +-- .../individual-modules/textinput-tests.html | 4 +-- tests/unit/init/dialog-load-tests.html | 4 +-- tests/unit/init/index.html | 4 +-- tests/unit/init/nopage.html | 4 +-- tests/unit/kitchensink/index.html | 6 ++-- tests/unit/loader/index.html | 4 +-- tests/unit/media/index.html | 4 +-- tests/unit/navbar/index.html | 4 +-- tests/unit/page-sections/index.html | 4 +-- tests/unit/page/index.html | 4 +-- tests/unit/panel/index.html | 4 +-- tests/unit/path/index.html | 4 +-- tests/unit/popup/index.html | 4 +-- tests/unit/rangeslider/index.html | 4 +-- tests/unit/select/index.html | 4 +-- tests/unit/slider/index.html | 4 +-- tests/unit/support/index.html | 4 +-- tests/unit/table/index.html | 4 +-- tests/unit/textinput/index.html | 4 +-- tests/unit/transitions/index.html | 4 +-- tests/unit/widget/index.html | 4 +-- tests/unit/zoom/index.html | 4 +-- tests/unit/zoom/initial-disable.html | 6 ++-- tools/config-props.html | 2 +- tools/index.html | 2 +- 130 files changed, 210 insertions(+), 221 deletions(-) rename {js => external/jquery-ui}/jquery.ui.core.js (100%) rename {js/widgets => external/jquery-ui}/jquery.ui.tabs.js (100%) rename {js => external/jquery-ui}/jquery.ui.widget.js (100%) rename {js => external/jquery}/jquery.js (100%) rename {js => external/jquery/plugins}/jquery.hashchange.js (100%) rename external/{ => qunit}/qunit.css (100%) rename external/{ => qunit}/qunit.js (100%) diff --git a/Gruntfile.js b/Gruntfile.js index 77e3ad472e1..2a21ee53593 100644 --- 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,22 +739,17 @@ 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", @@ -763,16 +757,12 @@ module.exports = function( grunt ) { } }, 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 index 7f78583313c..e30b694b097 100644 --- a/demos/listview-autodividers-linkbar/autodividers-linkbar-demo.html +++ b/demos/listview-autodividers-linkbar/autodividers-linkbar-demo.html @@ -9,7 +9,7 @@ - + diff --git a/demos/listview-grid/listview-grid.html b/demos/listview-grid/listview-grid.html index 2484b0ab153..b0c884e0d4c 100644 --- a/demos/listview-grid/listview-grid.html +++ b/demos/listview-grid/listview-grid.html @@ -7,7 +7,7 @@ - + diff --git a/demos/pages-dialog/dialog-alt.html b/demos/pages-dialog/dialog-alt.html index 78df05e9b56..2c7885a6caf 100644 --- a/demos/pages-dialog/dialog-alt.html +++ b/demos/pages-dialog/dialog-alt.html @@ -7,7 +7,7 @@ - + diff --git a/demos/pages-dialog/dialog-buttons.html b/demos/pages-dialog/dialog-buttons.html index c858b5ed08d..17eb3985d42 100644 --- a/demos/pages-dialog/dialog-buttons.html +++ b/demos/pages-dialog/dialog-buttons.html @@ -7,7 +7,7 @@ - + - + +