projects
/
dygraphs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use CSS styles instead of labelsDivStyles
[dygraphs.git]
/
dygraph-options.js
diff --git
a/dygraph-options.js
b/dygraph-options.js
index
6889a09
..
2dc88ae
100644
(file)
--- a/
dygraph-options.js
+++ b/
dygraph-options.js
@@
-17,14
+17,10
@@
var DygraphOptions = (function() {
"use strict";
/*
"use strict";
/*
- * Interesting member variables:
- * dygraph_ - the graph.
+ * Interesting member variables: (REMOVING THIS LIST AS I CLOSURIZE)
* global_ - global attributes (common among all graphs, AIUI)
* user - attributes set by the user
* global_ - global attributes (common among all graphs, AIUI)
* user - attributes set by the user
- * yAxes_ - array of axis index to { series : [ series names ] , options : { axis-specific options. }
- * xAxis_ - { options : { axis-specific options. }
* series_ - { seriesName -> { idx, yAxis, options }}
* series_ - { seriesName -> { idx, yAxis, options }}
- * labels_ - used as mapping from index to series name.
*/
/**
*/
/**
@@
-34,12
+30,28
@@
var DygraphOptions = (function() {
* if labels are not yet available, since those drive details of the per-series
* and per-axis options.
*
* if labels are not yet available, since those drive details of the per-series
* and per-axis options.
*
- * @param {Dyraph} dygraph The chart to which these options belong.
+ * @param {Dy
g
raph} dygraph The chart to which these options belong.
* @constructor
*/
var DygraphOptions = function(dygraph) {
* @constructor
*/
var DygraphOptions = function(dygraph) {
+ /**
+ * The dygraph.
+ * @type {!Dygraph}
+ */
this.dygraph_ = dygraph;
this.dygraph_ = dygraph;
+
+ /**
+ * Array of axis index to { series : [ series names ] , options : { axis-specific options. }
+ * @type {Array.<{series : Array.<string>, options : Object}>} @private
+ */
this.yAxes_ = [];
this.yAxes_ = [];
+
+ /**
+ * Contains x-axis specific options, which are stored in the options key.
+ * This matches the yAxes_ object structure (by being a dictionary with an
+ * options element) allowing for shared code.
+ * @type {options: Object} @private
+ */
this.xAxis_ = {};
this.series_ = {};
this.xAxis_ = {};
this.series_ = {};
@@
-47,13
+59,22
@@
var DygraphOptions = function(dygraph) {
this.global_ = this.dygraph_.attrs_;
this.user_ = this.dygraph_.user_attrs_ || {};
this.global_ = this.dygraph_.attrs_;
this.user_ = this.dygraph_.user_attrs_ || {};
+ /**
+ * A list of series in columnar order.
+ * @type {Array.<string>}
+ */
+ this.labels_ = [];
+
this.highlightSeries_ = this.get("highlightSeriesOpts") || {};
this.reparseSeries();
};
this.highlightSeries_ = this.get("highlightSeriesOpts") || {};
this.reparseSeries();
};
-/*
+/*
*
* Not optimal, but does the trick when you're only using two axes.
* If we move to more axes, this can just become a function.
* Not optimal, but does the trick when you're only using two axes.
* If we move to more axes, this can just become a function.
+ *
+ * @type {Object.<number>}
+ * @private
*/
DygraphOptions.AXIS_STRING_MAPPINGS_ = {
'y' : 0,
*/
DygraphOptions.AXIS_STRING_MAPPINGS_ = {
'y' : 0,
@@
-64,6
+85,10
@@
DygraphOptions.AXIS_STRING_MAPPINGS_ = {
'Y2' : 1
};
'Y2' : 1
};
+/**
+ * @param {string|number} axis
+ * @private
+ */
DygraphOptions.axisToIndex_ = function(axis) {
if (typeof(axis) == "string") {
if (DygraphOptions.AXIS_STRING_MAPPINGS_.hasOwnProperty(axis)) {
DygraphOptions.axisToIndex_ = function(axis) {
if (typeof(axis) == "string") {
if (DygraphOptions.AXIS_STRING_MAPPINGS_.hasOwnProperty(axis)) {
@@
-77,10
+102,6
@@
DygraphOptions.axisToIndex_ = function(axis) {
}
throw "Dygraphs only supports two y-axes, indexed from 0-1.";
}
}
throw "Dygraphs only supports two y-axes, indexed from 0-1.";
}
- if (typeof(axis) == "object") {
- throw "Using objects for axis specification " +
- "is not supported inside the 'series' option.";
- }
if (axis) {
throw "Unknown axis : " + axis;
}
if (axis) {
throw "Unknown axis : " + axis;
}
@@
-162,9
+183,9
@@
DygraphOptions.prototype.reparseSeries = function() {
if (typeof(axis) == 'string') {
if (!this.series_.hasOwnProperty(axis)) {
if (typeof(axis) == 'string') {
if (!this.series_.hasOwnProperty(axis)) {
-
this.dygraph_
.error("Series " + seriesName + " wants to share a y-axis with " +
+
Dygraph
.error("Series " + seriesName + " wants to share a y-axis with " +
"series " + axis + ", which does not define its own axis.");
"series " + axis + ", which does not define its own axis.");
- return
null
;
+ return;
}
var yAxis = this.series_[axis].yAxis;
this.series_[seriesName].yAxis = yAxis;
}
var yAxis = this.series_[axis].yAxis;
this.series_[seriesName].yAxis = yAxis;
@@
-293,7
+314,7
@@
DygraphOptions.prototype.getForAxis = function(name, axis) {
*/
DygraphOptions.prototype.getForSeries = function(name, series) {
// Honors indexes as series.
*/
DygraphOptions.prototype.getForSeries = function(name, series) {
// Honors indexes as series.
- if (series === this.dygraph_.
highlightSet_
) {
+ if (series === this.dygraph_.
getHighlightSeries()
) {
if (this.highlightSeries_.hasOwnProperty(name)) {
return this.highlightSeries_[name];
}
if (this.highlightSeries_.hasOwnProperty(name)) {
return this.highlightSeries_[name];
}
@@
-314,7
+335,7
@@
DygraphOptions.prototype.getForSeries = function(name, series) {
/**
* Returns the number of y-axes on the chart.
/**
* Returns the number of y-axes on the chart.
- * @return {
N
umber} the number of axes.
+ * @return {
n
umber} the number of axes.
*/
DygraphOptions.prototype.numAxes = function() {
return this.yAxes_.length;
*/
DygraphOptions.prototype.numAxes = function() {
return this.yAxes_.length;
@@
-349,15
+370,6
@@
DygraphOptions.prototype.seriesNames = function() {
return this.labels_;
};
return this.labels_;
};
-/* Are we using this? */
-/**
- * Return the index of the specified series.
- * @param {string} series the series name.
- */
-DygraphOptions.prototype.indexOfSeries = function(series) {
- return this.series_[series].idx;
-};
-
return DygraphOptions;
})();
return DygraphOptions;
})();