Merge branch 'master' into bar-negative

htdocs/samples/data_load.html

@@ -24,7 +24,7 @@
         chart.load({
           url: '/data/c3_test2.csv'
         });
-      }, 500);
+      }, 250);
 
       setTimeout(function () {
         chart.load({
@@ -34,7 +34,7 @@
             ['data3', 300, 200, 160, 400, 250, 250]
           ]
         });
-      }, 1000);
+      }, 500);
 
       setTimeout(function () {
         chart.load({
@@ -48,7 +48,7 @@
             [90, 220, 320],
           ]
         });
-      }, 1500);
+      }, 750);
 
       setTimeout(function () {
         chart.load({
@@ -56,8 +56,33 @@
             ['data1', 30, 20, 50, 40, 60, 50,100,200]
           ]
         });
+      }, 1000);
+
+      setTimeout(function () {
+        chart.unload('data1');
+      }, 1250);
+
+      setTimeout(function () {
+        chart.load({
+          columns:[
+            ['data2', null, 30, 20, 50, 40, 60, 50]
+          ]
+        });
+      }, 1750);
+
+      setTimeout(function () {
+        chart.load({
+          columns:[
+            ['data2', null, 30, 20, 50, 40, 60, 50]
+          ]
+        });
       }, 2000);
 
+      setTimeout(function () {
+        chart.unload('data3');
+      }, 2250);
+
+
     </script>
   </body>
 </html>