X-Git-Url: https://adrianiainlam.tk/git/?a=blobdiff_plain;f=dygraph-options.js;h=98ef35fde3825f7b59e74707717292f90df10d84;hb=335011fd4473f55aaaceb69726d15e0063373149;hp=2dc88ae471cacaf48bc05a7f90b14ea35bd0ef01;hpb=24c213629697b908cf5727990a17c265a7dfe444;p=dygraphs.git

diff --git a/dygraph-options.js b/dygraph-options.js
index 2dc88ae..98ef35f 100644
--- a/dygraph-options.js
+++ b/dygraph-options.js
@@ -290,11 +290,13 @@ DygraphOptions.prototype.getForAxis = function(name, axis) {
   }
 
   // User-specified global options second.
-  var result = this.getGlobalUser_(name);
-  if (result !== null) {
-    return result;
+  // But, hack, ignore globally-specified 'logscale' for 'x' axis declaration.
+  if (!(axis === 'x' && name === 'logscale')) {
+    var result = this.getGlobalUser_(name);
+    if (result !== null) {
+      return result;
+    }
   }
-
   // Default axis options third.
   var defaultAxisOptions = Dygraph.DEFAULT_ATTRS.axes[axisString];
   if (defaultAxisOptions.hasOwnProperty(name)) {