|
|
@ -2,41 +2,24 @@ |
|
|
* An ItemSet holds a set of items and ranges which can be displayed in a |
|
|
* An ItemSet holds a set of items and ranges which can be displayed in a |
|
|
* range. The width is determined by the parent of the ItemSet, and the height |
|
|
* range. The width is determined by the parent of the ItemSet, and the height |
|
|
* is determined by the size of the items. |
|
|
* is determined by the size of the items. |
|
|
* @param {Component} parent |
|
|
|
|
|
* @param {Component[]} [depends] Components on which this components depends |
|
|
|
|
|
* (except for the parent) |
|
|
|
|
|
* @param {Object} [options] See ItemSet.setOptions for the available |
|
|
|
|
|
* options. |
|
|
|
|
|
|
|
|
* @param {Panel} backgroundPanel Panel which can be used to display the |
|
|
|
|
|
* vertical lines of box items. |
|
|
|
|
|
* @param {Panel} axisPanel Panel on the axis where the dots of box-items |
|
|
|
|
|
* can be displayed. |
|
|
|
|
|
* @param {Object} [options] See ItemSet.setOptions for the available options. |
|
|
* @constructor ItemSet |
|
|
* @constructor ItemSet |
|
|
* @extends Panel |
|
|
* @extends Panel |
|
|
*/ |
|
|
*/ |
|
|
// TODO: improve performance by replacing all Array.forEach with a for loop
|
|
|
|
|
|
function ItemSet(parent, depends, options) { |
|
|
|
|
|
|
|
|
function ItemSet(backgroundPanel, axisPanel, options) { |
|
|
this.id = util.randomUUID(); |
|
|
this.id = util.randomUUID(); |
|
|
this.parent = parent; |
|
|
|
|
|
this.depends = depends; |
|
|
|
|
|
|
|
|
|
|
|
// event listeners
|
|
|
|
|
|
this.eventListeners = { |
|
|
|
|
|
dragstart: this._onDragStart.bind(this), |
|
|
|
|
|
drag: this._onDrag.bind(this), |
|
|
|
|
|
dragend: this._onDragEnd.bind(this) |
|
|
|
|
|
}; |
|
|
|
|
|
|
|
|
|
|
|
// one options object is shared by this itemset and all its items
|
|
|
// one options object is shared by this itemset and all its items
|
|
|
this.options = options || {}; |
|
|
this.options = options || {}; |
|
|
this.defaultOptions = { |
|
|
|
|
|
type: 'box', |
|
|
|
|
|
align: 'center', |
|
|
|
|
|
orientation: 'bottom', |
|
|
|
|
|
margin: { |
|
|
|
|
|
axis: 20, |
|
|
|
|
|
item: 10 |
|
|
|
|
|
}, |
|
|
|
|
|
padding: 5 |
|
|
|
|
|
}; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
this.backgroundPanel = backgroundPanel; |
|
|
|
|
|
this.axisPanel = axisPanel; |
|
|
|
|
|
this.itemOptions = Object.create(this.options); |
|
|
this.dom = {}; |
|
|
this.dom = {}; |
|
|
|
|
|
this.hammer = null; |
|
|
|
|
|
|
|
|
var me = this; |
|
|
var me = this; |
|
|
this.itemsData = null; // DataSet
|
|
|
this.itemsData = null; // DataSet
|
|
|
@ -45,31 +28,33 @@ function ItemSet(parent, depends, options) { |
|
|
// data change listeners
|
|
|
// data change listeners
|
|
|
this.listeners = { |
|
|
this.listeners = { |
|
|
'add': function (event, params, senderId) { |
|
|
'add': function (event, params, senderId) { |
|
|
if (senderId != me.id) { |
|
|
|
|
|
me._onAdd(params.items); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
if (senderId != me.id) me._onAdd(params.items); |
|
|
}, |
|
|
}, |
|
|
'update': function (event, params, senderId) { |
|
|
'update': function (event, params, senderId) { |
|
|
if (senderId != me.id) { |
|
|
|
|
|
me._onUpdate(params.items); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
if (senderId != me.id) me._onUpdate(params.items); |
|
|
}, |
|
|
}, |
|
|
'remove': function (event, params, senderId) { |
|
|
'remove': function (event, params, senderId) { |
|
|
if (senderId != me.id) { |
|
|
|
|
|
me._onRemove(params.items); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
if (senderId != me.id) me._onRemove(params.items); |
|
|
} |
|
|
} |
|
|
}; |
|
|
}; |
|
|
|
|
|
|
|
|
this.items = {}; // object with an Item for every data item
|
|
|
|
|
|
|
|
|
this.items = {}; // object with an Item for every data item
|
|
|
|
|
|
this.orderedItems = { |
|
|
|
|
|
byStart: [], |
|
|
|
|
|
byEnd: [] |
|
|
|
|
|
}; |
|
|
|
|
|
this.visibleItems = []; // visible, ordered items
|
|
|
|
|
|
this.visibleItemsStart = 0; // start index of visible items in this.orderedItems // TODO: cleanup
|
|
|
|
|
|
this.visibleItemsEnd = 0; // start index of visible items in this.orderedItems // TODO: cleanup
|
|
|
this.selection = []; // list with the ids of all selected nodes
|
|
|
this.selection = []; // list with the ids of all selected nodes
|
|
|
this.queue = {}; // queue with id/actions: 'add', 'update', 'delete'
|
|
|
this.queue = {}; // queue with id/actions: 'add', 'update', 'delete'
|
|
|
this.stack = new Stack(this, Object.create(this.options)); |
|
|
|
|
|
this.conversion = null; |
|
|
|
|
|
|
|
|
this.stack = new Stack(Object.create(this.options)); |
|
|
|
|
|
this.stackDirty = true; // if true, all items will be restacked on next repaint
|
|
|
|
|
|
|
|
|
this.touchParams = {}; // stores properties while dragging
|
|
|
this.touchParams = {}; // stores properties while dragging
|
|
|
|
|
|
|
|
|
// TODO: ItemSet should also attach event listeners for rangechange and rangechanged, like timeaxis
|
|
|
|
|
|
|
|
|
// create the HTML DOM
|
|
|
|
|
|
this._create(); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
ItemSet.prototype = new Panel(); |
|
|
ItemSet.prototype = new Panel(); |
|
|
@ -82,6 +67,42 @@ ItemSet.types = { |
|
|
point: ItemPoint |
|
|
point: ItemPoint |
|
|
}; |
|
|
}; |
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
|
* Create the HTML DOM for the ItemSet |
|
|
|
|
|
*/ |
|
|
|
|
|
ItemSet.prototype._create = function _create(){ |
|
|
|
|
|
var frame = document.createElement('div'); |
|
|
|
|
|
frame['timeline-itemset'] = this; |
|
|
|
|
|
this.frame = frame; |
|
|
|
|
|
|
|
|
|
|
|
// create background panel
|
|
|
|
|
|
var background = document.createElement('div'); |
|
|
|
|
|
background.className = 'background'; |
|
|
|
|
|
this.backgroundPanel.frame.appendChild(background); |
|
|
|
|
|
this.dom.background = background; |
|
|
|
|
|
|
|
|
|
|
|
// create foreground panel
|
|
|
|
|
|
var foreground = document.createElement('div'); |
|
|
|
|
|
foreground.className = 'foreground'; |
|
|
|
|
|
frame.appendChild(foreground); |
|
|
|
|
|
this.dom.foreground = foreground; |
|
|
|
|
|
|
|
|
|
|
|
// create axis panel
|
|
|
|
|
|
var axis = document.createElement('div'); |
|
|
|
|
|
axis.className = 'axis'; |
|
|
|
|
|
this.dom.axis = axis; |
|
|
|
|
|
this.axisPanel.frame.appendChild(axis); |
|
|
|
|
|
|
|
|
|
|
|
// attach event listeners
|
|
|
|
|
|
// TODO: use event listeners from the rootpanel to improve performance?
|
|
|
|
|
|
this.hammer = Hammer(frame, { |
|
|
|
|
|
prevent_default: true |
|
|
|
|
|
}); |
|
|
|
|
|
this.hammer.on('dragstart', this._onDragStart.bind(this)); |
|
|
|
|
|
this.hammer.on('drag', this._onDrag.bind(this)); |
|
|
|
|
|
this.hammer.on('dragend', this._onDragEnd.bind(this)); |
|
|
|
|
|
}; |
|
|
|
|
|
|
|
|
/** |
|
|
/** |
|
|
* Set options for the ItemSet. Existing options will be extended/overwritten. |
|
|
* Set options for the ItemSet. Existing options will be extended/overwritten. |
|
|
* @param {Object} [options] The following options are available: |
|
|
* @param {Object} [options] The following options are available: |
|
|
@ -112,54 +133,36 @@ ItemSet.types = { |
|
|
*/ |
|
|
*/ |
|
|
ItemSet.prototype.setOptions = Component.prototype.setOptions; |
|
|
ItemSet.prototype.setOptions = Component.prototype.setOptions; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
/** |
|
|
* Set controller for this component |
|
|
|
|
|
* @param {Controller | null} controller |
|
|
|
|
|
|
|
|
* Hide the component from the DOM |
|
|
*/ |
|
|
*/ |
|
|
ItemSet.prototype.setController = function setController (controller) { |
|
|
|
|
|
var event; |
|
|
|
|
|
|
|
|
|
|
|
// unregister old event listeners
|
|
|
|
|
|
if (this.controller) { |
|
|
|
|
|
for (event in this.eventListeners) { |
|
|
|
|
|
if (this.eventListeners.hasOwnProperty(event)) { |
|
|
|
|
|
this.controller.off(event, this.eventListeners[event]); |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
ItemSet.prototype.hide = function hide() { |
|
|
|
|
|
// remove the axis with dots
|
|
|
|
|
|
if (this.dom.axis.parentNode) { |
|
|
|
|
|
this.dom.axis.parentNode.removeChild(this.dom.axis); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
this.controller = controller || null; |
|
|
|
|
|
|
|
|
|
|
|
// register new event listeners
|
|
|
|
|
|
if (this.controller) { |
|
|
|
|
|
for (event in this.eventListeners) { |
|
|
|
|
|
if (this.eventListeners.hasOwnProperty(event)) { |
|
|
|
|
|
this.controller.on(event, this.eventListeners[event]); |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
// remove the background with vertical lines
|
|
|
|
|
|
if (this.dom.background.parentNode) { |
|
|
|
|
|
this.dom.background.parentNode.removeChild(this.dom.background); |
|
|
} |
|
|
} |
|
|
}; |
|
|
}; |
|
|
|
|
|
|
|
|
// attach event listeners for dragging items to the controller
|
|
|
|
|
|
(function (me) { |
|
|
|
|
|
var _controller = null; |
|
|
|
|
|
var _onDragStart = null; |
|
|
|
|
|
var _onDrag = null; |
|
|
|
|
|
var _onDragEnd = null; |
|
|
|
|
|
|
|
|
|
|
|
Object.defineProperty(me, 'controller', { |
|
|
|
|
|
get: function () { |
|
|
|
|
|
return _controller; |
|
|
|
|
|
}, |
|
|
|
|
|
|
|
|
|
|
|
set: function (controller) { |
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
|
}); |
|
|
|
|
|
}) (this); |
|
|
|
|
|
|
|
|
/** |
|
|
|
|
|
* Show the component in the DOM (when not already visible). |
|
|
|
|
|
* @return {Boolean} changed |
|
|
|
|
|
*/ |
|
|
|
|
|
ItemSet.prototype.show = function show() { |
|
|
|
|
|
// show axis with dots
|
|
|
|
|
|
if (!this.dom.axis.parentNode) { |
|
|
|
|
|
this.axisPanel.frame.appendChild(this.dom.axis); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
// show background with vertical lines
|
|
|
|
|
|
if (!this.dom.background.parentNode) { |
|
|
|
|
|
this.backgroundPanel.frame.appendChild(this.dom.background); |
|
|
|
|
|
} |
|
|
|
|
|
}; |
|
|
|
|
|
|
|
|
/** |
|
|
/** |
|
|
* Set range (start and end). |
|
|
* Set range (start and end). |
|
|
@ -181,7 +184,7 @@ ItemSet.prototype.setRange = function setRange(range) { |
|
|
* unselected. |
|
|
* unselected. |
|
|
*/ |
|
|
*/ |
|
|
ItemSet.prototype.setSelection = function setSelection(ids) { |
|
|
ItemSet.prototype.setSelection = function setSelection(ids) { |
|
|
var i, ii, id, item, selection; |
|
|
|
|
|
|
|
|
var i, ii, id, item; |
|
|
|
|
|
|
|
|
if (ids) { |
|
|
if (ids) { |
|
|
if (!Array.isArray(ids)) { |
|
|
if (!Array.isArray(ids)) { |
|
|
@ -205,10 +208,6 @@ ItemSet.prototype.setSelection = function setSelection(ids) { |
|
|
item.select(); |
|
|
item.select(); |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
if (this.controller) { |
|
|
|
|
|
this.requestRepaint(); |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
} |
|
|
}; |
|
|
}; |
|
|
|
|
|
|
|
|
@ -235,184 +234,151 @@ ItemSet.prototype._deselect = function _deselect(id) { |
|
|
} |
|
|
} |
|
|
}; |
|
|
}; |
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
|
* Return the item sets frame |
|
|
|
|
|
* @returns {HTMLElement} frame |
|
|
|
|
|
*/ |
|
|
|
|
|
ItemSet.prototype.getFrame = function getFrame() { |
|
|
|
|
|
return this.frame; |
|
|
|
|
|
}; |
|
|
|
|
|
|
|
|
/** |
|
|
/** |
|
|
* Repaint the component |
|
|
* Repaint the component |
|
|
* @return {Boolean} changed |
|
|
|
|
|
|
|
|
* @return {boolean} Returns true if the component is resized |
|
|
*/ |
|
|
*/ |
|
|
ItemSet.prototype.repaint = function repaint() { |
|
|
ItemSet.prototype.repaint = function repaint() { |
|
|
var changed = 0, |
|
|
|
|
|
update = util.updateProperty, |
|
|
|
|
|
asSize = util.option.asSize, |
|
|
|
|
|
|
|
|
var asSize = util.option.asSize, |
|
|
|
|
|
asString = util.option.asString, |
|
|
options = this.options, |
|
|
options = this.options, |
|
|
orientation = this.getOption('orientation'), |
|
|
orientation = this.getOption('orientation'), |
|
|
defaultOptions = this.defaultOptions, |
|
|
|
|
|
frame = this.frame; |
|
|
frame = this.frame; |
|
|
|
|
|
|
|
|
if (!frame) { |
|
|
|
|
|
frame = document.createElement('div'); |
|
|
|
|
|
frame.className = 'itemset'; |
|
|
|
|
|
frame['timeline-itemset'] = this; |
|
|
|
|
|
|
|
|
// update className
|
|
|
|
|
|
frame.className = 'itemset' + (options.className ? (' ' + asString(options.className)) : ''); |
|
|
|
|
|
|
|
|
var className = options.className; |
|
|
|
|
|
if (className) { |
|
|
|
|
|
util.addClassName(frame, util.option.asString(className)); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
// check whether zoomed (in that case we need to re-stack everything)
|
|
|
|
|
|
var visibleInterval = this.range.end - this.range.start; |
|
|
|
|
|
var zoomed = (visibleInterval != this.lastVisibleInterval) || (this.width != this.lastWidth); |
|
|
|
|
|
this.lastVisibleInterval = visibleInterval; |
|
|
|
|
|
this.lastWidth = this.width; |
|
|
|
|
|
|
|
|
// create background panel
|
|
|
|
|
|
var background = document.createElement('div'); |
|
|
|
|
|
background.className = 'background'; |
|
|
|
|
|
frame.appendChild(background); |
|
|
|
|
|
this.dom.background = background; |
|
|
|
|
|
|
|
|
|
|
|
// create foreground panel
|
|
|
|
|
|
var foreground = document.createElement('div'); |
|
|
|
|
|
foreground.className = 'foreground'; |
|
|
|
|
|
frame.appendChild(foreground); |
|
|
|
|
|
this.dom.foreground = foreground; |
|
|
|
|
|
|
|
|
|
|
|
// create axis panel
|
|
|
|
|
|
var axis = document.createElement('div'); |
|
|
|
|
|
axis.className = 'itemset-axis'; |
|
|
|
|
|
//frame.appendChild(axis);
|
|
|
|
|
|
this.dom.axis = axis; |
|
|
|
|
|
|
|
|
|
|
|
this.frame = frame; |
|
|
|
|
|
changed += 1; |
|
|
|
|
|
|
|
|
/* TODO: implement+fix smarter way to update visible items |
|
|
|
|
|
// find the first visible item
|
|
|
|
|
|
// TODO: use faster search, not linear
|
|
|
|
|
|
var byEnd = this.orderedItems.byEnd; |
|
|
|
|
|
var start = 0; |
|
|
|
|
|
var item = null; |
|
|
|
|
|
while ((item = byEnd[start]) && |
|
|
|
|
|
(('end' in item.data) ? item.data.end : item.data.start) < this.range.start) { |
|
|
|
|
|
start++; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
if (!this.parent) { |
|
|
|
|
|
throw new Error('Cannot repaint itemset: no parent attached'); |
|
|
|
|
|
} |
|
|
|
|
|
var parentContainer = this.parent.getContainer(); |
|
|
|
|
|
if (!parentContainer) { |
|
|
|
|
|
throw new Error('Cannot repaint itemset: parent has no container element'); |
|
|
|
|
|
} |
|
|
|
|
|
if (!frame.parentNode) { |
|
|
|
|
|
parentContainer.appendChild(frame); |
|
|
|
|
|
changed += 1; |
|
|
|
|
|
} |
|
|
|
|
|
if (!this.dom.axis.parentNode) { |
|
|
|
|
|
parentContainer.appendChild(this.dom.axis); |
|
|
|
|
|
changed += 1; |
|
|
|
|
|
|
|
|
// find the last visible item
|
|
|
|
|
|
// TODO: use faster search, not linear
|
|
|
|
|
|
var byStart = this.orderedItems.byStart; |
|
|
|
|
|
var end = 0; |
|
|
|
|
|
while ((item = byStart[end]) && item.data.start < this.range.end) { |
|
|
|
|
|
end++; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
// reposition frame
|
|
|
|
|
|
changed += update(frame.style, 'left', asSize(options.left, '0px')); |
|
|
|
|
|
changed += update(frame.style, 'top', asSize(options.top, '0px')); |
|
|
|
|
|
changed += update(frame.style, 'width', asSize(options.width, '100%')); |
|
|
|
|
|
changed += update(frame.style, 'height', asSize(options.height, this.height + 'px')); |
|
|
|
|
|
|
|
|
console.log('visible items', start, end); // TODO: cleanup
|
|
|
|
|
|
console.log('visible item ids', byStart[start] && byStart[start].id, byEnd[end-1] && byEnd[end-1].id); // TODO: cleanup
|
|
|
|
|
|
|
|
|
// reposition axis
|
|
|
|
|
|
changed += update(this.dom.axis.style, 'left', asSize(options.left, '0px')); |
|
|
|
|
|
changed += update(this.dom.axis.style, 'width', asSize(options.width, '100%')); |
|
|
|
|
|
if (orientation == 'bottom') { |
|
|
|
|
|
changed += update(this.dom.axis.style, 'top', (this.height + this.top) + 'px'); |
|
|
|
|
|
} |
|
|
|
|
|
else { // orientation == 'top'
|
|
|
|
|
|
changed += update(this.dom.axis.style, 'top', this.top + 'px'); |
|
|
|
|
|
|
|
|
this.visibleItems = []; |
|
|
|
|
|
var i = start; |
|
|
|
|
|
item = byStart[i]; |
|
|
|
|
|
var lastItem = byEnd[end]; |
|
|
|
|
|
while (item && item !== lastItem) { |
|
|
|
|
|
this.visibleItems.push(item); |
|
|
|
|
|
item = byStart[++i]; |
|
|
} |
|
|
} |
|
|
|
|
|
this.stack.order(this.visibleItems); |
|
|
|
|
|
|
|
|
this._updateConversion(); |
|
|
|
|
|
|
|
|
|
|
|
var me = this, |
|
|
|
|
|
queue = this.queue, |
|
|
|
|
|
itemsData = this.itemsData, |
|
|
|
|
|
items = this.items, |
|
|
|
|
|
dataOptions = { |
|
|
|
|
|
// TODO: cleanup
|
|
|
|
|
|
// fields: [(itemsData && itemsData.fieldId || 'id'), 'start', 'end', 'content', 'type', 'className']
|
|
|
|
|
|
}; |
|
|
|
|
|
|
|
|
|
|
|
// show/hide added/changed/removed items
|
|
|
|
|
|
for (var id in queue) { |
|
|
|
|
|
if (queue.hasOwnProperty(id)) { |
|
|
|
|
|
var entry = queue[id], |
|
|
|
|
|
item = items[id], |
|
|
|
|
|
action = entry.action; |
|
|
|
|
|
|
|
|
|
|
|
//noinspection FallthroughInSwitchStatementJS
|
|
|
|
|
|
switch (action) { |
|
|
|
|
|
case 'add': |
|
|
|
|
|
case 'update': |
|
|
|
|
|
var itemData = itemsData && itemsData.get(id, dataOptions); |
|
|
|
|
|
|
|
|
|
|
|
if (itemData) { |
|
|
|
|
|
var type = itemData.type || |
|
|
|
|
|
(itemData.start && itemData.end && 'range') || |
|
|
|
|
|
options.type || |
|
|
|
|
|
'box'; |
|
|
|
|
|
var constructor = ItemSet.types[type]; |
|
|
|
|
|
|
|
|
|
|
|
// TODO: how to handle items with invalid data? hide them and give a warning? or throw an error?
|
|
|
|
|
|
if (item) { |
|
|
|
|
|
// update item
|
|
|
|
|
|
if (!constructor || !(item instanceof constructor)) { |
|
|
|
|
|
// item type has changed, hide and delete the item
|
|
|
|
|
|
changed += item.hide(); |
|
|
|
|
|
item = null; |
|
|
|
|
|
} |
|
|
|
|
|
else { |
|
|
|
|
|
item.data = itemData; // TODO: create a method item.setData ?
|
|
|
|
|
|
changed++; |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
if (!item) { |
|
|
|
|
|
// create item
|
|
|
|
|
|
if (constructor) { |
|
|
|
|
|
item = new constructor(me, itemData, options, defaultOptions); |
|
|
|
|
|
item.id = entry.id; // we take entry.id, as id itself is stringified
|
|
|
|
|
|
changed++; |
|
|
|
|
|
} |
|
|
|
|
|
else { |
|
|
|
|
|
throw new TypeError('Unknown item type "' + type + '"'); |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
// force a repaint (not only a reposition)
|
|
|
|
|
|
item.repaint(); |
|
|
|
|
|
|
|
|
|
|
|
items[id] = item; |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
// show visible items
|
|
|
|
|
|
for (var i = 0, ii = this.visibleItems.length; i < ii; i++) { |
|
|
|
|
|
item = this.visibleItems[i]; |
|
|
|
|
|
|
|
|
// update queue
|
|
|
|
|
|
delete queue[id]; |
|
|
|
|
|
break; |
|
|
|
|
|
|
|
|
if (!item.displayed) item.show(); |
|
|
|
|
|
item.top = null; // reset stacking position
|
|
|
|
|
|
|
|
|
case 'remove': |
|
|
|
|
|
if (item) { |
|
|
|
|
|
// remove the item from the set selected items
|
|
|
|
|
|
if (item.selected) { |
|
|
|
|
|
me._deselect(id); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
// reposition item horizontally
|
|
|
|
|
|
item.repositionX(); |
|
|
|
|
|
} |
|
|
|
|
|
*/ |
|
|
|
|
|
|
|
|
// remove DOM of the item
|
|
|
|
|
|
changed += item.hide(); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
// simple, brute force calculation of visible items
|
|
|
|
|
|
// TODO: replace with a faster, more sophisticated solution
|
|
|
|
|
|
this.visibleItems = []; |
|
|
|
|
|
for (var id in this.items) { |
|
|
|
|
|
if (this.items.hasOwnProperty(id)) { |
|
|
|
|
|
var item = this.items[id]; |
|
|
|
|
|
if (item.isVisible(this.range)) { |
|
|
|
|
|
if (!item.displayed) item.show(); |
|
|
|
|
|
|
|
|
// update lists
|
|
|
|
|
|
delete items[id]; |
|
|
|
|
|
delete queue[id]; |
|
|
|
|
|
break; |
|
|
|
|
|
|
|
|
// reposition item horizontally
|
|
|
|
|
|
item.repositionX(); |
|
|
|
|
|
|
|
|
default: |
|
|
|
|
|
console.log('Error: unknown action "' + action + '"'); |
|
|
|
|
|
|
|
|
this.visibleItems.push(item); |
|
|
|
|
|
} |
|
|
|
|
|
else { |
|
|
|
|
|
if (item.displayed) item.hide(); |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
// reposition all items. Show items only when in the visible area
|
|
|
|
|
|
util.forEach(this.items, function (item) { |
|
|
|
|
|
if (item.visible) { |
|
|
|
|
|
changed += item.show(); |
|
|
|
|
|
item.reposition(); |
|
|
|
|
|
} |
|
|
|
|
|
else { |
|
|
|
|
|
changed += item.hide(); |
|
|
|
|
|
} |
|
|
|
|
|
}); |
|
|
|
|
|
|
|
|
// reposition visible items vertically
|
|
|
|
|
|
//this.stack.order(this.visibleItems); // TODO: improve ordering
|
|
|
|
|
|
var force = this.stackDirty || zoomed; // force re-stacking of all items if true
|
|
|
|
|
|
this.stack.stack(this.visibleItems, force); |
|
|
|
|
|
this.stackDirty = false; |
|
|
|
|
|
for (var i = 0, ii = this.visibleItems.length; i < ii; i++) { |
|
|
|
|
|
this.visibleItems[i].repositionY(); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
// recalculate the height of the itemset
|
|
|
|
|
|
var marginAxis = (options.margin && 'axis' in options.margin) ? options.margin.axis : this.itemOptions.margin.axis, |
|
|
|
|
|
marginItem = (options.margin && 'item' in options.margin) ? options.margin.item : this.itemOptions.margin.item, |
|
|
|
|
|
height; |
|
|
|
|
|
|
|
|
|
|
|
// determine the height from the stacked items
|
|
|
|
|
|
var visibleItems = this.visibleItems; |
|
|
|
|
|
if (visibleItems.length) { |
|
|
|
|
|
var min = visibleItems[0].top; |
|
|
|
|
|
var max = visibleItems[0].top + visibleItems[0].height; |
|
|
|
|
|
util.forEach(visibleItems, function (item) { |
|
|
|
|
|
min = Math.min(min, item.top); |
|
|
|
|
|
max = Math.max(max, (item.top + item.height)); |
|
|
|
|
|
}); |
|
|
|
|
|
height = (max - min) + marginAxis + marginItem; |
|
|
|
|
|
} |
|
|
|
|
|
else { |
|
|
|
|
|
height = marginAxis + marginItem; |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
return (changed > 0); |
|
|
|
|
|
|
|
|
// reposition frame
|
|
|
|
|
|
frame.style.left = asSize(options.left, ''); |
|
|
|
|
|
frame.style.right = asSize(options.right, ''); |
|
|
|
|
|
frame.style.top = asSize((orientation == 'top') ? '0' : ''); |
|
|
|
|
|
frame.style.bottom = asSize((orientation == 'top') ? '' : '0'); |
|
|
|
|
|
frame.style.width = asSize(options.width, '100%'); |
|
|
|
|
|
frame.style.height = asSize(height); |
|
|
|
|
|
//frame.style.height = asSize('height' in options ? options.height : height); // TODO: reckon with height
|
|
|
|
|
|
|
|
|
|
|
|
// calculate actual size and position
|
|
|
|
|
|
this.top = frame.offsetTop; |
|
|
|
|
|
this.left = frame.offsetLeft; |
|
|
|
|
|
this.width = frame.offsetWidth; |
|
|
|
|
|
this.height = height; |
|
|
|
|
|
|
|
|
|
|
|
// reposition axis
|
|
|
|
|
|
this.dom.axis.style.left = asSize(options.left, '0'); |
|
|
|
|
|
this.dom.axis.style.right = asSize(options.right, ''); |
|
|
|
|
|
this.dom.axis.style.width = asSize(options.width, '100%'); |
|
|
|
|
|
this.dom.axis.style.height = asSize(0); |
|
|
|
|
|
this.dom.axis.style.top = asSize((orientation == 'top') ? '0' : ''); |
|
|
|
|
|
this.dom.axis.style.bottom = asSize((orientation == 'top') ? '' : '0'); |
|
|
|
|
|
|
|
|
|
|
|
return this._isResized(); |
|
|
}; |
|
|
}; |
|
|
|
|
|
|
|
|
/** |
|
|
/** |
|
|
@ -439,90 +405,6 @@ ItemSet.prototype.getAxis = function getAxis() { |
|
|
return this.dom.axis; |
|
|
return this.dom.axis; |
|
|
}; |
|
|
}; |
|
|
|
|
|
|
|
|
/** |
|
|
|
|
|
* Reflow the component |
|
|
|
|
|
* @return {Boolean} resized |
|
|
|
|
|
*/ |
|
|
|
|
|
ItemSet.prototype.reflow = function reflow () { |
|
|
|
|
|
var changed = 0, |
|
|
|
|
|
options = this.options, |
|
|
|
|
|
marginAxis = (options.margin && 'axis' in options.margin) ? options.margin.axis : this.defaultOptions.margin.axis, |
|
|
|
|
|
marginItem = (options.margin && 'item' in options.margin) ? options.margin.item : this.defaultOptions.margin.item, |
|
|
|
|
|
update = util.updateProperty, |
|
|
|
|
|
asNumber = util.option.asNumber, |
|
|
|
|
|
asSize = util.option.asSize, |
|
|
|
|
|
frame = this.frame; |
|
|
|
|
|
|
|
|
|
|
|
if (frame) { |
|
|
|
|
|
this._updateConversion(); |
|
|
|
|
|
|
|
|
|
|
|
util.forEach(this.items, function (item) { |
|
|
|
|
|
changed += item.reflow(); |
|
|
|
|
|
}); |
|
|
|
|
|
|
|
|
|
|
|
// TODO: stack.update should be triggered via an event, in stack itself
|
|
|
|
|
|
// TODO: only update the stack when there are changed items
|
|
|
|
|
|
this.stack.update(); |
|
|
|
|
|
|
|
|
|
|
|
var maxHeight = asNumber(options.maxHeight); |
|
|
|
|
|
var fixedHeight = (asSize(options.height) != null); |
|
|
|
|
|
var height; |
|
|
|
|
|
if (fixedHeight) { |
|
|
|
|
|
height = frame.offsetHeight; |
|
|
|
|
|
} |
|
|
|
|
|
else { |
|
|
|
|
|
// height is not specified, determine the height from the height and positioned items
|
|
|
|
|
|
var visibleItems = this.stack.ordered; // TODO: not so nice way to get the filtered items
|
|
|
|
|
|
if (visibleItems.length) { |
|
|
|
|
|
var min = visibleItems[0].top; |
|
|
|
|
|
var max = visibleItems[0].top + visibleItems[0].height; |
|
|
|
|
|
util.forEach(visibleItems, function (item) { |
|
|
|
|
|
min = Math.min(min, item.top); |
|
|
|
|
|
max = Math.max(max, (item.top + item.height)); |
|
|
|
|
|
}); |
|
|
|
|
|
height = (max - min) + marginAxis + marginItem; |
|
|
|
|
|
} |
|
|
|
|
|
else { |
|
|
|
|
|
height = marginAxis + marginItem; |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
if (maxHeight != null) { |
|
|
|
|
|
height = Math.min(height, maxHeight); |
|
|
|
|
|
} |
|
|
|
|
|
changed += update(this, 'height', height); |
|
|
|
|
|
|
|
|
|
|
|
// calculate height from items
|
|
|
|
|
|
changed += update(this, 'top', frame.offsetTop); |
|
|
|
|
|
changed += update(this, 'left', frame.offsetLeft); |
|
|
|
|
|
changed += update(this, 'width', frame.offsetWidth); |
|
|
|
|
|
} |
|
|
|
|
|
else { |
|
|
|
|
|
changed += 1; |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
return (changed > 0); |
|
|
|
|
|
}; |
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
|
* Hide this component from the DOM |
|
|
|
|
|
* @return {Boolean} changed |
|
|
|
|
|
*/ |
|
|
|
|
|
ItemSet.prototype.hide = function hide() { |
|
|
|
|
|
var changed = false; |
|
|
|
|
|
|
|
|
|
|
|
// remove the DOM
|
|
|
|
|
|
if (this.frame && this.frame.parentNode) { |
|
|
|
|
|
this.frame.parentNode.removeChild(this.frame); |
|
|
|
|
|
changed = true; |
|
|
|
|
|
} |
|
|
|
|
|
if (this.dom.axis && this.dom.axis.parentNode) { |
|
|
|
|
|
this.dom.axis.parentNode.removeChild(this.dom.axis); |
|
|
|
|
|
changed = true; |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
return changed; |
|
|
|
|
|
}; |
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
/** |
|
|
* Set items |
|
|
* Set items |
|
|
* @param {vis.DataSet | null} items |
|
|
* @param {vis.DataSet | null} items |
|
|
@ -587,7 +469,9 @@ ItemSet.prototype.removeItem = function removeItem (id) { |
|
|
// confirm deletion
|
|
|
// confirm deletion
|
|
|
this.options.onRemove(item, function (item) { |
|
|
this.options.onRemove(item, function (item) { |
|
|
if (item) { |
|
|
if (item) { |
|
|
dataset.remove(item); |
|
|
|
|
|
|
|
|
// remove by id here, it is possible that an item has no id defined
|
|
|
|
|
|
// itself, so better not delete by the item itself
|
|
|
|
|
|
dataset.remove(id); |
|
|
} |
|
|
} |
|
|
}); |
|
|
}); |
|
|
} |
|
|
} |
|
|
@ -599,17 +483,58 @@ ItemSet.prototype.removeItem = function removeItem (id) { |
|
|
* @private |
|
|
* @private |
|
|
*/ |
|
|
*/ |
|
|
ItemSet.prototype._onUpdate = function _onUpdate(ids) { |
|
|
ItemSet.prototype._onUpdate = function _onUpdate(ids) { |
|
|
this._toQueue('update', ids); |
|
|
|
|
|
|
|
|
var me = this, |
|
|
|
|
|
items = this.items, |
|
|
|
|
|
itemOptions = this.itemOptions; |
|
|
|
|
|
|
|
|
|
|
|
ids.forEach(function (id) { |
|
|
|
|
|
var itemData = me.itemsData.get(id), |
|
|
|
|
|
item = items[id], |
|
|
|
|
|
type = itemData.type || |
|
|
|
|
|
(itemData.start && itemData.end && 'range') || |
|
|
|
|
|
me.options.type || |
|
|
|
|
|
'box'; |
|
|
|
|
|
|
|
|
|
|
|
var constructor = ItemSet.types[type]; |
|
|
|
|
|
|
|
|
|
|
|
if (item) { |
|
|
|
|
|
// update item
|
|
|
|
|
|
if (!constructor || !(item instanceof constructor)) { |
|
|
|
|
|
// item type has changed, hide and delete the item
|
|
|
|
|
|
item.hide(); |
|
|
|
|
|
item = null; |
|
|
|
|
|
} |
|
|
|
|
|
else { |
|
|
|
|
|
item.data = itemData; // TODO: create a method item.setData ?
|
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
if (!item) { |
|
|
|
|
|
// create item
|
|
|
|
|
|
if (constructor) { |
|
|
|
|
|
item = new constructor(me, itemData, me.options, itemOptions); |
|
|
|
|
|
item.id = id; |
|
|
|
|
|
} |
|
|
|
|
|
else { |
|
|
|
|
|
throw new TypeError('Unknown item type "' + type + '"'); |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
me.items[id] = item; |
|
|
|
|
|
}); |
|
|
|
|
|
|
|
|
|
|
|
this._order(); |
|
|
|
|
|
|
|
|
|
|
|
this.stackDirty = true; // force re-stacking of all items next repaint
|
|
|
|
|
|
this.emit('change'); |
|
|
}; |
|
|
}; |
|
|
|
|
|
|
|
|
/** |
|
|
/** |
|
|
* Handle changed items |
|
|
|
|
|
|
|
|
* Handle added items |
|
|
* @param {Number[]} ids |
|
|
* @param {Number[]} ids |
|
|
* @private |
|
|
* @private |
|
|
*/ |
|
|
*/ |
|
|
ItemSet.prototype._onAdd = function _onAdd(ids) { |
|
|
|
|
|
this._toQueue('add', ids); |
|
|
|
|
|
}; |
|
|
|
|
|
|
|
|
ItemSet.prototype._onAdd = ItemSet.prototype._onUpdate; |
|
|
|
|
|
|
|
|
/** |
|
|
/** |
|
|
* Handle removed items |
|
|
* Handle removed items |
|
|
@ -617,73 +542,42 @@ ItemSet.prototype._onAdd = function _onAdd(ids) { |
|
|
* @private |
|
|
* @private |
|
|
*/ |
|
|
*/ |
|
|
ItemSet.prototype._onRemove = function _onRemove(ids) { |
|
|
ItemSet.prototype._onRemove = function _onRemove(ids) { |
|
|
this._toQueue('remove', ids); |
|
|
|
|
|
}; |
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
|
* Put items in the queue to be added/updated/remove |
|
|
|
|
|
* @param {String} action can be 'add', 'update', 'remove' |
|
|
|
|
|
* @param {Number[]} ids |
|
|
|
|
|
*/ |
|
|
|
|
|
ItemSet.prototype._toQueue = function _toQueue(action, ids) { |
|
|
|
|
|
var queue = this.queue; |
|
|
|
|
|
|
|
|
var count = 0; |
|
|
|
|
|
var me = this; |
|
|
ids.forEach(function (id) { |
|
|
ids.forEach(function (id) { |
|
|
queue[id] = { |
|
|
|
|
|
id: id, |
|
|
|
|
|
action: action |
|
|
|
|
|
}; |
|
|
|
|
|
|
|
|
var item = me.items[id]; |
|
|
|
|
|
if (item) { |
|
|
|
|
|
count++; |
|
|
|
|
|
item.hide(); |
|
|
|
|
|
delete me.items[id]; |
|
|
|
|
|
delete me.visibleItems[id]; |
|
|
|
|
|
|
|
|
|
|
|
// remove from selection
|
|
|
|
|
|
var index = me.selection.indexOf(id); |
|
|
|
|
|
if (index != -1) me.selection.splice(index, 1); |
|
|
|
|
|
} |
|
|
}); |
|
|
}); |
|
|
|
|
|
|
|
|
if (this.controller) { |
|
|
|
|
|
//this.requestReflow();
|
|
|
|
|
|
this.requestRepaint(); |
|
|
|
|
|
|
|
|
if (count) { |
|
|
|
|
|
// update order
|
|
|
|
|
|
this._order(); |
|
|
|
|
|
this.stackDirty = true; // force re-stacking of all items next repaint
|
|
|
|
|
|
this.emit('change'); |
|
|
} |
|
|
} |
|
|
}; |
|
|
}; |
|
|
|
|
|
|
|
|
/** |
|
|
/** |
|
|
* Calculate the scale and offset to convert a position on screen to the |
|
|
|
|
|
* corresponding date and vice versa. |
|
|
|
|
|
* After the method _updateConversion is executed once, the methods toTime |
|
|
|
|
|
* and toScreen can be used. |
|
|
|
|
|
|
|
|
* Order the items |
|
|
* @private |
|
|
* @private |
|
|
*/ |
|
|
*/ |
|
|
ItemSet.prototype._updateConversion = function _updateConversion() { |
|
|
|
|
|
var range = this.range; |
|
|
|
|
|
if (!range) { |
|
|
|
|
|
throw new Error('No range configured'); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
if (range.conversion) { |
|
|
|
|
|
this.conversion = range.conversion(this.width); |
|
|
|
|
|
} |
|
|
|
|
|
else { |
|
|
|
|
|
this.conversion = Range.conversion(range.start, range.end, this.width); |
|
|
|
|
|
} |
|
|
|
|
|
}; |
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
|
* Convert a position on screen (pixels) to a datetime |
|
|
|
|
|
* Before this method can be used, the method _updateConversion must be |
|
|
|
|
|
* executed once. |
|
|
|
|
|
* @param {int} x Position on the screen in pixels |
|
|
|
|
|
* @return {Date} time The datetime the corresponds with given position x |
|
|
|
|
|
*/ |
|
|
|
|
|
ItemSet.prototype.toTime = function toTime(x) { |
|
|
|
|
|
var conversion = this.conversion; |
|
|
|
|
|
return new Date(x / conversion.scale + conversion.offset); |
|
|
|
|
|
}; |
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
|
* Convert a datetime (Date object) into a position on the screen |
|
|
|
|
|
* Before this method can be used, the method _updateConversion must be |
|
|
|
|
|
* executed once. |
|
|
|
|
|
* @param {Date} time A date |
|
|
|
|
|
* @return {int} x The position on the screen in pixels which corresponds |
|
|
|
|
|
* with the given date. |
|
|
|
|
|
*/ |
|
|
|
|
|
ItemSet.prototype.toScreen = function toScreen(time) { |
|
|
|
|
|
var conversion = this.conversion; |
|
|
|
|
|
return (time.valueOf() - conversion.offset) * conversion.scale; |
|
|
|
|
|
|
|
|
ItemSet.prototype._order = function _order() { |
|
|
|
|
|
var array = util.toArray(this.items); |
|
|
|
|
|
this.orderedItems.byStart = array; |
|
|
|
|
|
this.orderedItems.byEnd = [].concat(array); |
|
|
|
|
|
|
|
|
|
|
|
// reorder the items
|
|
|
|
|
|
this.stack.orderByStart(this.orderedItems.byStart); |
|
|
|
|
|
this.stack.orderByEnd(this.orderedItems.byEnd); |
|
|
}; |
|
|
}; |
|
|
|
|
|
|
|
|
/** |
|
|
/** |
|
|
@ -746,7 +640,8 @@ ItemSet.prototype._onDrag = function (event) { |
|
|
if (this.touchParams.itemProps) { |
|
|
if (this.touchParams.itemProps) { |
|
|
var snap = this.options.snap || null, |
|
|
var snap = this.options.snap || null, |
|
|
deltaX = event.gesture.deltaX, |
|
|
deltaX = event.gesture.deltaX, |
|
|
offset = deltaX / this.conversion.scale; |
|
|
|
|
|
|
|
|
scale = (this.width / (this.range.end - this.range.start)), |
|
|
|
|
|
offset = deltaX / scale; |
|
|
|
|
|
|
|
|
// move
|
|
|
// move
|
|
|
this.touchParams.itemProps.forEach(function (props) { |
|
|
this.touchParams.itemProps.forEach(function (props) { |
|
|
@ -764,7 +659,8 @@ ItemSet.prototype._onDrag = function (event) { |
|
|
|
|
|
|
|
|
// TODO: implement dragging from one group to another
|
|
|
// TODO: implement dragging from one group to another
|
|
|
|
|
|
|
|
|
this.requestReflow(); |
|
|
|
|
|
|
|
|
this.stackDirty = true; // force re-stacking of all items next repaint
|
|
|
|
|
|
this.emit('change'); |
|
|
|
|
|
|
|
|
event.stopPropagation(); |
|
|
event.stopPropagation(); |
|
|
} |
|
|
} |
|
|
@ -780,8 +676,7 @@ ItemSet.prototype._onDragEnd = function (event) { |
|
|
// prepare a change set for the changed items
|
|
|
// prepare a change set for the changed items
|
|
|
var changes = [], |
|
|
var changes = [], |
|
|
me = this, |
|
|
me = this, |
|
|
dataset = this._myDataSet(), |
|
|
|
|
|
type; |
|
|
|
|
|
|
|
|
dataset = this._myDataSet(); |
|
|
|
|
|
|
|
|
this.touchParams.itemProps.forEach(function (props) { |
|
|
this.touchParams.itemProps.forEach(function (props) { |
|
|
var id = props.item.id, |
|
|
var id = props.item.id, |
|
|
@ -802,13 +697,16 @@ ItemSet.prototype._onDragEnd = function (event) { |
|
|
me.options.onMove(item, function (item) { |
|
|
me.options.onMove(item, function (item) { |
|
|
if (item) { |
|
|
if (item) { |
|
|
// apply changes
|
|
|
// apply changes
|
|
|
|
|
|
item[dataset.fieldId] = id; // ensure the item contains its id (can be undefined)
|
|
|
changes.push(item); |
|
|
changes.push(item); |
|
|
} |
|
|
} |
|
|
else { |
|
|
else { |
|
|
// restore original values
|
|
|
// restore original values
|
|
|
if ('start' in props) props.item.data.start = props.start; |
|
|
if ('start' in props) props.item.data.start = props.start; |
|
|
if ('end' in props) props.item.data.end = props.end; |
|
|
if ('end' in props) props.item.data.end = props.end; |
|
|
me.requestReflow(); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
me.stackDirty = true; // force re-stacking of all items next repaint
|
|
|
|
|
|
me.emit('change'); |
|
|
} |
|
|
} |
|
|
}); |
|
|
}); |
|
|
} |
|
|
} |
|
|
|
Alex de Mulder
10 years ago