Merge commit 'dd04c360082eb7e0c54425907224ecf692307906' into update_visjs_again

This commit is contained in:
Eldon Koyle
2016-02-17 11:57:17 -07:00
134 changed files with 19644 additions and 12155 deletions
+2 -2
View File
@@ -248,7 +248,7 @@ var data = new vis.DataView(dataset, options)
<td>Object | Array</td>
<td>
Get a single item, multiple items, or all items from the DataView.
Usage examples can be found in section <a href="#Getting_Data">Getting Data</a>, and the available <code>options</code> are described in section <a href="#Data_Selection">Data Selection</a>.
Usage examples can be found in section <a href="#Getting_Data">Getting Data</a>, and the available <code>options</code> are described in section <a href="#Data_Selection">Data Selection</a>. When no item is found, <code>null</code> is returned when a single item was requested, and and empty Array is returned in case of multiple id's.
</td>
</tr>
@@ -307,7 +307,7 @@ var view = new vis.DataView(data, {
<tr>
<td>
setDataSet(data)
setData(data)
</td>
<td>none</td>
<td>