projects
/
dygraphs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of https://github.com/danvk/dygraphs into connect-separated...
[dygraphs.git]
/
dygraph.js
diff --git
a/dygraph.js
b/dygraph.js
index
cee63e8
..
6d970bb
100644
(file)
--- a/
dygraph.js
+++ b/
dygraph.js
@@
-352,6
+352,7
@@
Dygraph.DEFAULT_ATTRS = {
axisLabelFormatter: Dygraph.dateAxisFormatter,
valueFormatter: Dygraph.dateString_,
drawGrid: true,
axisLabelFormatter: Dygraph.dateAxisFormatter,
valueFormatter: Dygraph.dateString_,
drawGrid: true,
+ drawAxis: true,
independentTicks: true,
ticker: null // will be set in dygraph-tickers.js
},
independentTicks: true,
ticker: null // will be set in dygraph-tickers.js
},
@@
-360,6
+361,7
@@
Dygraph.DEFAULT_ATTRS = {
valueFormatter: Dygraph.numberValueFormatter,
axisLabelFormatter: Dygraph.numberAxisLabelFormatter,
drawGrid: true,
valueFormatter: Dygraph.numberValueFormatter,
axisLabelFormatter: Dygraph.numberAxisLabelFormatter,
drawGrid: true,
+ drawAxis: true,
independentTicks: true,
ticker: null // will be set in dygraph-tickers.js
},
independentTicks: true,
ticker: null // will be set in dygraph-tickers.js
},
@@
-367,6
+369,7
@@
Dygraph.DEFAULT_ATTRS = {
pixelsPerLabel: 30,
valueFormatter: Dygraph.numberValueFormatter,
axisLabelFormatter: Dygraph.numberAxisLabelFormatter,
pixelsPerLabel: 30,
valueFormatter: Dygraph.numberValueFormatter,
axisLabelFormatter: Dygraph.numberAxisLabelFormatter,
+ drawAxis: false,
drawGrid: false,
independentTicks: false,
ticker: null // will be set in dygraph-tickers.js
drawGrid: false,
independentTicks: false,
ticker: null // will be set in dygraph-tickers.js
@@
-3425,6
+3428,10
@@
Dygraph.mapLegacyOptions_ = function(attrs) {
map('pixelsPerYLabel', 'y', 'pixelsPerLabel');
map('yAxisLabelFormatter', 'y', 'axisLabelFormatter');
map('yTicker', 'y', 'ticker');
map('pixelsPerYLabel', 'y', 'pixelsPerLabel');
map('yAxisLabelFormatter', 'y', 'axisLabelFormatter');
map('yTicker', 'y', 'ticker');
+ map('drawXGrid', 'x', 'drawGrid');
+ map('drawXAxis', 'x', 'drawAxis');
+ map('drawYGrid', 'y', 'drawGrid');
+ map('drawYAxis', 'y', 'drawAxis');
return my_attrs;
};
return my_attrs;
};
@@
-3502,6
+3509,9
@@
Dygraph.prototype.visibility = function() {
/**
* Changes the visiblity of a series.
/**
* Changes the visiblity of a series.
+ *
+ * @param {Number} num the series index
+ * @param {Boolean} value true or false, identifying the visibility.
*/
Dygraph.prototype.setVisibility = function(num, value) {
var x = this.visibility();
*/
Dygraph.prototype.setVisibility = function(num, value) {
var x = this.visibility();