Merge commit 'dd04c360082eb7e0c54425907224ecf692307906' into update_visjs_again

lib/vis/docs/data/dataset.html

@@ -104,7 +104,7 @@
     Vis.js comes with a flexible DataSet, which can be used to hold and
     manipulate unstructured data and listen for changes in the data.
     The DataSet is key/value based. Data items can be added, updated and
-    removed from the DatSet, and one can subscribe to changes in the DataSet.
+    removed from the DataSet, and one can subscribe to changes in the DataSet.
     The data in the DataSet can be filtered and ordered, and fields (like
     dates) can be converted to a specific type. Data can be normalized when
     appending it to the DataSet as well.
@@ -312,7 +312,7 @@ var data = new vis.DataSet([data] [, options])
       <td>Object | Array</td>
       <td>
         Get a single item, multiple items, or all items from the DataSet.
-        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>
 
@@ -431,7 +431,7 @@ var data = new vis.DataSet([data] [, options])
       </td>
       <td>Number[]</td>
       <td>
-        Update on ore multiple existing items. <code>data</code> can be a single item or an array with items. When an item doesn't  exist, it will be created. Returns an array with the ids of the removed items. See section <a href="#Data_Manipulation">Data Manipulation</a>.
+        Update one or multiple existing items. <code>data</code> can be a single item or an array with items. When an item doesn't exist, it will be created. Returns an array with the ids of the removed items. See section <a href="#Data_Manipulation">Data Manipulation</a>.
       </td>
     </tr>
 
@@ -598,9 +598,9 @@ function (event, properties, senderId) {
         <code>update</code>, and <code>remove</code>,
         <code>properties</code> is always an object containing a property
         <code>items</code>, which contains an array with the ids of the affected
-        items. The <code>update</code> event has an extra field <code>data</code>
-        containing the original data of the updated items, i.e. the gives the
-        changed fields of the changed items.
+        items. The <code>update</code> event has an extra field <code>oldData</code>
+        containing the original data of the updated items, and a field <code>data</code>
+        containing the changes: the properties of the items that are being updated.
       </td>
     </tr>
     <tr>
@@ -1020,4 +1020,4 @@ var positiveBalance = dataset.get({
 <script src="../js/tipuesearch.config.js"></script>
 <script src="../js/tipuesearch.js"></script>
 <!-- controller -->
-<script src="../js/main.js"></script>
+<script src="../js/main.js"></script>

lib/vis/docs/data/dataview.html

@@ -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>