bugfixes

emberjs · Nov 5, 2019 · 8247348 · 8247348
1 parent ce2e67d
commit 8247348
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/packages/store/addon/-private/system/core-store.ts b/packages/store/addon/-private/system/core-store.ts
@@ -2243,7 +2243,10 @@ abstract class CoreStore extends Service {
     let snapshotArray = array._createSnapshot(options);
 
     if (options.reload !== false) {
-      if (adapter.shouldReloadAll && adapter.shouldReloadAll(this, snapshotArray) || array.length !== 0) {
+      if (
+        (adapter.shouldReloadAll && adapter.shouldReloadAll(this, snapshotArray)) ||
+        (!adapter.shouldReloadAll && snapshotArray.length > 0)
+      ) {
         set(array, 'isUpdating', true);
         return promiseArray(_findAll(adapter, this, modelName, options));
       }
@@ -2253,7 +2256,10 @@ abstract class CoreStore extends Service {
       return promiseArray(Promise.resolve(array));
     }
 
-    if (options.backgroundReload || adapter.shouldBackgroundReloadAll && adapter.shouldBackgroundReloadAll(this, snapshotArray)) {
+    if (
+      options.backgroundReload ||
+      (adapter.shouldBackgroundReloadAll && adapter.shouldBackgroundReloadAll(this, snapshotArray))
+    ) {
       set(array, 'isUpdating', true);
       _findAll(adapter, this, modelName, options);
     }