github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-24 01:38:56 -04:00
Code Issues Projects Releases Packages Wiki Activity

remove unneeded promises, return request promise from abort

Browse source
This commit is contained in:
Joe Fleming 2014-08-25 17:10:34 -07:00
parent 2989a3ee6b
commit 02422bdb1e
1 changed files with 9 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/kibana/apps/discover/_segmented_fetch.js
View file

@ -69,9 +69,8 @@ define(function (require) {
};
segmentedFetch.prototype.abort = function () {
var self = this;
return self._stopRequest();
this._stopRequest();
return this.lastRequestPromise;
};
segmentedFetch.prototype._startRequest = function (req) {
@ -85,24 +84,18 @@ define(function (require) {
}
};
return new Promise(function (resolve) {
self._setRequest(req);
self.notifyEvent = notify.event(eventName);
resolve();
});
self._setRequest(req);
self.notifyEvent = notify.event(eventName);
};
segmentedFetch.prototype._stopRequest = function () {
var self = this;
return new Promise(function (resolve) {
self._setRequest();
self._clearNotification();
if (self.searchPromise && 'abort' in self.searchPromise) {
self.searchPromise.abort();
}
resolve();
});
self._setRequest();
self._clearNotification();
if (self.searchPromise && 'abort' in self.searchPromise) {
self.searchPromise.abort();
}
};
segmentedFetch.prototype._setRequest = function (req) {