From: blcook223 <benjamin.l.cook@gmail.com> Date: Mon, 9 Mar 2015 04:40:54 +0000 (-0500) Subject: merging addition of range selector secondary gradient color (formerly PR 314) with... X-Git-Tag: v2.0.0~69^2~3 X-Git-Url: https://adrianiainlam.tk/git/?a=commitdiff_plain;h=804fd99934fcdbee8b50b79561af0583cd94d805;p=dygraphs.git merging addition of range selector secondary gradient color (formerly PR 314) with other range selector options --- 804fd99934fcdbee8b50b79561af0583cd94d805 diff --cc dygraph-options-reference.js index 26bb22b,3e13d85..57fbb97 --- a/dygraph-options-reference.js +++ b/dygraph-options-reference.js @@@ -739,42 -739,12 +739,48 @@@ Dygraph.OPTIONS_REFERENCE = // <JSON "type": "string", "description": "The range selector mini plot fill color. This can be of the form \"#AABBCC\" or \"rgb(255,100,200)\" or \"yellow\". You can also specify null or \"\" to turn off fill." }, + "rangeSelectorPlotFillGradientColor": { + "default": "white", + "labels": ["Interactive Elements"], + "type": "string", + "description": "The top color for the range selector mini plot fill color gradient. This can be of the form \"#AABBCC\" or \"rgb(255,100,200)\" or \"rgba(255,100,200,42)\" or \"yellow\". You can also specify null or \"\" to disable the gradient and fill with one single color." + }, + "rangeSelectorBGStrokeColor": { + "default": "gray", + "labels": ["Interactive Elements"], + "type": "string", + "description": "The color of the lines below and on both sides of the range selector mini plot. This can be of the form \"#AABBCC\" or \"rgb(255,100,200)\" or \"yellow\"." + }, + "rangeSelectorBGLineWidth": { + "default": "1", + "labels": ["Interactive Elements"], + "type": "float", + "description": "The width of the lines below and on both sides of the range selector mini plot." + }, + "rangeSelectorPlotLineWidth": { + "default": "1.5", + "labels": ["Interactive Elements"], + "type": "float", + "description": "The width of the range selector mini plot line." + }, + "rangeSelectorFGStrokeColor": { + "default": "black", + "labels": ["Interactive Elements"], + "type": "string", + "description": "The color of the lines in the interactive layer of the range selector. This can be of the form \"#AABBCC\" or \"rgb(255,100,200)\" or \"yellow\"." + }, + "rangeSelectorFGLineWidth": { + "default": "1", + "labels": ["Interactive Elements"], + "type": "float", + "description": "The width the lines in the interactive layer of the range selector." + }, + "rangeSelectorAlpha": { + "default": "0.6", + "labels": ["Interactive Elements"], + "type": "float (0.0 - 1.0)", + "description": "The transparency of the veil that is drawn over the unselected portions of the range selector mini plot. A value of 0 represents full transparency and the unselected portions of the mini plot will appear as normal. A value of 1 represents full opacity and the unselected portions of the mini plot will be hidden." + }, "showInRangeSelector": { "default": "null", "labels": ["Interactive Elements"], diff --cc dygraph-utils.js index 4f782b1,9634a8b..f712650 --- a/dygraph-utils.js +++ b/dygraph-utils.js @@@ -902,13 -902,8 +902,14 @@@ var pixelSafeOptions = 'pointClickCallback': true, 'pointSize': true, 'rangeSelectorPlotFillColor': true, + 'rangeSelectorPlotFillGradientColor': true, 'rangeSelectorPlotStrokeColor': true, + 'rangeSelectorBGStrokeColor': true, + 'rangeSelectorBGLineWidth': true, + 'rangeSelectorPlotLineWidth': true, + 'rangeSelectorFGStrokeColor': true, + 'rangeSelectorFGLineWidth': true, + 'rangeSelectorAlpha': true, 'showLabelsOnHighlight': true, 'showRoller': true, 'strokeWidth': true, diff --cc dygraph.js index 35f2b5f,5b2b587..1e1a270 --- a/dygraph.js +++ b/dygraph.js @@@ -336,13 -336,8 +336,14 @@@ Dygraph.DEFAULT_ATTRS = showRangeSelector: false, rangeSelectorHeight: 40, rangeSelectorPlotStrokeColor: "#808FAB", + rangeSelectorPlotFillGradientColor: "white", rangeSelectorPlotFillColor: "#A7B1C4", + rangeSelectorBGStrokeColor: "gray", + rangeSelectorBGLineWidth: 1, + rangeSelectorPlotLineWidth:1.5, + rangeSelectorFGStrokeColor: "black", + rangeSelectorFGLineWidth: 1, + rangeSelectorAlpha: 0.6, showInRangeSelector: null, // The ordering here ensures that central lines always appear above any