Ticket #301: ticket301.patch

js/Commands.js

@@ -4 +4 @@
 
 config.commands.closeTiddler.handler = function(event,src,title)
 {
-        story.closeTiddler(title,true,event.shiftKey || event.altKey);
+        story.closeTiddler(title,true,event.shiftKey || event.altKey,true);
         return false;
 };
 
 config.commands.closeOthers.handler = function(event,src,title)
 {
-        story.closeAllTiddlers(title);
+        story.closeAllTiddlers(title,true);
         return false;
 };
 

js/Macros.js

@@ -253 +253 @@
 
 config.macros.closeAll.onClick = function(e)
 {
-        story.closeAllTiddlers();
+        story.closeAllTiddlers(null,true);
         return false;
 };
 

js/Story.js

@@ -398 +398 @@
 //# title - name of tiddler to close
 //# animate - whether to perform animations
 //# slowly - whether to perform animations in slomo
-Story.prototype.closeTiddler = function(title,animate,slowly)
+//# allowAsync - when true closing the tiddler will occur asynchronously (i.e. possibly after this function returned). (Pass true here as often as possible as it gets rid of the problem described in ticket #301)
+Story.prototype.closeTiddler = function(title,animate,slowly,allowAsync)
 {
         var tiddlerElem = document.getElementById(this.idPrefix + title);
         if(tiddlerElem != null) {
@@ -406 +407 @@
                 this.scrubTiddler(tiddlerElem);
                 if(config.options.chkAnimate && animate && anim && typeof Slider == "function")
                         anim.startAnimating(new Slider(tiddlerElem,false,slowly,"all"));
-                else
-                        tiddlerElem.parentNode.removeChild(tiddlerElem);
+                else {
+                        //# bugfox for ticket #301: set overflow=hidden and use asynch redraw (if allowed)
+                        tiddlerElem.style.overflow = "hidden";
+                        if (allowAsync)
+                                setTimeout(function(){tiddlerElem.parentNode.removeChild(tiddlerElem)},0);
+                        else
+                                tiddlerElem.parentNode.removeChild(tiddlerElem);
+                }
         }
-};
+}
 
 //# Scrub IDs from a tiddler. This is so that the 'ghost' of a tiddler while it is being closed
 //# does not interfere with things
@@ -450 +457 @@
 };
 
 //# Close all tiddlers in the story
-Story.prototype.closeAllTiddlers = function(exclude)
+//# exclude - title of tiddler that should not be closed (i.e. the "close others" case)
+//# allowAsync - when true closing the tiddler will occur asynchronously (i.e. possibly after this function returned).  (Pass true here as often as possible as it gets rid of the problem described in ticket #301)
+Story.prototype.closeAllTiddlers = function(exclude,allowAsync)
 {
         clearMessage();
         this.forEachTiddler(function(title,element) {
                 if((title != exclude) && element.getAttribute("dirty") != "true")
-                        this.closeTiddler(title);
-        });
+                        this.closeTiddler(title,false,false,allowAsync);
+                });
         window.scrollTo(0,ensureVisible(this.container));
 };