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

HISTORY.md

@@ -11,8 +11,11 @@ http://visjs.org
 ### Timeline
 
 - 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.
 - 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
 

docs/timeline/index.html

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

lib/timeline/component/ItemSet.js

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

package.json

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