Browse Source

Merge branch 'alex_dev' into develop

css_transitions
josdejong 10 years ago
parent
commit
a5ee54a994
2 changed files with 20 additions and 2 deletions
  1. +10
    -1
      dist/vis.js
  2. +10
    -1
      src/graph/SelectionMixin.js

+ 10
- 1
dist/vis.js View File

@ -12484,7 +12484,6 @@ var SelectionMixin = {
/** /**
* * // TODO: rework this function, it is from the old system
* *
* retrieve the currently selected nodes * retrieve the currently selected nodes
* @return {Number[] | String[]} selection An array with the ids of the * @return {Number[] | String[]} selection An array with the ids of the
@ -12494,6 +12493,16 @@ var SelectionMixin = {
return this.selection.concat([]); return this.selection.concat([]);
}, },
/**
*
* retrieve the currently selected nodes as objects
* @return {Objects} selection An array with the ids of the
* selected nodes.
*/
getSelectionObjects : function() {
return this.selectionObj;
},
/** /**
* // TODO: rework this function, it is from the old system * // TODO: rework this function, it is from the old system
* *

+ 10
- 1
src/graph/SelectionMixin.js View File

@ -320,7 +320,6 @@ var SelectionMixin = {
/** /**
* * // TODO: rework this function, it is from the old system
* *
* retrieve the currently selected nodes * retrieve the currently selected nodes
* @return {Number[] | String[]} selection An array with the ids of the * @return {Number[] | String[]} selection An array with the ids of the
@ -330,6 +329,16 @@ var SelectionMixin = {
return this.selection.concat([]); return this.selection.concat([]);
}, },
/**
*
* retrieve the currently selected nodes as objects
* @return {Objects} selection An array with the ids of the
* selected nodes.
*/
getSelectionObjects : function() {
return this.selectionObj;
},
/** /**
* // TODO: rework this function, it is from the old system * // TODO: rework this function, it is from the old system
* *

Loading…
Cancel
Save