diff options
| author | Mike Greiling <mgreiling@gitlab.com> | 2017-03-14 00:48:32 +0300 |
|---|---|---|
| committer | Alfredo Sumaran <alfredo@gitlab.com> | 2017-03-14 00:48:32 +0300 |
| commit | 29e0cb4b91b3800ef4974c54b8473e6e4fb28e16 (patch) | |
| tree | 3b0f9d9e221755caa71be35a34f2fbc9072ebf0e /app/assets/javascripts/droplab | |
| parent | 88206d67c38e87685bbacc14cfd60ee9dc42ac7f (diff) | |
Organize our polyfills and standardize on core-js
Diffstat (limited to 'app/assets/javascripts/droplab')
| -rw-r--r-- | app/assets/javascripts/droplab/droplab_ajax.js | 3 | ||||
| -rw-r--r-- | app/assets/javascripts/droplab/droplab_ajax_filter.js | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/app/assets/javascripts/droplab/droplab_ajax.js b/app/assets/javascripts/droplab/droplab_ajax.js index f61be741b4a..020f8b4ac65 100644 --- a/app/assets/javascripts/droplab/droplab_ajax.js +++ b/app/assets/javascripts/droplab/droplab_ajax.js @@ -74,6 +74,9 @@ require('../window')(function(w){ this._loadUrlData(config.endpoint) .then(function(d) { self._loadData(d, config, self); + }, function(xhrError) { + // TODO: properly handle errors due to XHR cancellation + return; }).catch(function(e) { throw new droplabAjaxException(e.message || e); }); diff --git a/app/assets/javascripts/droplab/droplab_ajax_filter.js b/app/assets/javascripts/droplab/droplab_ajax_filter.js index b63d73066cb..05eba7aef56 100644 --- a/app/assets/javascripts/droplab/droplab_ajax_filter.js +++ b/app/assets/javascripts/droplab/droplab_ajax_filter.js @@ -82,6 +82,9 @@ require('../window')(function(w){ this._loadUrlData(url) .then(function(data) { self._loadData(data, config, self); + }, function(xhrError) { + // TODO: properly handle errors due to XHR cancellation + return; }); } }, |