rename trackSelectorType conf var to trackSelector.type

jbrowse_conf.json

@@ -1,9 +1,19 @@
 // JBrowse JSON-format configuration file
 {
-   trackSelectorType: 'Faceted',
-   trackMetadata: { sources: [] },
-   trackSelector: {
-       displayColumns: ['key', 'organism', 'technique', 'target', 'factor', 'developmental-stage','principal_investigator','submission' ],
-       renameFacets: { 'developmental-stage': 'Conditions', submission: 'Submission ID' }
-   }
+
+    // uncomment the lines below to configure a faceted track selector
+    // trackSelector: {
+    //     type: 'Faceted',
+    //     displayColumns: ['key', 'organism', 'technique', 'target', 'factor', 'developmental-stage','principal_investigator','submission' ],
+    //     renameFacets: { 'developmental-stage': 'Conditions', submission: 'Submission ID' }
+    // },
+    // trackMetadata: {
+    //   filterFacets: [ 'category', 'organism','target','technique','principal_investigator','factor','developmental-stage','strain','cell-line','tissue','compound','temperature' ],
+    //   sources: [
+    //     { url: 'sample_data/json/modencode/modencodeMetaData.json', 'class': 'JBrowse.Model.modEncodeTrackMetadata' }
+    //   ]
+    // },
+
+    // the variable below does nothing
+    placeholder: 1
 }

js/Browser.js

@@ -502,14 +502,13 @@ Browser.prototype.createTrackList = function() {
 
     // find the tracklist class to use
     var resolved_tl_class = function() {
-        var tl_class = this.config.show_tracklist == 0 ? 'Null'                        :
-                       this.config.trackSelectorType   ? this.config.trackSelectorType :
-                                                         'Simple';
-        tl_class.replace(/[^\.\w\d]/g, ''); // sanitize tracklist class for security
-        return JBrowse.View.TrackList[tl_class] || eval( tl_class );
+        var tl_class = this.config.show_tracklist == 0      ? 'Null'                         :
+                       (this.config.trackSelector||{}).type ? this.config.trackSelector.type :
+                                                              'Simple';
+        return JBrowse.View.TrackList[tl_class] || eval( tl_class.replace(/[^\.\w\d]/g, '') ); // sanitize tracklist class for a little security
     }.call(this);
     if( !resolved_tl_class ) {
-        console.error("configured trackSelectorType "+tl_class+" not found, falling back to JBrowse.View.TrackList.Simple");
+        console.error("configured trackSelector.type "+tl_class+" not found, falling back to JBrowse.View.TrackList.Simple");
         resolved_tl_class = JBrowse.View.TrackList.Simple;
     }