From d5f1098b1df0b0a347708d60ccda455f9bc96999 Mon Sep 17 00:00:00 2001
From: diosmosis <benaka@piwik.pro>
Date: Sat, 13 Sep 2014 11:09:45 -0700
Subject: [PATCH] Do not abort all requests just last made request in site
selector model object.
---
.../CoreHome/angularjs/siteselector/siteselector-model.js | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/plugins/CoreHome/angularjs/siteselector/siteselector-model.js b/plugins/CoreHome/angularjs/siteselector/siteselector-model.js
index 126b8e35e3..664eaf4ac8 100644
--- a/plugins/CoreHome/angularjs/siteselector/siteselector-model.js
+++ b/plugins/CoreHome/angularjs/siteselector/siteselector-model.js
@@ -45,19 +45,22 @@ angular.module('piwikApp').factory('siteSelectorModel', function (piwikApi, $fil
}
if (model.isLoading) {
- piwikApi.abortAll();
+ model.currentRequest.abort();
}
model.isLoading = true;
- return piwikApi.fetch({
+ model.currentRequest = piwikApi.fetch({
method: 'SitesManager.getPatternMatchSites',
pattern: term
}).then(function (response) {
return model.updateWebsitesList(response);
})['finally'](function () { // .finally() is not IE8 compatible see https://github.com/angular/angular.js/commit/f078762d48d0d5d9796dcdf2cb0241198677582c
model.isLoading = false;
+ model.currentRequest = null;
});
+
+ return model.currentRequest;
};
model.loadSite = function (idsite) {
--
GitLab