Browse Source

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

flowchartTest
AlexDM0 9 years ago
parent
commit
356d5b23ff
4 changed files with 9 additions and 3 deletions
  1. +3
    -0
      HISTORY.md
  2. +1
    -0
      docs/timeline/index.html
  3. +4
    -2
      lib/timeline/component/ItemSet.js
  4. +1
    -1
      package.json

+ 3
- 0
HISTORY.md View File

@ -11,8 +11,11 @@ http://visjs.org
### Timeline ### Timeline
- Added axis orientation option `'none'`. - Added axis orientation option `'none'`.
- Added a property `event` to the properties emitted with the `select` event (see #923).
- Improved function `fit()` to take into account the actual width of items. - Improved function `fit()` to take into account the actual width of items.
- Fixed #897: Timeline option `{snap: null}` did give a validation error. - Fixed #897: Timeline option `{snap: null}` did give a validation error.
- Fixed #925: Event `timechanged` did not fire when mouse has been moved outside
the timeline.
### Graph2D ### Graph2D

+ 1
- 0
docs/timeline/index.html View File

@ -1256,6 +1256,7 @@ timeline.off('select', onSelect);
<td> <td>
<ul> <ul>
<li><code>items</code>: an array with the ids of the selected items</li> <li><code>items</code>: an array with the ids of the selected items</li>
<li><code>event</code>: the original click event</li>
</ul> </ul>
</td> </td>
<td>Fired after the user selects or deselects items by tapping or holding them. <td>Fired after the user selects or deselects items by tapping or holding them.

+ 4
- 2
lib/timeline/component/ItemSet.js View File

@ -1405,7 +1405,8 @@ ItemSet.prototype._onSelectItem = function (event) {
// except when old selection is empty and new selection is still empty // except when old selection is empty and new selection is still empty
if (newSelection.length > 0 || oldSelection.length > 0) { if (newSelection.length > 0 || oldSelection.length > 0) {
this.body.emitter.emit('select', { this.body.emitter.emit('select', {
items: newSelection
items: newSelection,
event: event
}); });
} }
}; };
@ -1530,7 +1531,8 @@ ItemSet.prototype._onMultiSelectItem = function (event) {
this.setSelection(selection); this.setSelection(selection);
this.body.emitter.emit('select', { this.body.emitter.emit('select', {
items: this.getSelection()
items: this.getSelection(),
event: event
}); });
} }
}; };

+ 1
- 1
package.json View File

@ -34,7 +34,7 @@
"keycharm": "^0.2.0", "keycharm": "^0.2.0",
"uuid": "^2.0.1", "uuid": "^2.0.1",
"moment": "^2.10.2", "moment": "^2.10.2",
"propagating-hammerjs": "^1.4.2"
"propagating-hammerjs": "^1.4.3"
}, },
"devDependencies": { "devDependencies": {
"babel": "^5.1.11", "babel": "^5.1.11",

Loading…
Cancel
Save