summaryrefslogtreecommitdiffstats
path: root/js/vendor/jquery/src/exports/global.js
diff options
context:
space:
mode:
authorBernhard Posselt <dev@bernhard-posselt.com>2014-12-23 12:50:15 +0100
committerBernhard Posselt <dev@bernhard-posselt.com>2014-12-23 12:50:15 +0100
commitf88f8fcb7f7451babc8aa20ecc0dad06dd27e1ed (patch)
treecb53495565d3a5757b6efc44c179b6d95b244721 /js/vendor/jquery/src/exports/global.js
parent367a4eed30e9fa77a2aa5d7924f041e967f8567d (diff)
update jasmine, karma and angular
Diffstat (limited to 'js/vendor/jquery/src/exports/global.js')
-rw-r--r--js/vendor/jquery/src/exports/global.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/js/vendor/jquery/src/exports/global.js b/js/vendor/jquery/src/exports/global.js
index 8eee5bb7f..6513287c6 100644
--- a/js/vendor/jquery/src/exports/global.js
+++ b/js/vendor/jquery/src/exports/global.js
@@ -22,8 +22,8 @@ jQuery.noConflict = function( deep ) {
return jQuery;
};
-// Expose jQuery and $ identifiers, even in
-// AMD (#7102#comment:10, https://github.com/jquery/jquery/pull/557)
+// 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 ) {
window.jQuery = window.$ = jQuery;