projects
/
dygraphs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Copy from pr/528
[dygraphs.git]
/
plugins
/
range-selector.js
diff --git
a/plugins/range-selector.js
b/plugins/range-selector.js
index
fea0cf3
..
4c1e938
100644
(file)
--- a/
plugins/range-selector.js
+++ b/
plugins/range-selector.js
@@
-526,8
+526,8
@@
rangeSelector.prototype.drawStaticLayer_ = function() {
}
var margin = 0.5;
}
var margin = 0.5;
- this.bgcanvas_ctx_.lineWidth = this.getOption_('rangeSelectorB
G
LineWidth');
- ctx.strokeStyle = this.getOption_('rangeSelectorB
G
StrokeColor');
+ this.bgcanvas_ctx_.lineWidth = this.getOption_('rangeSelectorB
ackground
LineWidth');
+ ctx.strokeStyle = this.getOption_('rangeSelectorB
ackground
StrokeColor');
ctx.beginPath();
ctx.moveTo(margin, margin);
ctx.lineTo(margin, this.canvasRect_.h-margin);
ctx.beginPath();
ctx.moveTo(margin, margin);
ctx.lineTo(margin, this.canvasRect_.h-margin);
@@
-543,12
+543,11
@@
rangeSelector.prototype.drawStaticLayer_ = function() {
*/
rangeSelector.prototype.drawMiniPlot_ = function() {
var fillStyle = this.getOption_('rangeSelectorPlotFillColor');
*/
rangeSelector.prototype.drawMiniPlot_ = function() {
var fillStyle = this.getOption_('rangeSelectorPlotFillColor');
+ var fillGradientStyle = this.getOption_('rangeSelectorPlotFillGradientColor');
var strokeStyle = this.getOption_('rangeSelectorPlotStrokeColor');
if (!fillStyle && !strokeStyle) {
return;
}
var strokeStyle = this.getOption_('rangeSelectorPlotStrokeColor');
if (!fillStyle && !strokeStyle) {
return;
}
- var gradientFillStyle = this.getOption_('rangeSelectorPlotGradientColor');
- if (!gradientFillStyle) { gradientFillStyle = fillStyle; }
var stepPlot = this.getOption_('stepPlot');
var stepPlot = this.getOption_('stepPlot');
@@
-610,7
+609,9
@@
rangeSelector.prototype.drawMiniPlot_ = function() {
if (fillStyle) {
var lingrad = this.bgcanvas_ctx_.createLinearGradient(0, 0, 0, canvasHeight);
if (fillStyle) {
var lingrad = this.bgcanvas_ctx_.createLinearGradient(0, 0, 0, canvasHeight);
- lingrad.addColorStop(0, gradientFillStyle);
+ if (fillGradientStyle) {
+ lingrad.addColorStop(0, fillGradientStyle);
+ }
lingrad.addColorStop(1, fillStyle);
this.bgcanvas_ctx_.fillStyle = lingrad;
ctx.fill();
lingrad.addColorStop(1, fillStyle);
this.bgcanvas_ctx_.fillStyle = lingrad;
ctx.fill();
@@
-748,8
+749,8
@@
rangeSelector.prototype.drawInteractiveLayer_ = function() {
var height = this.canvasRect_.h - margin;
var zoomHandleStatus = this.getZoomHandleStatus_();
var height = this.canvasRect_.h - margin;
var zoomHandleStatus = this.getZoomHandleStatus_();
- ctx.strokeStyle = this.getOption_('rangeSelectorF
G
StrokeColor');
- ctx.lineWidth = this.getOption_('rangeSelectorF
G
LineWidth');
+ ctx.strokeStyle = this.getOption_('rangeSelectorF
oreground
StrokeColor');
+ ctx.lineWidth = this.getOption_('rangeSelectorF
oreground
LineWidth');
if (!zoomHandleStatus.isZoomed) {
ctx.beginPath();
ctx.moveTo(margin, margin);
if (!zoomHandleStatus.isZoomed) {
ctx.beginPath();
ctx.moveTo(margin, margin);