update bull

2020-01-20 11:34:57 +02:00
parent 4b895ac442
commit 97dfe2e8d7
1 changed files with 39 additions and 7 deletions
@@ -810,31 +810,57 @@ var Bull = Bull || {};
         */
        createView: function (key, viewName, options, callback, wait) {
            this.clearView(key);
-            return new Promise(function (resolve) {
+
+            this._viewPromiseHash = this._viewPromiseHash || {};
+
+            var self = this;
+
+            var promise = this._viewPromiseHash[key] = new Promise(function (resolve, reject) {
+                var promise = this;
+                var context = self;
+
                wait = (typeof wait === 'undefined') ? true : wait;
-                var context = this;
+
                if (wait) {
-                    this.waitForView(key);
+                    self.waitForView(key);
                }
                options = options || {};
                if (!options.el) {
-                    options.el = this.getSelector() + ' [data-view="'+key+'"]';
+                    options.el = self.getSelector() + ' [data-view="'+key+'"]';
                }
-                this._factory.create(viewName, options, function (view) {
+
+                self._factory.create(viewName, options, function (view) {
+                    var previusView = this.getView(key);
+                    if (previusView) {
+                        previusView.cancelRender();
+                    }
+
+                    delete this._viewPromiseHash[key];
+
+                    if (promise._isToReject) {
+                        reject();
+                        return;
+                    }
+
                    var isSet = false;
                    if (this._isRendered || options.setViewBeforeCallback) {
                        this.setView(key, view);
                        isSet = true;
                    }
+
                    if (typeof callback === 'function') {
                        callback.call(context, view);
                    }
+
                    resolve(view);
+
                    if (!this._isRendered && !options.setViewBeforeCallback && !isSet) {
                        this.setView(key, view);
                    }
-                }.bind(this));
-            }.bind(this));
+                }.bind(self));
+            });
+
+            return promise;
        },

        /**
@@ -873,6 +899,12 @@ var Bull = Bull || {};
                this.nestedViews[key].remove();
                delete this.nestedViews[key];
            }
+
+            this._viewPromiseHash = this._viewPromiseHash || {};
+            var previousPromise = this._viewPromiseHash[key];
+            if (previousPromise) {
+                previousPromise._isToReject = true;
+            }
        },

        /**