Browse Source

Merge remote-tracking branch 'origin/v4' into v4

flowchartTest
Alex de Mulder 9 years ago
parent
commit
672bbd8bd2
2 changed files with 14 additions and 7 deletions
  1. +1
    -0
      lib/timeline/Core.js
  2. +13
    -7
      lib/timeline/options.js

+ 1
- 0
lib/timeline/Core.js View File

@ -291,6 +291,7 @@ Core.prototype.setOptions = function (options) {
util.deepExtend(appliedOptions, component.options); util.deepExtend(appliedOptions, component.options);
}); });
this.configurationSystem.setModuleOptions({global: appliedOptions}); this.configurationSystem.setModuleOptions({global: appliedOptions});
console.log(appliedOptions)
} }
// redraw everything // redraw everything

+ 13
- 7
lib/timeline/options.js View File

@ -32,7 +32,13 @@ let allOptions = {
autoResize: {boolean}, autoResize: {boolean},
clickToUse: {boolean}, clickToUse: {boolean},
dataAttributes: {string, array}, dataAttributes: {string, array},
editable: {boolean, object},
editable: {
add: {boolean, undef},
remove: {boolean, undef},
updateGroup: {boolean, undef},
updateTime: {boolean, undef},
__type__: {boolean, object}
},
end: {number, date, string, moment}, end: {number, date, string, moment},
format: { format: {
minorLabels: { minorLabels: {
@ -70,8 +76,8 @@ let allOptions = {
margin: { margin: {
axis: {number}, axis: {number},
item: { item: {
horizontal: {number},
vertical: {number},
horizontal: {number,undef},
vertical: {number,undef},
__type__: {object,number} __type__: {object,number}
}, },
__type__: {object,number} __type__: {object,number}
@ -89,8 +95,8 @@ let allOptions = {
onRemove: {fn}, onRemove: {fn},
order: {fn}, order: {fn},
orientation: { orientation: {
axis: {string},
item: {string},
axis: {string,undef},
item: {string,undef},
__type__: {string, object} __type__: {string, object}
}, },
selectable: {boolean}, selectable: {boolean},
@ -102,8 +108,8 @@ let allOptions = {
start: {date, number, string, moment}, start: {date, number, string, moment},
template: {fn}, template: {fn},
timeAxis: { timeAxis: {
scale: {string},
step: {number},
scale: {string,undef},
step: {number,undef},
__type__: {object} __type__: {object}
}, },
type: {string}, type: {string},

Loading…
Cancel
Save