aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTJ VanToll <tj.vantoll@gmail.com>2014-05-30 09:48:43 -0400
committerTJ VanToll <tj.vantoll@gmail.com>2014-06-02 15:08:40 -0400
commitd41e81980ea89e56c04eb14d8c27f4692b367604 (patch)
tree5036b7094c94375db9ce93d9a05d4a17bd32b71e
parent97c803acfb667f74774450e93666d9596f92bbf5 (diff)
downloadjquery-d41e81980ea89e56c04eb14d8c27f4692b367604.tar.gz
jquery-d41e81980ea89e56c04eb14d8c27f4692b367604.zip
Ajax: Support usage without jQuery.event
Fixes #15118 Closes gh-1588
-rw-r--r--src/ajax.js3
-rw-r--r--test/unit/ajax.js16
2 files changed, 18 insertions, 1 deletions
diff --git a/src/ajax.js b/src/ajax.js
index 502b33b2a..0d0644b92 100644
--- a/src/ajax.js
+++ b/src/ajax.js
@@ -536,7 +536,8 @@ jQuery.extend({
}
// We can fire global events as of now if asked to
- fireGlobals = s.global;
+ // Don't fire events if jQuery.event is undefined in an AMD-usage scenario (#15118)
+ fireGlobals = jQuery.event && s.global;
// Watch for a new set of requests
if ( fireGlobals && jQuery.active++ === 0 ) {
diff --git a/test/unit/ajax.js b/test/unit/ajax.js
index a332c929c..0f6de4696 100644
--- a/test/unit/ajax.js
+++ b/test/unit/ajax.js
@@ -420,6 +420,22 @@ module( "ajax", {
};
});
+ ajaxTest( "#15118 - jQuery.ajax() - function without jQuery.event", 1, function() {
+ var holder;
+ return {
+ url: url( "data/json.php" ),
+ setup: function() {
+ holder = jQuery.event;
+ delete jQuery.event;
+ },
+ complete: function() {
+ ok( true, "Call can be made without jQuery.event" );
+ jQuery.event = holder;
+ },
+ success: true
+ };
+ });
+
ajaxTest( "jQuery.ajax() - context modification", 1, {
url: url("data/name.html"),
context: {},