Browse Source

fix #2500 for timeline (#2506)

* Fix redraw order

* Fix error when option is not defined

* Allow template labels

* Fix boolean types bug
readme-improvements
yotamberk 8 years ago
committed by GitHub
parent
commit
534ad9f32f
1 changed files with 30 additions and 30 deletions
  1. +30
    -30
      lib/timeline/optionsTimeline.js

+ 30
- 30
lib/timeline/optionsTimeline.js View File

@ -17,28 +17,28 @@ let any = 'any';
let allOptions = { let allOptions = {
configure: { configure: {
enabled: {bool},
filter: {bool,'function': 'function'},
enabled: { 'boolean': bool},
filter: { 'boolean': bool,'function': 'function'},
container: {dom}, container: {dom},
__type__: {object,bool,'function': 'function'}
__type__: {object, 'boolean': bool,'function': 'function'}
}, },
//globals : //globals :
align: {string}, 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}, dataAttributes: {string, array},
editable: { 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}, end: {number, date, string, moment},
format: { format: {
@ -69,10 +69,10 @@ let allOptions = {
moment: {'function': 'function'}, moment: {'function': 'function'},
groupOrder: {string, 'function': 'function'}, groupOrder: {string, 'function': 'function'},
groupEditable: { 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'}, groupOrderSwap: {'function': 'function'},
height: {string, number}, height: {string, number},
@ -82,7 +82,7 @@ let allOptions = {
repeat: {string}, repeat: {string},
__type__: {object, array} __type__: {object, array}
}, },
itemsAlwaysDraggable: {bool},
itemsAlwaysDraggable: { 'boolean': bool},
locale:{string}, locale:{string},
locales:{ locales:{
__any__: {any}, __any__: {any},
@ -102,9 +102,9 @@ let allOptions = {
maxMinorChars: {number}, maxMinorChars: {number},
min: {date, number, string, moment}, min: {date, number, string, moment},
minHeight: {number, string}, minHeight: {number, string},
moveable: {bool},
multiselect: {bool},
multiselectPerGroup: {bool},
moveable: { 'boolean': bool},
multiselect: { 'boolean': bool},
multiselectPerGroup: { 'boolean': bool},
onAdd: {'function': 'function'}, onAdd: {'function': 'function'},
onUpdate: {'function': 'function'}, onUpdate: {'function': 'function'},
onMove: {'function': 'function'}, onMove: {'function': 'function'},
@ -119,11 +119,11 @@ let allOptions = {
item: {string,'undefined': 'undefined'}, item: {string,'undefined': 'undefined'},
__type__: {string, object} __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'}, snap: {'function': 'function', 'null': 'null'},
start: {date, number, string, moment}, start: {date, number, string, moment},
template: {'function': 'function'}, template: {'function': 'function'},
@ -131,7 +131,7 @@ let allOptions = {
visibleFrameTemplate: {string, 'function': 'function'}, visibleFrameTemplate: {string, 'function': 'function'},
tooltipOnItemUpdateTime: { tooltipOnItemUpdateTime: {
template: {'function': 'function'}, template: {'function': 'function'},
__type__: {bool, object}
__type__: { 'boolean': bool, object}
}, },
timeAxis: { timeAxis: {
scale: {string,'undefined': 'undefined'}, scale: {string,'undefined': 'undefined'},
@ -140,7 +140,7 @@ let allOptions = {
}, },
type: {string}, type: {string},
width: {string, number}, width: {string, number},
zoomable: {bool},
zoomable: { 'boolean': bool},
zoomKey: {string: ['ctrlKey', 'altKey', 'metaKey', '']}, zoomKey: {string: ['ctrlKey', 'altKey', 'metaKey', '']},
zoomMax: {number}, zoomMax: {number},
zoomMin: {number}, zoomMin: {number},

Loading…
Cancel
Save