tweak timeout handling in HTMLFeatures

Conflicts: release-notes.txt
GMOD · Mar 8, 2013 · c2e0806 · c2e0806
1 parent ff6f6b1
commit c2e0806
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/release-notes.txt b/release-notes.txt
@@ -7,6 +7,9 @@
  * Fixed some missing dojo/dijit nls directories in the non-dev
    release zipfile.
 
+ * Fixed a bug with handling of timeout events in HTMLFeatures tracks.
+   Thanks to Matt Henderson of KBase for pointing this out.
+
 1.8.1     2013-02-12 12:56:24 EST5EDT
 
  * Added support for `cigarAttribute` and `mdAttributes` configuration

diff --git a/src/JBrowse/View/Track/HTMLFeatures.js b/src/JBrowse/View/Track/HTMLFeatures.js
@@ -507,11 +507,14 @@ var HTMLFeatures = declare( [ BlockBased, YScaleMixin, ExportMixin, FeatureDetai
         var timedOut = false;
         var timeOutError = { toString: function() { return 'Timed out trying to display '+curTrack.name+' block '+blockIndex; } };
         if( this.config.blockDisplayTimeout )
-            window.setTimeout( function() { timedOut = true; }, this.config.blockDisplayTimeout );
+            window.setTimeout( function() {
+                timedOut = true;
+                curTrack.fillBlockTimeout( blockIndex, block );
+            }, this.config.blockDisplayTimeout );
 
         var featCallback = dojo.hitch(this,function( feature ) {
             if( timedOut )
-                throw timeOutError;
+                return;
 
             var uniqueId = feature.id();
             if( ! this._featureIsRendered( uniqueId ) ) {