fix(ngTableParams): reload is never triggered once reload has failed …

…once
esvit · Oct 18, 2015 · 4369926 · 4369926
1 parent f2486b9
commit 4369926
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/src/scripts/ngTableParams.js b/src/scripts/ngTableParams.js
@@ -429,6 +429,9 @@
              * @name NgTableParams#isDataReloadRequired
              * @description Return true when a change to this `NgTableParams` instance should require the reload method
              * to be run so as to ensure the data presented to the user reflects the `NgTableParams`
+             *
+             * Note that this method will return false when the reload method has run but fails. In this case
+             * `hasErrorState` will return true.
              */
             this.isDataReloadRequired = function(){
                 // note: using != as want to treat null and undefined the same
@@ -581,8 +584,6 @@
                     return data;
                 }).catch(function(reason){
                     errParamsMemento = prevParamsMemento;
-                    prevParamsMemento = null;
-                    isCommittedDataset = false;
                     // "rethrow"
                     return $q.reject(reason);
                 });

diff --git a/test/tableParamsSpec.js b/test/tableParamsSpec.js
@@ -1009,13 +1009,13 @@ describe('NgTableParams', function () {
             expect(tp.isDataReloadRequired()).toBe(false);
         });
 
-        it('should return true when getData fails', inject(function($q){
+        it('should return false when getData fails', inject(function($q){
             tp.settings({ getData: function(){
                 return $q.reject('bad response');
             }});
             tp.reload();
             scope.$digest();
-            expect(tp.isDataReloadRequired()).toBe(true);
+            expect(tp.isDataReloadRequired()).toBe(false);
         }));
 
         it('should detect direct changes to parameters', inject(function($q){
@@ -1157,7 +1157,7 @@ describe('NgTableParams', function () {
             }});
             tp.reload();
             scope.$digest();
-            expect(tp.hasFilterChanges()).toBe(true);
+            expect(tp.hasFilterChanges()).toBe(false);
         }));
 
         it('should detect direct changes to filters', inject(function($q){

diff --git a/test/tableSpec.js b/test/tableSpec.js
@@ -1110,7 +1110,7 @@ describe('ng-table', function() {
             scope.$digest();
 
             // then
-            expect(tp.isDataReloadRequired()).toBe(true);
+            expect(tp.isDataReloadRequired()).toBe(false);
             expect(tp.settings().getData.calls.count()).toBe(2);
         }));