Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitaeb487e

Browse files
gibson042markelog
authored andcommitted
Deferred: Backwards-compatible standards interoperability
Fixesgh-1722Closesgh-1996
1 parent069f958 commitaeb487e

File tree

9 files changed

+696
-112
lines changed

9 files changed

+696
-112
lines changed

‎Gruntfile.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,8 @@ module.exports = function( grunt ) {
5555
"sizzle/dist":"sizzle/dist",
5656
"sizzle/LICENSE.txt":"sizzle/LICENSE.txt",
5757

58+
"npo/npo.js":"native-promise-only/npo.js",
59+
5860
"qunit/qunit.js":"qunitjs/qunit/qunit.js",
5961
"qunit/qunit.css":"qunitjs/qunit/qunit.css",
6062
"qunit/LICENSE.txt":"qunitjs/LICENSE.txt",
@@ -158,7 +160,7 @@ module.exports = function( grunt ) {
158160

159161
grunt.registerTask("test_fast",["node_smoke_test"]);
160162

161-
grunt.registerTask("test",["test_fast"]);
163+
grunt.registerTask("test",["test_fast","promises-aplus-tests"]);
162164

163165
// Short list as a high frequency watch task
164166
grunt.registerTask("dev",["build:*:*","lint","uglify","remove_map_comment","dist:*"]);

‎build/tasks/promises-aplus-tests.js

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
module.exports=function(grunt){
2+
3+
"use strict";
4+
5+
varspawn=require("child_process").spawn;
6+
7+
grunt.registerTask("promises-aplus-tests",function(){
8+
vardone=this.async();
9+
spawn(
10+
"node",
11+
[
12+
"./node_modules/.bin/promises-aplus-tests",
13+
"test/promises-aplus-adapter.js"
14+
],
15+
{stdio:"inherit"}
16+
).on("close",function(code){
17+
done(code===0);
18+
});
19+
});
20+
};

‎external/npo/npo.js

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more aboutcustomizing how changed files appear on GitHub.

‎external/requirejs/require.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/** vim: et:ts=4:sw=4:sts=4
2-
*@license RequireJS 2.1.14 Copyright (c) 2010-2014, The Dojo Foundation All Rights Reserved.
2+
*@license RequireJS 2.1.15 Copyright (c) 2010-2014, The Dojo Foundation All Rights Reserved.
33
* Available via the MIT or new BSD license.
44
* see: http://github.com/jrburke/requirejs for details
55
*/
@@ -12,7 +12,7 @@ var requirejs, require, define;
1212
(function(global){
1313
varreq,s,head,baseElement,dataMain,src,
1414
interactiveScript,currentlyAddingScript,mainScript,subPath,
15-
version='2.1.14',
15+
version='2.1.15',
1616
commentRegExp=/(\/\*([\s\S]*?)\*\/|([^:]|^)\/\/(.*)$)/mg,
1717
cjsRequireRegExp=/[^.]\s*require\s*\(\s*["']([^'"\s]+)["']\s*\)/g,
1818
jsSuffixRegExp=/\.js$/,

‎package.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,10 @@
4444
"gzip-js":"0.3.2",
4545
"jsdom":"1.5.0",
4646
"load-grunt-tasks":"1.0.0",
47+
"native-promise-only":"0.7.6-a",
4748
"npm":"2.1.12",
49+
"promises-aplus-tests":"2.1.0",
50+
"q":"1.1.2",
4851
"qunitjs":"1.17.1",
4952
"requirejs":"2.1.15",
5053
"sinon":"1.12.2",

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp