From 98154525b78f94317b6bbef0f4a2d220912f5b94 Mon Sep 17 00:00:00 2001 From: AlekseyMartynov Date: Mon, 15 Jul 2019 14:28:27 +0300 Subject: [PATCH] Don't assign byKey, totalCount if loadMode=raw --- js-test/test.js | 20 ++++++++++++++++---- js/dx.aspnet.data.js | 5 +++-- 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/js-test/test.js b/js-test/test.js index b3907d3b..50195b2b 100644 --- a/js-test/test.js +++ b/js-test/test.js @@ -470,6 +470,7 @@ var done = assert.async(); var store = createStore({ + key: "this", loadUrl: "/", loadMode: "raw", onBeforeSend: function(op, ajax) { @@ -486,10 +487,21 @@ willRespondWithJson({ data: [ 0, 1, 2, 3 ]}); - store.load(loadOptions).done(function(r) { - assert.deepEqual(r, [ 2, 1 ]); - done(); - }); + Promise.all([ + + store.load(loadOptions).done(function(r) { + assert.deepEqual(r, [ 2, 1 ]); + }), + + store.byKey(3).done(function(obj) { + assert.equal(obj, 3); + }), + + store.totalCount().done(function(count) { + assert.equal(count, 4); + }) + + ]).then(done); }); }); diff --git a/js/dx.aspnet.data.js b/js/dx.aspnet.data.js index af9f05d9..556822d2 100644 --- a/js/dx.aspnet.data.js +++ b/js/dx.aspnet.data.js @@ -47,6 +47,7 @@ loadUrl = options.loadUrl, loadMethod = options.loadMethod || "GET", loadParams = options.loadParams, + isRawLoadMode = options.loadMode === "raw", updateUrl = options.updateUrl, insertUrl = options.insertUrl, deleteUrl = options.deleteUrl, @@ -182,7 +183,7 @@ ); }, - totalCount: function(loadOptions) { + totalCount: !isRawLoadMode && function(loadOptions) { return send( "load", false, @@ -199,7 +200,7 @@ ); }, - byKey: function(key) { + byKey: !isRawLoadMode && function(key) { return send( "load", true,