Skip to content

Commit

Permalink
Merge pull request #1346 from adumesny/develop
Browse files Browse the repository at this point in the history
more UMD support
  • Loading branch information
adumesny authored Sep 4, 2020
2 parents db080e5 + 7775cea commit 14e23ae
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/jquery.js
Original file line number Diff line number Diff line change
Expand Up @@ -10861,9 +10861,9 @@ jQuery.noConflict = function( deep ) {
// Expose jQuery and $ identifiers, even in AMD
// (#7102#comment:10, https://github.com/jquery/jquery/pull/557)
// and CommonJS for browser emulators (#13566)
//if ( !noGlobal ) { [alain] noGlobal=true when using webpack/TS, yet we compile this in, not AMD load, so always expose
if ( !noGlobal ) {
window.jQuery = window.$ = jQuery;
//}
}



Expand Down

0 comments on commit 14e23ae

Please sign in to comment.