From e08804b9638c94928ea5c107e05230fb7d5c9dd6 Mon Sep 17 00:00:00 2001 From: Oleg Varaksin Date: Wed, 10 Jun 2015 20:49:56 +0200 Subject: [PATCH 1/2] Fixed issue #346 (Timeline start and end options are not taken into account) --- js/src/timeline/timeline.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/js/src/timeline/timeline.js b/js/src/timeline/timeline.js index 094765c..1cde3c7 100755 --- a/js/src/timeline/timeline.js +++ b/js/src/timeline/timeline.js @@ -667,8 +667,12 @@ links.Timeline.prototype.setVisibleChartRange = function(start, end, redraw) { * Change the visible chart range such that all items become visible */ links.Timeline.prototype.setVisibleChartRangeAuto = function() { - var range = this.getDataRange(true); - this.setVisibleChartRange(range.min, range.max); + if (this.options && (this.options.start || this.options.end)) { + this.setVisibleChartRange(this.options.start, this.options.end); + } else { + var range = this.getDataRange(true); + this.setVisibleChartRange(range.min, range.max); + } }; /** From 7246e7a1640d6d41be25c15fe22e132989700a4a Mon Sep 17 00:00:00 2001 From: Oleg Varaksin Date: Sun, 25 Oct 2015 11:08:42 +0100 Subject: [PATCH 2/2] Formatting --- .gitignore | 0 LICENSE | 0 NOTICE | 0 README.md | 0 4 files changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 .gitignore mode change 100644 => 100755 LICENSE mode change 100644 => 100755 NOTICE mode change 100644 => 100755 README.md diff --git a/.gitignore b/.gitignore old mode 100644 new mode 100755 diff --git a/LICENSE b/LICENSE old mode 100644 new mode 100755 diff --git a/NOTICE b/NOTICE old mode 100644 new mode 100755 diff --git a/README.md b/README.md old mode 100644 new mode 100755