feat(ngTableParams): allow getData to return an array of data

This simplifies using ng-table with in memory lists of data
esvit · Aug 2, 2015 · ab9ffdf · ab9ffdf
1 parent 155ef62
commit ab9ffdf
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/src/scripts/03-params.js b/src/scripts/03-params.js
@@ -481,6 +481,8 @@ app.factory('NgTableParams', ['$q', '$log', 'ngTableDefaults', function($q, $log
                 // If getData resolved the $defer, and didn't promise us data,
                 //   create a promise from the $defer. We need to return a promise.
                 pData = $defer.promise;
+            } else {
+                pData = $q.when(pData);
             }
             return pData.then(function(data) {
                 settings.$loading = false;