From 8a5e51efcd24e4e5c1c9b888cf848982665e68e0 Mon Sep 17 00:00:00 2001 From: Dan Vanderkam Date: Mon, 26 Dec 2016 23:37:40 -0500 Subject: [PATCH] remove all references to isZoomedIgnoreProgrammaticZoom --- src/dygraph-options-reference.js | 6 - src/dygraph-utils.js | 1 - tests/is-zoomed-ignore-programmatic-zoom.html | 167 -------------------------- tests/is-zoomed.html | 25 ++-- tests/zoom.html | 1 - 5 files changed, 7 insertions(+), 193 deletions(-) delete mode 100644 tests/is-zoomed-ignore-programmatic-zoom.html diff --git a/src/dygraph-options-reference.js b/src/dygraph-options-reference.js index dc9243b..d136a93 100644 --- a/src/dygraph-options-reference.js +++ b/src/dygraph-options-reference.js @@ -635,12 +635,6 @@ OPTIONS_REFERENCE = // "default": "18", "description": "Width of the div which contains the y-axis label. Since the y-axis label appears rotated 90 degrees, this actually affects the height of its div." }, - "isZoomedIgnoreProgrammaticZoom" : { - "default": "false", - "labels": ["Zooming"], - "type": "boolean", - "description" : "When this option is passed to updateOptions() along with either the dateWindow or valueRange options, the zoom flags are not changed to reflect a zoomed state. This is primarily useful for when the display area of a chart is changed programmatically and also where manual zooming is allowed and use is made of the isZoomed method to determine this." - }, "drawGrid": { "default": "true for x and y, false for y2", "labels": ["Grid"], diff --git a/src/dygraph-utils.js b/src/dygraph-utils.js index c319e49..a9e4b22 100644 --- a/src/dygraph-utils.js +++ b/src/dygraph-utils.js @@ -841,7 +841,6 @@ var pixelSafeOptions = { 'highlightCallback': true, 'highlightCircleSize': true, 'interactionModel': true, - 'isZoomedIgnoreProgrammaticZoom': true, 'labelsDiv': true, 'labelsKMB': true, 'labelsKMG2': true, diff --git a/tests/is-zoomed-ignore-programmatic-zoom.html b/tests/is-zoomed-ignore-programmatic-zoom.html deleted file mode 100644 index cffc8be..0000000 --- a/tests/is-zoomed-ignore-programmatic-zoom.html +++ /dev/null @@ -1,167 +0,0 @@ - - - - isZoomedIgnoreProgrammaticZoom Flag - - - - - - - -

isZoomedIgnoreProgrammaticZoom Option

- By default, when the dateWindow or updateOptions - of a chart is changed programmatically by a call to updateOptions - the zoomed flags (isZoomed) are changed. This is the same - as manually zooming in using the mouse. -

- Sometimes it may be desirable to change the display of the chart by - manipulating the dateWindow and valueRange - options but without changing the zoomed flags, for example where manual - zooming is still required but where it is also desired that the zoomed - flags drive display elements, but only for manual zooming. -

- In this case isZoomedIgnoreProgrammaticZoom may be specified along with - either the dateWindow or valueRange values to - updateOptions and the zoomed flags will remain unaffected. -

- The chart below may be manipulated to change the updateOptions - using the Max and Min Y axis buttons and the dateWindow - by using the Max and Min X axis buttons. -

- Toggle the check box below to determine the difference in operation of the zoom flags - when the date and value windows of the chart are changed using the arrows underneath. -

Do not change zoom flags (isZoomedIgnoreProgrammaticZoom)

- -

- Max Y Axis: - - -

- Min Y Axis: - - -

- Min X Axis: - - -

- Max X Axis: - - -

- -

Zoomed Flags

Zoomed: False

Zoomed X: False

Zoomed Y: False

Window coordinates (in dates and values):

- - - - diff --git a/tests/is-zoomed.html b/tests/is-zoomed.html index 1becb2e..28c52cf 100644 --- a/tests/is-zoomed.html +++ b/tests/is-zoomed.html @@ -1,7 +1,7 @@ - isZoomedIgnoresProgrammaticZoom Flag + isZoomed method