Skip to content
This repository has been archived by the owner on Jul 29, 2019. It is now read-only.

Commit

Permalink
fix #2500 for timeline (#2506)
Browse files Browse the repository at this point in the history
* Fix redraw order

* Fix error when option is not defined

* Allow template labels

* Fix boolean types bug
  • Loading branch information
yotamberk authored Dec 27, 2016
1 parent 58924d5 commit 534ad9f
Showing 1 changed file with 30 additions and 30 deletions.
60 changes: 30 additions & 30 deletions lib/timeline/optionsTimeline.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,28 +17,28 @@ let any = 'any';

let allOptions = {
configure: {
enabled: {bool},
filter: {bool,'function': 'function'},
enabled: { 'boolean': bool},
filter: { 'boolean': bool,'function': 'function'},
container: {dom},
__type__: {object,bool,'function': 'function'}
__type__: {object, 'boolean': bool,'function': 'function'}
},

//globals :
align: {string},
rtl: {bool, 'undefined': 'undefined'},
rollingMode: {bool, 'undefined': 'undefined'},
verticalScroll: {bool, 'undefined': 'undefined'},
horizontalScroll: {bool, 'undefined': 'undefined'},
autoResize: {bool},
clickToUse: {bool},
rtl: { 'boolean': bool, 'undefined': 'undefined'},
rollingMode: { 'boolean': bool, 'undefined': 'undefined'},
verticalScroll: { 'boolean': bool, 'undefined': 'undefined'},
horizontalScroll: { 'boolean': bool, 'undefined': 'undefined'},
autoResize: { 'boolean': bool},
clickToUse: { 'boolean': bool},
dataAttributes: {string, array},
editable: {
add: {bool, 'undefined': 'undefined'},
remove: {bool, 'undefined': 'undefined'},
updateGroup: {bool, 'undefined': 'undefined'},
updateTime: {bool, 'undefined': 'undefined'},
overrideItems: {bool, 'undefined': 'undefined'},
__type__: {bool, object}
add: { 'boolean': bool, 'undefined': 'undefined'},
remove: { 'boolean': bool, 'undefined': 'undefined'},
updateGroup: { 'boolean': bool, 'undefined': 'undefined'},
updateTime: { 'boolean': bool, 'undefined': 'undefined'},
overrideItems: { 'boolean': bool, 'undefined': 'undefined'},
__type__: { 'boolean': bool, object}
},
end: {number, date, string, moment},
format: {
Expand Down Expand Up @@ -69,10 +69,10 @@ let allOptions = {
moment: {'function': 'function'},
groupOrder: {string, 'function': 'function'},
groupEditable: {
add: {bool, 'undefined': 'undefined'},
remove: {bool, 'undefined': 'undefined'},
order: {bool, 'undefined': 'undefined'},
__type__: {bool, object}
add: { 'boolean': bool, 'undefined': 'undefined'},
remove: { 'boolean': bool, 'undefined': 'undefined'},
order: { 'boolean': bool, 'undefined': 'undefined'},
__type__: { 'boolean': bool, object}
},
groupOrderSwap: {'function': 'function'},
height: {string, number},
Expand All @@ -82,7 +82,7 @@ let allOptions = {
repeat: {string},
__type__: {object, array}
},
itemsAlwaysDraggable: {bool},
itemsAlwaysDraggable: { 'boolean': bool},
locale:{string},
locales:{
__any__: {any},
Expand All @@ -102,9 +102,9 @@ let allOptions = {
maxMinorChars: {number},
min: {date, number, string, moment},
minHeight: {number, string},
moveable: {bool},
multiselect: {bool},
multiselectPerGroup: {bool},
moveable: { 'boolean': bool},
multiselect: { 'boolean': bool},
multiselectPerGroup: { 'boolean': bool},
onAdd: {'function': 'function'},
onUpdate: {'function': 'function'},
onMove: {'function': 'function'},
Expand All @@ -119,19 +119,19 @@ let allOptions = {
item: {string,'undefined': 'undefined'},
__type__: {string, object}
},
selectable: {bool},
showCurrentTime: {bool},
showMajorLabels: {bool},
showMinorLabels: {bool},
stack: {bool},
selectable: { 'boolean': bool},
showCurrentTime: { 'boolean': bool},
showMajorLabels: { 'boolean': bool},
showMinorLabels: { 'boolean': bool},
stack: { 'boolean': bool},
snap: {'function': 'function', 'null': 'null'},
start: {date, number, string, moment},
template: {'function': 'function'},
groupTemplate: {'function': 'function'},
visibleFrameTemplate: {string, 'function': 'function'},
tooltipOnItemUpdateTime: {
template: {'function': 'function'},
__type__: {bool, object}
__type__: { 'boolean': bool, object}
},
timeAxis: {
scale: {string,'undefined': 'undefined'},
Expand All @@ -140,7 +140,7 @@ let allOptions = {
},
type: {string},
width: {string, number},
zoomable: {bool},
zoomable: { 'boolean': bool},
zoomKey: {string: ['ctrlKey', 'altKey', 'metaKey', '']},
zoomMax: {number},
zoomMin: {number},
Expand Down

0 comments on commit 534ad9f

Please sign in to comment.