fix bug with faceted selector not fully initializing if no track meta…

…data sources are defined
GMOD · Jun 5, 2012 · 30fb67b · 30fb67b
1 parent a029205
commit 30fb67b
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 4 deletions.
diff --git a/js/Model/TrackMetaData.js b/js/Model/TrackMetaData.js
@@ -135,7 +135,7 @@ dojo.declare( 'JBrowse.Model.TrackMetaData', null,
         },this);
 
         this.ready = true;
-        this.onReady();
+        this._onReady();
     },
 
     _itemSortFunc: function(a,b) {
@@ -556,11 +556,27 @@ dojo.declare( 'JBrowse.Model.TrackMetaData', null,
         },this);
     },
 
+    onReady: function( scope, func ) {
+        scope = scope || dojo.global;
+        func = dojo.hitch( scope, func );
+        if( ! this.ready ) {
+            this.onReadyFuncs.push( func );
+            return;
+        } else {
+            func();
+        }
+    },
+
     /**
      * Event hook called once when the store is initialized and has
      * an initial set of data loaded.
      */
-    onReady: function() {},
+    _onReady: function() {
+        dojo.forEach( this.onReadyFuncs || [], function(func) {
+            func.call();
+        });
+    },
+
     /**
      * Event hook called after a fetch has been successfully completed
      * on this store.

diff --git a/js/View/TrackList/Faceted.js b/js/View/TrackList/Faceted.js
@@ -56,7 +56,7 @@ dojo.declare( 'JBrowse.View.TrackList.Faceted', null,
        this.renderInitial();
 
        // once its data is loaded and ready
-       dojo.connect( this.trackDataStore, 'onReady', this, function() {
+       this.trackDataStore.onReady( this, function() {
 
            // render our controls and so forth
            this.renderSelectors();
@@ -81,7 +81,7 @@ dojo.declare( 'JBrowse.View.TrackList.Faceted', null,
                          });
            });
        });
-       dojo.connect( this.trackDataStore, 'onReady', this, '_updateFacetCounts' ); // just once at start
+       this.trackDataStore.onReady( this, '_updateFacetCounts' ); // just once at start
 
        dojo.connect( this.trackDataStore, 'onFetchSuccess', this, '_updateGridSelections' );
        dojo.connect( this.trackDataStore, 'onFetchSuccess', this, '_updateMatchCount' );