diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2019-05-27 18:38:58 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2019-06-17 13:21:28 +0200 |
| commit | 462f53a44d93e8de6f4cbe2ec158b05375439865 (patch) | |
| tree | 9d8f50d4c25368e636969c473758263605ae996d | |
| parent | 93fc7ce42a84f01f1cf69bafdf7acba7e9d5d3fe (diff) | |
| download | Ishtar-462f53a44d93e8de6f4cbe2ec158b05375439865.tar.bz2 Ishtar-462f53a44d93e8de6f4cbe2ec158b05375439865.zip | |
JQplot: larger zoom on x axis
| -rw-r--r-- | ishtar_common/static/js/jqplot/plugins/jqplot.cursor.js | 4 | ||||
| -rw-r--r-- | version.py | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/ishtar_common/static/js/jqplot/plugins/jqplot.cursor.js b/ishtar_common/static/js/jqplot/plugins/jqplot.cursor.js index 75c03912e..495aaaea4 100644 --- a/ishtar_common/static/js/jqplot/plugins/jqplot.cursor.js +++ b/ishtar_common/static/js/jqplot/plugins/jqplot.cursor.js @@ -425,7 +425,8 @@ var newTicks = new Array(); // only get the relevant ticks and filter data for (var idxTick=0 ; idxTick < axes[ax].ticks.length; idxTick++) { - if (currentValue >= newmin && currentValue <= newmax){ + currentValue += tickDelta; + if (currentValue >= newmin && (currentValue - tickDelta) <= newmax){ newTicks.push(axes[ax].ticks[idxTick]); for (var idxSerie=0 ; idxSerie < series.length; idxSerie++) { if (currentData.length <= idxSerie) currentData.push(new Array()); @@ -433,7 +434,6 @@ [newTicks.length, series[idxSerie].data[idxTick][1]]); } } - currentValue += tickDelta; } if (newTicks.length){ axes[ax].min = newmin; diff --git a/version.py b/version.py index 297704c05..99ab9726b 100644 --- a/version.py +++ b/version.py @@ -1,5 +1,5 @@ -# 3.0.dev.3 -VERSION = (3, 0, 'dev', 3) +# 3.0.dev.4 +VERSION = (3, 0, 'dev', 4) def get_version(): |