fix(autocomplete): reset loading state for non-q promises

always reset loading state of autocomplete after handleResults() even if promise implementation does not support finally()
angular · Jan 27, 2016 · 3588c0a · 3588c0a
1 parent 0918596
commit 3588c0a
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/src/components/autocomplete/js/autocompleteController.js b/src/components/autocomplete/js/autocompleteController.js
@@ -641,9 +641,15 @@ function MdAutocompleteCtrl ($scope, $element, $mdUtil, $mdConstant, $mdTheming,
       $mdUtil.nextTick(function () {
         if (items.success) items.success(handleResults);
         if (items.then)    items.then(handleResults);
-        if (items.finally) items.finally(function () {
-          setLoading(false);
-        });
+        if (items.finally) {
+          items.finally(function () {
+            setLoading(false);
+          });
+        } else if (items.then) {
+          items.then(function () {
+            setLoading(false);
+          });
+        }
       },true, $scope);
     }
     function handleResults (matches) {