some miscellaneous attempted bugfixes for weirdness in closure-compil…

…ed code under firefox
GMOD · Jan 31, 2013 · a5a0c56 · a5a0c56
1 parent d4ff773
commit a5a0c56
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/src/JBrowse/ConfigAdaptor/AdaptorUtil.js b/src/JBrowse/ConfigAdaptor/AdaptorUtil.js
@@ -12,7 +12,7 @@ define( [ 'dojox/lang/functional/object',
                 else if( typeof conf[x] == 'string' ) {
                     // compile
                     var spec = conf[x];
-                    if( /^function\s*\(/.test(spec) && /\}[\s;]*$/.test(spec) ) {
+                    if( /^\s*function\s*\(/.test(spec) && /\}[\s;]*$/.test(spec) ) {
                         conf[x] = this.evalHook(spec);
                     }
                 }

diff --git a/src/JBrowse/View/Track/HTMLFeatures.js b/src/JBrowse/View/Track/HTMLFeatures.js
@@ -362,9 +362,7 @@ var HTMLFeatures = declare( [ BlockBased, YScaleMixin, ExportMixin, FeatureDetai
                 else {
                     // if we have transitioned to viewing features, delete the
                     // y-scale used for the histograms
-                    if( this.yscale ) {
-                        this._removeYScale();
-                    }
+                    this._removeYScale();
                     this.fillFeatures( dojo.mixin( {stats: stats}, args ) );
                 }
         }));
@@ -411,8 +409,10 @@ var HTMLFeatures = declare( [ BlockBased, YScaleMixin, ExportMixin, FeatureDetai
      * @private
      */
     _removeYScale: function() {
-        if( !this.yscale )
+        if( !this.yscale ) {
+            dojo.query( '.ruler', this.div ).orphan();
             return;
+        }
         this.yscale.parentNode.removeChild( this.yscale );
         delete this.yscale_params;
         delete this.yscale;

diff --git a/src/JBrowse/package.json b/src/JBrowse/package.json
@@ -1,6 +1,6 @@
 {
     "name": "JBrowse",
-    "version": "dev",
+    "version": "1.8.0",
     "main": "main",
     "dependencies": {
         "dojo": "current",