Skip to content

Tests: Replace resource loader with AMD #1335

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 20 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
bb47aad
Tests: Replace resource loader with AMD
rxaviers Dec 12, 2013
78801c6
(fix) Tests: Replace resource loader with AMD
rxaviers Dec 12, 2013
df62114
(fix) Tests: Replace resource loader with AMD
rxaviers Dec 12, 2013
3afb4d0
(fix) Tests: Replace resource loader with AMD
rxaviers Dec 12, 2013
5ca958a
(fix) Tests: Replace resource loader with AMD
rxaviers Dec 12, 2013
2834651
(fix) Tests: Replace resource loader with AMD
rxaviers Dec 12, 2013
8ac5a49
Revert "(fix) Tests: Replace resource loader with AMD"
rxaviers Sep 3, 2014
b2d649f
(fix) Tests: Replace resource loader with AMD
rxaviers Sep 3, 2014
cf94731
(fix) Tests: Replace resource loader with AMD
rxaviers Sep 3, 2014
21bbc2e
(fix) Tests: Replace resource loader with AMD
rxaviers Nov 14, 2014
337b775
(fix) Tests: Replace resource loader with AMD
rxaviers Nov 14, 2014
cdfc27e
(fix) Tests: Replace resource loader with AMD
rxaviers Nov 14, 2014
9c3d95c
(fix) Tests: Replace resource loader with AMD
rxaviers Nov 14, 2014
bc593d3
(fix) Tests: Replace resource loader with AMD
rxaviers Nov 19, 2014
7655302
(fix) Tests: Replace resource loader with AMD
rxaviers Nov 19, 2014
64b786f
(fix) Tests: Replace resource loader with AMD
rxaviers Nov 19, 2014
b810fc3
(fix) Tests: Replace resource loader with AMD
rxaviers Nov 19, 2014
757164d
(fix) Tests: Replace resource loader with AMD
rxaviers Nov 19, 2014
8281580
(fix) Tests: Replace resource loader with AMD
rxaviers Nov 19, 2014
f44cb7c
(fix) Tests: Replace resource loader with AMD
rxaviers Dec 10, 2014
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -225,9 +225,11 @@ grunt.initConfig({
destPrefix: "external"
},
files: {
"qunit/qunit.js": "qunit/qunit/qunit.js",
"qunit/qunit.css": "qunit/qunit/qunit.css",
"qunit/MIT-LICENSE.txt": "qunit/MIT-LICENSE.txt",
"qunit/qunit.css": "qunit/qunit/qunit.css",
"qunit/qunit.js": "qunit/qunit/qunit.js",

"requirejs/require.js": "requirejs/require.js",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

requirejs should be visually split from qunit.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Any preference on how to order it between qunits and jqueries? They are not in sort order... Should I use dependencies sort order, than jqueries? Whatever order is fine?


"jquery-mousewheel/jquery.mousewheel.js": "jquery-mousewheel/jquery.mousewheel.js",
"jquery-mousewheel/LICENSE.txt": "jquery-mousewheel/LICENSE.txt",
Expand Down
1 change: 1 addition & 0 deletions bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
"jquery-simulate": "1.0.0",
"jshint": "2.4.4",
"qunit": "1.14.0",
"requirejs": "2.1.14",

"jquery-1.6.0": "jquery#1.6.0",
"jquery-1.6.1": "jquery#1.6.1",
Expand Down
Loading