diff options
| author | Timmy Willison <timmywillisn@gmail.com> | 2016-01-19 14:47:52 -0500 |
|---|---|---|
| committer | Timmy Willison <timmywillisn@gmail.com> | 2016-04-04 11:26:22 -0400 |
| commit | 5cbb234dd3273d8e0bbd454fb431ad639c7242c1 (patch) | |
| tree | b3882c863f2757e7e77f16e69a6cb1dbeaea8205 /build | |
| parent | 6072d150d61655ec07f714e1d58a0bd7baa5ec3f (diff) | |
| download | jquery-5cbb234dd3273d8e0bbd454fb431ad639c7242c1.tar.gz jquery-5cbb234dd3273d8e0bbd454fb431ad639c7242c1.zip | |
Core: implement ready without Deferred
- Make jQuery.ready promise-compatible
- Gives up sync guarantee for post-ready callbacks
Fixes gh-1778
Fixes gh-1823
Close gh-2891
Diffstat (limited to 'build')
| -rw-r--r-- | build/tasks/build.js | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/build/tasks/build.js b/build/tasks/build.js index 1e1c6bb37..a62f04ab1 100644 --- a/build/tasks/build.js +++ b/build/tasks/build.js @@ -168,7 +168,8 @@ module.exports = function( grunt ) { * whether it should included or excluded */ excluder = function( flag ) { - var m = /^(\+|\-|)([\w\/-]+)$/.exec( flag ), + var additional, + m = /^(\+|\-|)([\w\/-]+)$/.exec( flag ), exclude = m[ 1 ] === "-", module = m[ 2 ]; @@ -192,8 +193,16 @@ module.exports = function( grunt ) { } } + additional = removeWith[ module ]; + // Check removeWith list - excludeList( removeWith[ module ] ); + if ( additional ) { + excludeList( additional.remove || additional ); + if ( additional.include ) { + included = included.concat( additional.include ); + grunt.log.writeln( "+" + additional.include ); + } + } } else { grunt.log.error( "Module \"" + module + "\" is a minimum requirement." ); if ( module === "selector" ) { |