Commit 7ef93c7b authored by Masayuki Tanaka's avatar Masayuki Tanaka

Fix trivial

parent 23508846
...@@ -250,17 +250,6 @@ ...@@ -250,17 +250,6 @@
}; };
})(); })();
// For region
var regionStart = function (d) {
return ('start' in d) ? x(isTimeSeries ? parseDate(d.start) : d.start) : 0;
};
var regionWidth = function (d) {
var start = regionStart(d),
end = ('end' in d) ? x(isTimeSeries ? parseDate(d.end) : d.end) : width,
w = end - start;
return (w < 0) ? 0 : w;
};
// Define color // Define color
var color = generateColor(__data_colors, __color_pattern); var color = generateColor(__data_colors, __color_pattern);
...@@ -366,6 +355,12 @@ ...@@ -366,6 +355,12 @@
function getY (min, max) { function getY (min, max) {
return d3.scale.linear().range([min, max]); return d3.scale.linear().range([min, max]);
} }
function getYScale (id) {
return getAxisId(id) === 'y2' ? y2 : y;
}
function getSubYScale (id) {
return getAxisId(id) === 'y2' ? subY2 : subY;
}
//-- Axis --// //-- Axis --//
...@@ -385,6 +380,9 @@ ...@@ -385,6 +380,9 @@
function getYAxis (scale, orient) { function getYAxis (scale, orient) {
return d3.svg.axis().scale(scale).orient(orient); return d3.svg.axis().scale(scale).orient(orient);
} }
function getAxisId (id) {
return id in __data_axes ? __data_axes[id] : 'y';
}
//-- Domain --// //-- Domain --//
...@@ -469,17 +467,17 @@ ...@@ -469,17 +467,17 @@
return targets; return targets;
} }
//-- Axis --// //-- Regions --//
function getAxisId (id) { function regionStart (d) {
return id in __data_axes ? __data_axes[id] : 'y'; return ('start' in d) ? x(isTimeSeries ? parseDate(d.start) : d.start) : 0;
} };
function getYScale (id) { function regionWidth (d) {
return getAxisId(id) === 'y2' ? y2 : y; var start = regionStart(d),
} end = ('end' in d) ? x(isTimeSeries ? parseDate(d.end) : d.end) : width,
function getSubYScale (id) { w = end - start;
return getAxisId(id) === 'y2' ? subY2 : subY; return (w < 0) ? 0 : w;
} };
//-- Data --// //-- Data --//
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment