Adam Shaw 9 лет назад
Родитель
Сommit
8fd076f7f9
1 измененных файлов с 14 добавлено и 5 удалено
  1. 14 5
      src/common/View.js

+ 14 - 5
src/common/View.js

@@ -422,8 +422,7 @@ var View = FC.View = Class.extend(EmitterMixin, ListenerMixin, {
 			_this.releaseScroll();
 
 			_this.isDateRendered = true;
-
-			_this.triggerRender();
+			_this.triggerDateRender();
 		});
 	},
 
@@ -477,6 +476,11 @@ var View = FC.View = Class.extend(EmitterMixin, ListenerMixin, {
 	// --------------------
 
 
+	triggerDateRender: function() {
+		this.triggerRender();
+	},
+
+
 	// Signals that the view's content has been rendered
 	triggerRender: function() {
 		this.trigger('viewRender', this, this, this.el);
@@ -845,9 +849,14 @@ var View = FC.View = Class.extend(EmitterMixin, ListenerMixin, {
 	requestEventsUnrender: function() {
 		var _this = this;
 
-		return this.eventRenderQueue.add(function() {
-			return _this.forceEventsUnrender();
-		});
+		if (this.isEventsRendered) {
+			return this.eventRenderQueue.add(function() {
+				return _this.forceEventsUnrender();
+			});
+		}
+		else {
+			return Promise.resolve();
+		}
 	},