Only trim after destroy, no trim timeout

JFTavares · May 29, 2015 · 42efc34 · 42efc34
1 parent 812be32
commit 42efc34
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 22 deletions.
diff --git a/dist/epub.js b/dist/epub.js
@@ -4577,9 +4577,9 @@ EPUBJS.View.prototype.resized = function(e) {
 
 EPUBJS.View.prototype.display = function(_request) {
 
-  if(this.rendering){
-    return this.displayed;
-  }
+  // if(this.rendering){
+  //   return this.displayed;
+  // }
 
   this.rendering = true;
   this.displaying = new RSVP.defer();
@@ -5597,7 +5597,6 @@ EPUBJS.Continuous.prototype.append = function(view){
 	this.views.push(view);
 	this.container.appendChild(view.element);
 
-
 	// view.on("shown", this.afterDisplayed.bind(this));
 	view.onShown = this.afterDisplayed.bind(this);
 
@@ -5712,31 +5711,33 @@ EPUBJS.Continuous.prototype.check = function(){
 		var visible = this.isVisible(view, this.settings.offset, container);
 
 		if(visible) {
-			
+
 			if(!view.shown && !view.rendering) {
+          // console.log("render",view.section.index)
 					promises.push(this.render(view));
 			}
 
 		} else {
 
 			if(view.shown) {
+        // console.log("destroy", view.section.index)
         view.destroy();
+        this.q.enqueue(this.trim);
 			}
 
 		}
 
 	}.bind(this));
 
-  clearTimeout(this.trimTimeout);
-  this.trimTimeout = setTimeout(function(){
-    this.q.enqueue(this.trim);
-  }.bind(this), 250);
+  // clearTimeout(this.trimTimeout);
+  // this.trimTimeout = setTimeout(function(){
+  //   this.q.enqueue(this.trim);
+  // }.bind(this), 250);
 
   if(promises.length){
 
     return RSVP.all(promises)
       .then(function(posts) {
-
         // Check to see if anything new is on screen after rendering
         this.q.enqueue(this.check);
 

diff --git a/dist/epub.min.js b/dist/epub.min.js
diff --git a/lib/epubjs/continuous.js b/lib/epubjs/continuous.js
@@ -126,7 +126,6 @@ EPUBJS.Continuous.prototype.append = function(view){
 	this.views.push(view);
 	this.container.appendChild(view.element);
 
-
 	// view.on("shown", this.afterDisplayed.bind(this));
 	view.onShown = this.afterDisplayed.bind(this);
 
@@ -241,31 +240,33 @@ EPUBJS.Continuous.prototype.check = function(){
 		var visible = this.isVisible(view, this.settings.offset, container);
 
 		if(visible) {
-			
+
 			if(!view.shown && !view.rendering) {
+          // console.log("render",view.section.index)
 					promises.push(this.render(view));
 			}
 
 		} else {
 
 			if(view.shown) {
+        // console.log("destroy", view.section.index)
         view.destroy();
+        this.q.enqueue(this.trim);
 			}
 
 		}
 
 	}.bind(this));
 
-  clearTimeout(this.trimTimeout);
-  this.trimTimeout = setTimeout(function(){
-    this.q.enqueue(this.trim);
-  }.bind(this), 250);
+  // clearTimeout(this.trimTimeout);
+  // this.trimTimeout = setTimeout(function(){
+  //   this.q.enqueue(this.trim);
+  // }.bind(this), 250);
 
   if(promises.length){
 
     return RSVP.all(promises)
       .then(function(posts) {
-
         // Check to see if anything new is on screen after rendering
         this.q.enqueue(this.check);
 

diff --git a/lib/epubjs/view.js b/lib/epubjs/view.js
@@ -176,9 +176,9 @@ EPUBJS.View.prototype.resized = function(e) {
 
 EPUBJS.View.prototype.display = function(_request) {
 
-  if(this.rendering){
-    return this.displayed;
-  }
+  // if(this.rendering){
+  //   return this.displayed;
+  // }
 
   this.rendering = true;
   this.displaying = new RSVP.defer();