Skip to content

Commit a473a97

Browse files
authored
Add jQuery strategy for deferred utils (#1327)
1 parent 7fe305b commit a473a97

File tree

4 files changed

+20
-5
lines changed

4 files changed

+20
-5
lines changed

js/core/utils/deferred.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,6 @@ exports.setStrategy = function(value) {
145145
when = value.when;
146146
};
147147

148-
149148
exports.Deferred = function() {
150149
return new Deferred();
151150
};

js/integration/jquery.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ if(jQuery) {
1111
}
1212

1313
require("./jquery/renderer");
14+
require("./jquery/deferred");
1415
require("./jquery/hold_ready");
1516
require("./jquery/events");
1617
require("./jquery/easing");

testing/tests/DevExpress.jquery/deferred.js renamed to testing/tests/DevExpress.jquery/deferred.tests.js

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,24 @@
11
"use strict";
22

3-
var $ = require("jquery"),
4-
deferredUtils = require("core/utils/deferred");
3+
var $ = require("jquery");
4+
var deferredUtils = require("core/utils/deferred");
5+
var useJQueryRenderer = require("core/config")().useJQueryRenderer;
56

6-
require("integration/jquery/deferred");
7+
require("integration/jquery");
8+
9+
QUnit.module("jQuery strategy");
10+
11+
QUnit.test("jQuery strategy should be used if useJQueryRenderer flag was set", function(assert) {
12+
if(!useJQueryRenderer) {
13+
assert.expect(0);
14+
return;
15+
}
16+
17+
var d1 = new deferredUtils.Deferred();
18+
var d2 = new $.Deferred();
19+
20+
assert.equal(d1.constructor, d2.constructor, "deferred is jQuery.Deferred");
21+
});
722

823
QUnit.module("when");
924

testing/tests/DevExpress.jquery/easing.tests.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
var $ = require("jquery"),
44
easing = require("animation/easing");
55

6-
require("integration/jquery/easing");
6+
require("integration/jquery");
77

88
QUnit.module("easing");
99

0 commit comments

Comments
 (0)