From: Ville Hämäläinen <hamalainen.ville.p@gmail.com>
Date: Sun, 28 Feb 2016 08:20:10 +0000 (+0200)
Subject: fix consistency with other samples
X-Git-Tag: v2.0.0~29^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F2069%2Fhead;p=thirdparty%2FChart.js.git

fix consistency with other samples
---

diff --git a/samples/bubble.html b/samples/bubble.html
index 063168342..43ab27784 100644
--- a/samples/bubble.html
+++ b/samples/bubble.html
@@ -6,7 +6,7 @@
     <script src="http://cdnjs.cloudflare.com/ajax/libs/jquery/2.1.3/jquery.min.js"></script>
     <script src="../dist/Chart.bundle.js"></script>
     <style type="text/css">
-    #canvas{
+    canvas{
         -moz-user-select: none;
         -webkit-user-select: none;
         -ms-user-select: none;
@@ -45,24 +45,69 @@
             datasets: [{
                 label: "My First dataset",
                 backgroundColor: randomColor(),
-                data: []
+                data: [{
+                    x: randomScalingFactor(),
+                    y: randomScalingFactor(),
+                    r: Math.abs(randomScalingFactor()) / 5,
+                }, {
+                    x: randomScalingFactor(),
+                    y: randomScalingFactor(),
+                    r: Math.abs(randomScalingFactor()) / 5,
+                }, {
+                    x: randomScalingFactor(),
+                    y: randomScalingFactor(),
+                    r: Math.abs(randomScalingFactor()) / 5,
+                }, {
+                    x: randomScalingFactor(),
+                    y: randomScalingFactor(),
+                    r: Math.abs(randomScalingFactor()) / 5,
+                }, {
+                    x: randomScalingFactor(),
+                    y: randomScalingFactor(),
+                    r: Math.abs(randomScalingFactor()) / 5,
+                }, {
+                    x: randomScalingFactor(),
+                    y: randomScalingFactor(),
+                    r: Math.abs(randomScalingFactor()) / 5,
+                }, {
+                    x: randomScalingFactor(),
+                    y: randomScalingFactor(),
+                    r: Math.abs(randomScalingFactor()) / 5,
+                }]
             }, {
                 label: "My Second dataset",
                 backgroundColor: randomColor(),
-                data: []
-            }]
-        };
-
-        // add random data to initial datasets
-        for(var i in bubbleChartData.datasets){
-            for(var j=0; j<DEFAULT_DATASET_SIZE; ++j){
-                bubbleChartData.datasets[i].data.push({
+                data: [{
                     x: randomScalingFactor(),
                     y: randomScalingFactor(),
-                    r: Math.abs(randomScalingFactor()) / 5
-                });
-            }
-        }
+                    r: Math.abs(randomScalingFactor()) / 5,
+                }, {
+                    x: randomScalingFactor(),
+                    y: randomScalingFactor(),
+                    r: Math.abs(randomScalingFactor()) / 5,
+                }, {
+                    x: randomScalingFactor(),
+                    y: randomScalingFactor(),
+                    r: Math.abs(randomScalingFactor()) / 5,
+                }, {
+                    x: randomScalingFactor(),
+                    y: randomScalingFactor(),
+                    r: Math.abs(randomScalingFactor()) / 5,
+                }, {
+                    x: randomScalingFactor(),
+                    y: randomScalingFactor(),
+                    r: Math.abs(randomScalingFactor()) / 5,
+                }, {
+                    x: randomScalingFactor(),
+                    y: randomScalingFactor(),
+                    r: Math.abs(randomScalingFactor()) / 5,
+                }, {
+                    x: randomScalingFactor(),
+                    y: randomScalingFactor(),
+                    r: Math.abs(randomScalingFactor()) / 5,
+                }]
+            }]
+        };
 
         window.onload = function() {
             var ctx = document.getElementById("canvas").getContext("2d");
diff --git a/samples/line.html b/samples/line.html
index 045324e4a..a3ab0cc99 100644
--- a/samples/line.html
+++ b/samples/line.html
@@ -6,7 +6,7 @@
     <script src="../dist/Chart.bundle.js"></script>
     <script src="http://cdnjs.cloudflare.com/ajax/libs/jquery/2.1.3/jquery.min.js"></script>
     <style>
-    #canvas{
+    canvas{
         -moz-user-select: none;
         -webkit-user-select: none;
         -ms-user-select: none;