github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-23 17:28:26 -04:00
Code Issues Projects Releases Packages Wiki Activity

better checking of searchPromise

Browse source
This commit is contained in:
Joe Fleming 2014-08-20 17:48:38 -07:00
parent 536e52e3d3
commit 348979b989
1 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -25,6 +25,7 @@ define(function (require) {
var self = this;
var p = Promise.resolve();
// stop any existing segmentedFetches
if (self.running) {
p = p.then(self._stopRequest);
}
@ -204,9 +205,12 @@ define(function (require) {
segmentedFetch.prototype.abort = function () {
var self = this;
var stop = self._stopRequest();
if ('abort' in self.searchPromise) {
// if we have a searchPromise, abort it as well
if (self.searchPromise && 'abort' in self.searchPromise) {
return stop.then(self.searchPromise.abort);
}
return stop;
};