From 681f305c92710abae1e65f69d37274d1a1d07ab6 Mon Sep 17 00:00:00 2001 From: jos Date: Thu, 12 Feb 2015 09:47:02 +0100 Subject: [PATCH] Fixed #629: timeline not properly initializing with a DataView for groups --- HISTORY.md | 7 +++++++ lib/timeline/Timeline.js | 6 +++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/HISTORY.md b/HISTORY.md index 5a9b59e1..f6b82cff 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -2,6 +2,13 @@ http://visjs.org +## not yet released, version 3.10.1-SNAPSHOT + +### Timeline + +- Fixed not property initializing with a DataView for groups. + + ## 2015-02-11, version 3.10.0 ### Network diff --git a/lib/timeline/Timeline.js b/lib/timeline/Timeline.js index 6deea30a..2a61d12e 100644 --- a/lib/timeline/Timeline.js +++ b/lib/timeline/Timeline.js @@ -13,8 +13,8 @@ var ItemSet = require('./component/ItemSet'); /** * Create a timeline visualization * @param {HTMLElement} container - * @param {vis.DataSet | Array | google.visualization.DataTable} [items] - * @param {vis.DataSet | Array | google.visualization.DataTable} [groups] + * @param {vis.DataSet | vis.DataView | Array | google.visualization.DataTable} [items] + * @param {vis.DataSet | vis.DataView | Array | google.visualization.DataTable} [groups] * @param {Object} [options] See Timeline.setOptions for the available options. * @constructor * @extends Core @@ -25,7 +25,7 @@ function Timeline (container, items, groups, options) { } // if the third element is options, the forth is groups (optionally); - if (!(Array.isArray(groups) || groups instanceof DataSet) && groups instanceof Object) { + if (!(Array.isArray(groups) || groups instanceof DataSet || groups instanceof DataView) && groups instanceof Object) { var forthArgument = options; options = groups; groups = forthArgument;