Skip to content

Commit 1938b47

Browse files
Don't assign byKey, totalCount if loadMode=raw (#365)
1 parent 1673e88 commit 1938b47

2 files changed

Lines changed: 19 additions & 6 deletions

File tree

js-test/test.js

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -470,6 +470,7 @@
470470
var done = assert.async();
471471

472472
var store = createStore({
473+
key: "this",
473474
loadUrl: "/",
474475
loadMode: "raw",
475476
onBeforeSend: function(op, ajax) {
@@ -486,10 +487,21 @@
486487

487488
willRespondWithJson({ data: [ 0, 1, 2, 3 ]});
488489

489-
store.load(loadOptions).done(function(r) {
490-
assert.deepEqual(r, [ 2, 1 ]);
491-
done();
492-
});
490+
Promise.all([
491+
492+
store.load(loadOptions).done(function(r) {
493+
assert.deepEqual(r, [ 2, 1 ]);
494+
}),
495+
496+
store.byKey(3).done(function(obj) {
497+
assert.equal(obj, 3);
498+
}),
499+
500+
store.totalCount().done(function(count) {
501+
assert.equal(count, 4);
502+
})
503+
504+
]).then(done);
493505
});
494506
});
495507

js/dx.aspnet.data.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@
4747
loadUrl = options.loadUrl,
4848
loadMethod = options.loadMethod || "GET",
4949
loadParams = options.loadParams,
50+
isRawLoadMode = options.loadMode === "raw",
5051
updateUrl = options.updateUrl,
5152
insertUrl = options.insertUrl,
5253
deleteUrl = options.deleteUrl,
@@ -182,7 +183,7 @@
182183
);
183184
},
184185

185-
totalCount: function(loadOptions) {
186+
totalCount: !isRawLoadMode && function(loadOptions) {
186187
return send(
187188
"load",
188189
false,
@@ -199,7 +200,7 @@
199200
);
200201
},
201202

202-
byKey: function(key) {
203+
byKey: !isRawLoadMode && function(key) {
203204
return send(
204205
"load",
205206
true,

0 commit comments

Comments
 (0)