Permalink
Browse files

Deferred: Backwards-compatible standards interoperability

Fixes gh-1722
Closes gh-1996
  • Loading branch information...
gibson042 committed Dec 29, 2014
1 parent e22ef5d commit 555a50d340706e3e1e0de09231050493d0ad841e
View
@@ -55,6 +55,8 @@ module.exports = function( grunt ) {
"sizzle/dist": "sizzle/dist",
"sizzle/LICENSE.txt": "sizzle/LICENSE.txt",
"npo/npo.js": "native-promise-only/npo.js",
"qunit/qunit.js": "qunitjs/qunit/qunit.js",
"qunit/qunit.css": "qunitjs/qunit/qunit.css",
"qunit/LICENSE.txt": "qunitjs/LICENSE.txt",
@@ -158,7 +160,7 @@ module.exports = function( grunt ) {
grunt.registerTask( "test_fast", [ "node_smoke_test" ] );
grunt.registerTask( "test", [ "test_fast" ] );
grunt.registerTask( "test", [ "test_fast", "promises-aplus-tests" ] );
// Short list as a high frequency watch task
grunt.registerTask( "dev", [ "build:*:*", "lint", "uglify", "remove_map_comment", "dist:*" ] );
@@ -0,0 +1,20 @@
module.exports = function( grunt ) {
"use strict";
var spawn = require( "child_process" ).spawn;
grunt.registerTask( "promises-aplus-tests", function() {
var done = this.async();
spawn(
"node",
[
"./node_modules/.bin/promises-aplus-tests",
"test/promises-aplus-adapter.js"
],
{ stdio: "inherit" }
).on( "close", function( code ) {
done( code === 0 );
});
});
};
View

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
@@ -1,5 +1,5 @@
/** vim: et:ts=4:sw=4:sts=4
* @license RequireJS 2.1.14 Copyright (c) 2010-2014, The Dojo Foundation All Rights Reserved.
* @license RequireJS 2.1.15 Copyright (c) 2010-2014, The Dojo Foundation All Rights Reserved.
* Available via the MIT or new BSD license.
* see: http://github.com/jrburke/requirejs for details
*/
@@ -12,7 +12,7 @@ var requirejs, require, define;
(function (global) {
var req, s, head, baseElement, dataMain, src,
interactiveScript, currentlyAddingScript, mainScript, subPath,
version = '2.1.14',
version = '2.1.15',
commentRegExp = /(\/\*([\s\S]*?)\*\/|([^:]|^)\/\/(.*)$)/mg,
cjsRequireRegExp = /[^.]\s*require\s*\(\s*["']([^'"\s]+)["']\s*\)/g,
jsSuffixRegExp = /\.js$/,
View
@@ -44,7 +44,10 @@
"gzip-js": "0.3.2",
"jsdom": "1.5.0",
"load-grunt-tasks": "1.0.0",
"native-promise-only": "0.7.6-a",
"npm": "2.1.12",
"promises-aplus-tests": "2.1.0",
"q": "1.1.2",
"qunitjs": "1.17.1",
"requirejs": "2.1.15",
"sinon": "1.12.2",
Oops, something went wrong.

0 comments on commit 555a50d

Please sign in to comment.