From d4c20eddee1ca9e31b4e83789272b7f3956ff34d Mon Sep 17 00:00:00 2001 From: jos Date: Wed, 6 May 2015 17:08:37 +0200 Subject: [PATCH] Replaced `|` with `or` --- docs/timeline/index.html | 70 ++++++++++++++++++++-------------------- 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/docs/timeline/index.html b/docs/timeline/index.html index 2928adcc..f0b78860 100644 --- a/docs/timeline/index.html +++ b/docs/timeline/index.html @@ -262,7 +262,7 @@ var items = [ end - Date | number | string | Moment + Date or number or string or Moment no The end date of the item. The end date is optional, and can be left null. If end date is provided, the item is displayed as a range. @@ -281,7 +281,7 @@ var items = [ id - String | Number + String or Number no An id for the item. Using an id is not required but highly recommended. An id is needed when dynamically adding, updating, @@ -289,7 +289,7 @@ var items = [ start - Date | number | string | Moment + Date or number or string or Moment yes The start date of the item, for example new Date(2010,9,23). @@ -304,7 +304,7 @@ var items = [ subgroup - String | Number + String or Number none The id of a subgroup. Groups all items within a group per subgroup, and positions them on the @@ -391,7 +391,7 @@ var groups = [ id - String | Number + String or Number yes An id for the group. The group will display all items having a property group which matches the id @@ -408,7 +408,7 @@ var groups = [ subgroupOrder - String | Function + String or Function none Order the subgroups by a field name or custom sort function. By default, groups are ordered by first-come, first-show. @@ -479,7 +479,7 @@ var options = { dataAttributes - string[] | 'all' + string[] or 'all' false An array of fields optionally defined on the timeline items that will be appended as data- attributes to the DOM element of the items.
If value is 'all' then each field defined on the timeline item will become a data- attribute. @@ -487,7 +487,7 @@ var options = { editable - boolean | Object + boolean or Object false If true, the items in the timeline can be manipulated. Only applicable when option selectable is true. See also the callbacks onAdd, onUpdate, onMove, and onRemove. When editable is an object, one can enable or disable individual manipulation actions. See section Editing Items for a detailed explanation. @@ -520,7 +520,7 @@ var options = { end - Date | Number | String | Moment + Date or Number or String or Moment none The initial end date for the axis of the timeline. If not provided, the latest date present in the items set is taken as @@ -562,7 +562,7 @@ var options = { groupOrder - String | Function + String or Function none Order the groups by a field name or custom sort function. By default, groups are not ordered. @@ -571,7 +571,7 @@ var options = { height - number | String + number or String none The height of the timeline in pixels or as a percentage. When height is undefined or null, the height of the timeline is automatically @@ -608,7 +608,7 @@ var options = { margin - number | Object + number or Object Object When a number, applies the margin to margin.axis, margin.item.horizontal, and margin.item.vertical. @@ -639,7 +639,7 @@ var options = { max - Date | Number | String | Moment + Date or Number or String or Moment none Set a maximum Date for the visible range. It will not be possible to move beyond this maximum. @@ -648,14 +648,14 @@ var options = { maxHeight - number | String + number or String none Specifies the maximum height for the Timeline. Can be a number in pixels or a string like "300px". min - Date | Number | String | Moment + Date or Number or String or Moment none Set a minimum Date for the visible range. It will not be possible to move beyond this minimum. @@ -664,7 +664,7 @@ var options = { minHeight - number | String + number or String none Specifies the minimum height for the Timeline. Can be a number in pixels or a string like "300px". @@ -745,7 +745,7 @@ var options = { orientation - String | Object + String or Object 'bottom' Orientation of the timelines axis and items. When orientation is a string, the value is applied to both items and axis. Can be 'top', 'bottom' (default), or 'both'. @@ -811,17 +811,17 @@ var options = { snap - function | null + function or null function When moving items on the Timeline, they will be snapped to nice dates like full hours or days, depending on the current scale. The snap function can be replaced with a custom function, or can be set to null to disable snapping. The signature of the snap function is: - 
function snap(date: Date, scale: string, step: number) : Date | number
+ 
function snap(date: Date, scale: string, step: number) : Date or number
The parameter scale can be can be 'millisecond', 'second', 'minute', 'hour', 'weekday, 'day, 'month, or 'year'. The parameter step is a number like 1, 2, 4, 5. start - Date | Number | String | Moment + Date or Number or String or Moment none The initial start date for the axis of the timeline. If not provided, the earliest date present in the events is taken as start date. @@ -869,7 +869,7 @@ var options = { width - String + String or Number '100%' The width of the timeline in pixels or as a percentage. @@ -920,7 +920,7 @@ var options = { addCustomTime([time] [, id]) - number | String + number or String Add new vertical bar representing a custom time that can be dragged by the user. Parameter time can be a Date, Number, or String, and is new Date() by default. @@ -942,18 +942,18 @@ var options = { Adjust the visible window such that it fits all items. See also function focus(id). Available options: - focus(id | ids [, options]) + focus(id or ids [, options]) none Adjust the visible window such that the selected item (or multiple items) are centered on screen. See also function fit(). Available options: @@ -978,15 +978,15 @@ var options = { Returns an Object with relevant properties from an event: @@ -1015,7 +1015,7 @@ var options = { none Move the window such that given time is centered on screen. Parameter time can be a Date, Number, or String. Available options: @@ -1105,12 +1105,12 @@ var options = { - setSelection(id | ids [, options]) + setSelection(id or ids [, options]) none Select one or multiple items by their id. The currently selected items will be unselected. To unselect all selected items, call `setSelection([])`. Available options: @@ -1120,7 +1120,7 @@ var options = { none Set the current visible window. The parameters start and end can be a Date, Number, or String. If the parameter value of start or end is null, the parameter will be left unchanged. Available options: @@ -1259,7 +1259,7 @@ timeline.off('select', onSelect); @@ -1272,7 +1272,7 @@ timeline.off('select', onSelect); @@ -1328,7 +1328,7 @@ var options = {