diff options
| author | Matthieu Aubry <mattab@users.noreply.github.com> | 2016-06-28 08:50:40 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-28 08:50:40 +0300 |
| commit | 02daed6db8fb7269d1b3a466cbb32ed7fab76e85 (patch) | |
| tree | a534b2905593d44eece6a9f896522e524cb0d28f /libs/bower_components/jquery/src/exports/global.js | |
| parent | f981b2579a95ce60a2b7d2aa146925b4d2222e0a (diff) | |
Update JQuery to the latest 1.12.4 version (#10260)
* Update JQuery to the latest 1.* version
* UI tests: Updated Jquery to latest version
Diffstat (limited to 'libs/bower_components/jquery/src/exports/global.js')
| -rw-r--r-- | libs/bower_components/jquery/src/exports/global.js | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/libs/bower_components/jquery/src/exports/global.js b/libs/bower_components/jquery/src/exports/global.js index 8eee5bb7f0..17ac17d533 100644 --- a/libs/bower_components/jquery/src/exports/global.js +++ b/libs/bower_components/jquery/src/exports/global.js @@ -1,9 +1,5 @@ -define([ - "../core", - "../var/strundefined" -], function( jQuery, strundefined ) { - var + // Map over jQuery in case of overwrite _jQuery = window.jQuery, @@ -25,8 +21,6 @@ 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 ( typeof noGlobal === strundefined ) { +if ( !noGlobal ) { window.jQuery = window.$ = jQuery; } - -}); |