Browse Source

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

v3_develop
jos 10 years ago
parent
commit
823370d503
5 changed files with 5201 additions and 5357 deletions
  1. +1
    -0
      HISTORY.md
  2. +5172
    -5353
      dist/vis.js
  3. +1
    -1
      dist/vis.min.css
  4. +8
    -2
      docs/network.html
  5. +19
    -1
      lib/network/Network.js

+ 1
- 0
HISTORY.md View File

@ -18,6 +18,7 @@ http://visjs.org
- Added animation and camera controls by the method .moveTo() - Added animation and camera controls by the method .moveTo()
- Added new event that fires when the animation is finished. - Added new event that fires when the animation is finished.
- Added new example showing the new features of animation. - Added new example showing the new features of animation.
- Added getScale() method.
### Timeline ### Timeline

+ 5172
- 5353
dist/vis.js
File diff suppressed because it is too large
View File


+ 1
- 1
dist/vis.min.css
File diff suppressed because it is too large
View File


+ 8
- 2
docs/network.html View File

@ -2136,8 +2136,14 @@ var options: {
<th>Return Type</th> <th>Return Type</th>
<th>Description</th> <th>Description</th>
</tr> </tr>
<tr>
<tr>
<td>getScale()</td>
<td>Number</td>
<td>Returns the scale of the network. This can be for animation. This scale is like a percentage, 1.0 = 100%.
Zooming in is > 1.0, zooming out is < 0. Scale cannot be smaller or equal to 0.
</td>
</tr>
<tr>
<td>getSelection()</td> <td>getSelection()</td>
<td>Array of ids</td> <td>Array of ids</td>
<td>Returns an array with the ids of the selected nodes. <td>Returns an array with the ids of the selected nodes.

+ 19
- 1
lib/network/Network.js View File

@ -2455,7 +2455,7 @@ Network.prototype._classicRedraw = function () {
}; };
/** /**
* Returns true when the Timeline is active.
* Returns true when the Network is active.
* @returns {boolean} * @returns {boolean}
*/ */
Network.prototype.isActive = function () { Network.prototype.isActive = function () {
@ -2463,5 +2463,23 @@ Network.prototype.isActive = function () {
}; };
/**
* Sets the scale
* @returns {Number}
*/
Network.prototype.setScale = function () {
return this._setScale();
};
/**
* Returns the scale
* @returns {Number}
*/
Network.prototype.getScale = function () {
return this._getScale();
};
module.exports = Network; module.exports = Network;

Loading…
Cancel
Save