projects
/
dygraphs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #464 from danvk/sourcemap
[dygraphs.git]
/
dygraph-options.js
diff --git
a/dygraph-options.js
b/dygraph-options.js
index
2dc88ae
..
b0fad61
100644
(file)
--- a/
dygraph-options.js
+++ b/
dygraph-options.js
@@
-183,7
+183,7
@@
DygraphOptions.prototype.reparseSeries = function() {
if (typeof(axis) == 'string') {
if (!this.series_.hasOwnProperty(axis)) {
if (typeof(axis) == 'string') {
if (!this.series_.hasOwnProperty(axis)) {
-
Dygraph
.error("Series " + seriesName + " wants to share a y-axis with " +
+
console
.error("Series " + seriesName + " wants to share a y-axis with " +
"series " + axis + ", which does not define its own axis.");
return;
}
"series " + axis + ", which does not define its own axis.");
return;
}
@@
-290,11
+290,13
@@
DygraphOptions.prototype.getForAxis = function(name, axis) {
}
// User-specified global options second.
}
// 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)) {
// Default axis options third.
var defaultAxisOptions = Dygraph.DEFAULT_ATTRS.axes[axisString];
if (defaultAxisOptions.hasOwnProperty(name)) {