diff options
| author | Timmy Willison <timmywillisn@gmail.com> | 2014-12-09 15:39:24 -0500 |
|---|---|---|
| committer | Timmy Willison <timmywillisn@gmail.com> | 2014-12-09 15:39:24 -0500 |
| commit | 6051609df35ef5e478c79c76534c03e4b46100bf (patch) | |
| tree | 65da2705750c520dbdea933aacce39887d482c2a /src | |
| parent | 58c24608210c9a9a264a38746628ebc26823f59b (diff) | |
| download | jquery-6051609df35ef5e478c79c76534c03e4b46100bf.tar.gz jquery-6051609df35ef5e478c79c76534c03e4b46100bf.zip | |
Build: fix tests in AMD mode
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/parseHTML.js | 2 | ||||
| -rw-r--r-- | src/core/support.js | 4 | ||||
| -rw-r--r-- | src/exports/global.js | 6 | ||||
| -rw-r--r-- | src/jquery.js | 5 | ||||
| -rw-r--r-- | src/outro.js | 1 |
5 files changed, 8 insertions, 10 deletions
diff --git a/src/core/parseHTML.js b/src/core/parseHTML.js index 54016a4c1..c441b2b92 100644 --- a/src/core/parseHTML.js +++ b/src/core/parseHTML.js @@ -1,6 +1,8 @@ define([ "../core", "./var/rsingleTag", + "./support", + "../manipulation" // buildFragment ], function( jQuery, rsingleTag, support ) { diff --git a/src/core/support.js b/src/core/support.js index fe3d6c218..d3ed33c04 100644 --- a/src/core/support.js +++ b/src/core/support.js @@ -1,6 +1,8 @@ define([ "../var/support" -], function( jQuery, support ) { +], function( support ) { // window.document is used here as it's before the sandboxed document support.createHTMLDocument = !!window.document.implementation.createHTMLDocument; + + return support; }); diff --git a/src/exports/global.js b/src/exports/global.js index d96cc4d93..5d4d050fe 100644 --- a/src/exports/global.js +++ b/src/exports/global.js @@ -1,7 +1,3 @@ -define([ - "../core" -], function( jQuery ) { - var // Map over jQuery in case of overwrite _jQuery = window.jQuery, @@ -27,5 +23,3 @@ jQuery.noConflict = function( deep ) { if ( !noGlobal ) { window.jQuery = window.$ = jQuery; } - -}); diff --git a/src/jquery.js b/src/jquery.js index d3857e955..1d56c4b15 100644 --- a/src/jquery.js +++ b/src/jquery.js @@ -28,10 +28,9 @@ define([ "./offset", "./dimensions", "./deprecated", - "./exports/amd", - "./exports/global" + "./exports/amd" ], function( jQuery ) { -return jQuery; +return (window.jQuery = window.$ = jQuery); }); diff --git a/src/outro.js b/src/outro.js index be4600a5c..d792ffb58 100644 --- a/src/outro.js +++ b/src/outro.js @@ -1 +1,2 @@ +return jQuery; })); |