Ver código fonte

remove scroll and height-freezing improvements

Adam Shaw 9 anos atrás
pai
commit
b338b8ddec
1 arquivos alterados com 10 adições e 0 exclusões
  1. 10 0
      src/common/View.js

+ 10 - 0
src/common/View.js

@@ -345,6 +345,7 @@ var View = FC.View = Class.extend(EmitterMixin, ListenerMixin, {
 	setDate: function(date, forcedScroll) {
 	setDate: function(date, forcedScroll) {
 		var _this = this;
 		var _this = this;
 
 
+		// do this before unsetDate, which is destructive
 		this.captureScroll();
 		this.captureScroll();
 		this.calendar.freezeContentHeight();
 		this.calendar.freezeContentHeight();
 
 
@@ -732,11 +733,15 @@ var View = FC.View = Class.extend(EmitterMixin, ListenerMixin, {
 	resetEvents: function(events) {
 	resetEvents: function(events) {
 		var _this = this;
 		var _this = this;
 
 
+		// do this before unsetEvents, a destructive action
 		this.captureScroll();
 		this.captureScroll();
+		this.calendar.freezeContentHeight();
+
 		this.unsetEvents();
 		this.unsetEvents();
 
 
 		return this.setEvents(events).then(function() {
 		return this.setEvents(events).then(function() {
 			_this.releaseScroll();
 			_this.releaseScroll();
+			_this.calendar.freezeContentHeight();
 		});
 		});
 	},
 	},
 
 
@@ -753,8 +758,13 @@ var View = FC.View = Class.extend(EmitterMixin, ListenerMixin, {
 
 
 			return this.eventRenderQueue.push(function() {
 			return this.eventRenderQueue.push(function() {
 				_this.captureScroll();
 				_this.captureScroll();
+				_this.calendar.freezeContentHeight();
+
 				_this.renderEvents(events);
 				_this.renderEvents(events);
+
+				_this.calendar.unfreezeContentHeight();
 				_this.releaseScroll();
 				_this.releaseScroll();
+
 				_this.triggerEventRender();
 				_this.triggerEventRender();
 			});
 			});
 		}
 		}