]> git.ipfire.org Git - thirdparty/Chart.js.git/commitdiff
Revert "Merge pull request #856 from tannerlinsley/editable-chart-config"
authorTanner Linsley <tannerlinsley@gmail.com>
Tue, 12 May 2015 00:57:14 +0000 (18:57 -0600)
committerTanner Linsley <tannerlinsley@gmail.com>
Tue, 12 May 2015 00:57:14 +0000 (18:57 -0600)
This reverts commit a8063de6b8a744b0ad117d20ef7c9138147212f3, reversing
changes made to 7f513b87eefc7319f31a4e5590bdd916398ca44d.

samples/bar.html
samples/doughnut.html
samples/line.html
samples/pie.html
samples/polar-area.html
samples/radar.html
src/Chart.Bar.js
src/Chart.Doughnut.js
src/Chart.Line.js
src/Chart.PolarArea.js
src/Chart.Radar.js

index c386c50fa387eca2a6614a33a1369e854db84046..5bf4b5bae3661b26f403b9a50503f995075a4761 100644 (file)
@@ -3,17 +3,15 @@
        <head>
                <title>Bar Chart</title>
                <script src="../Chart.js"></script>
-               <script src="http://cdnjs.cloudflare.com/ajax/libs/jquery/2.1.3/jquery.min.js"></script>
        </head>
        <body>
                <div style="width: 50%">
                        <canvas id="canvas" height="450" width="600"></canvas>
                </div>
-               <button id="randomizeData">Randomize Data</button>
+
 
        <script>
        var randomScalingFactor = function(){ return Math.round(Math.random()*100)};
-       var randomColorFactor = function(){ return Math.round(Math.random()*255)};
 
        var barChartData = {
                labels : ["January","February","March","April","May","June","July"],
                });
        }
 
-       $('#randomizeData').click(function(){
-       barChartData.datasets[0].fillColor = 'rgba(' + randomColorFactor() + ',' + randomColorFactor() + ',' + randomColorFactor() + ',.7)';
-       barChartData.datasets[0].data = [randomScalingFactor(),randomScalingFactor(),randomScalingFactor(),randomScalingFactor(),randomScalingFactor(),randomScalingFactor(),randomScalingFactor()];
-
-       barChartData.datasets[1].fillColor = 'rgba(' + randomColorFactor() + ',' + randomColorFactor() + ',' + randomColorFactor() + ',.7)';
-       barChartData.datasets[1].data = [randomScalingFactor(),randomScalingFactor(),randomScalingFactor(),randomScalingFactor(),randomScalingFactor(),randomScalingFactor(),randomScalingFactor()];
-
-       window.myBar.update();
-    });
-
        </script>
        </body>
 </html>
index 879f72f6894311a640412bd58d8b896bf8b1a02e..fdf7539a893801e6aacc39bd8fe7e5bc06cb3258 100644 (file)
@@ -3,7 +3,6 @@
        <head>
                <title>Doughnut Chart</title>
                <script src="../Chart.js"></script>
-               <script src="http://cdnjs.cloudflare.com/ajax/libs/jquery/2.1.3/jquery.min.js"></script>
                <style>
                        body{
                                padding: 0;
                <div id="canvas-holder">
                        <canvas id="chart-area" width="500" height="500"/>
                </div>
-               <button id="randomizeData">Randomize Data</button>
 
 
        <script>
 
-               var randomScalingFactor = function(){ return Math.round(Math.random()*100)};
-               var randomColorFactor = function(){ return Math.round(Math.random()*255)};
-
                var doughnutData = [
                                {
-                                       value: randomScalingFactor(),
+                                       value: 300,
                                        color:"#F7464A",
                                        highlight: "#FF5A5E",
                                        label: "Red"
                                },
                                {
-                                       value: randomScalingFactor(),
+                                       value: 50,
                                        color: "#46BFBD",
                                        highlight: "#5AD3D1",
                                        label: "Green"
                                },
                                {
-                                       value: randomScalingFactor(),
+                                       value: 100,
                                        color: "#FDB45C",
                                        highlight: "#FFC870",
                                        label: "Yellow"
                                },
                                {
-                                       value: randomScalingFactor(),
+                                       value: 40,
                                        color: "#949FB1",
                                        highlight: "#A8B3C5",
                                        label: "Grey"
                                },
                                {
-                                       value: randomScalingFactor(),
+                                       value: 120,
                                        color: "#4D5360",
                                        highlight: "#616774",
                                        label: "Dark Grey"
                                window.myDoughnut = new Chart(ctx).Doughnut(doughnutData, {responsive : true});
                        };
 
-                       $('#randomizeData').click(function(){
-                               $.each(doughnutData, function(i, piece){
-                                       doughnutData[i].value = randomScalingFactor();
-                               doughnutData[i].color = 'rgba(' + randomColorFactor() + ',' + randomColorFactor() + ',' + randomColorFactor() + ',.7)';
-                               });
-                       window.myDoughnut.update();
-                   });
-
 
 
        </script>
index 32ce412418540e0a201e9d4fa6bddbb1c3239606..ccd0dad9653bef4b0a35cc222b7bd18274900381 100644 (file)
@@ -3,7 +3,6 @@
        <head>
                <title>Line Chart</title>
                <script src="../Chart.js"></script>
-               <script src="http://cdnjs.cloudflare.com/ajax/libs/jquery/2.1.3/jquery.min.js"></script>
        </head>
        <body>
                <div style="width:30%">
                                <canvas id="canvas" height="450" width="600"></canvas>
                        </div>
                </div>
-               <button id="randomizeData">Randomize Data</button>
 
 
        <script>
                var randomScalingFactor = function(){ return Math.round(Math.random()*100)};
-               var randomColorFactor = function(){ return Math.round(Math.random()*255)};
-
                var lineChartData = {
                        labels : ["January","February","March","April","May","June","July"],
                        datasets : [
                });
        }
 
-       $('#randomizeData').click(function(){
-       lineChartData.datasets[0].fillColor = 'rgba(' + randomColorFactor() + ',' + randomColorFactor() + ',' + randomColorFactor() + ',.3)';
-       lineChartData.datasets[0].data = [randomScalingFactor(),randomScalingFactor(),randomScalingFactor(),randomScalingFactor(),randomScalingFactor(),randomScalingFactor(),randomScalingFactor()];
-
-       lineChartData.datasets[1].fillColor = 'rgba(' + randomColorFactor() + ',' + randomColorFactor() + ',' + randomColorFactor() + ',.3)';
-       lineChartData.datasets[1].data = [randomScalingFactor(),randomScalingFactor(),randomScalingFactor(),randomScalingFactor(),randomScalingFactor(),randomScalingFactor(),randomScalingFactor()];
-
-       window.myLine.update();
-    });
-
 
        </script>
        </body>
index ca5aecde03ab3f5f439013f9ec5075a15dec29bf..255a499761889567d7dcaeec0aee987f86a95355 100644 (file)
@@ -3,46 +3,42 @@
        <head>
                <title>Pie Chart</title>
                <script src="../Chart.js"></script>
-               <script src="http://cdnjs.cloudflare.com/ajax/libs/jquery/2.1.3/jquery.min.js"></script>
        </head>
        <body>
                <div id="canvas-holder">
                        <canvas id="chart-area" width="300" height="300"/>
                </div>
-               <button id="randomizeData">Randomize Data</button>
 
-       <script>
 
-               var randomScalingFactor = function(){ return Math.round(Math.random()*100)};
-               var randomColorFactor = function(){ return Math.round(Math.random()*255)};
+       <script>
 
                var pieData = [
                                {
-                                       value: randomScalingFactor(),
+                                       value: 300,
                                        color:"#F7464A",
                                        highlight: "#FF5A5E",
                                        label: "Red"
                                },
                                {
-                                       value: randomScalingFactor(),
+                                       value: 50,
                                        color: "#46BFBD",
                                        highlight: "#5AD3D1",
                                        label: "Green"
                                },
                                {
-                                       value: randomScalingFactor(),
+                                       value: 100,
                                        color: "#FDB45C",
                                        highlight: "#FFC870",
                                        label: "Yellow"
                                },
                                {
-                                       value: randomScalingFactor(),
+                                       value: 40,
                                        color: "#949FB1",
                                        highlight: "#A8B3C5",
                                        label: "Grey"
                                },
                                {
-                                       value: randomScalingFactor(),
+                                       value: 120,
                                        color: "#4D5360",
                                        highlight: "#616774",
                                        label: "Dark Grey"
                                window.myPie = new Chart(ctx).Pie(pieData);
                        };
 
-                       $('#randomizeData').click(function(){
-                               $.each(pieData, function(i, piece){
-                                       pieData[i].value = randomScalingFactor();
-                               pieData[i].color = 'rgba(' + randomColorFactor() + ',' + randomColorFactor() + ',' + randomColorFactor() + ',.7)';
-                               });
-                       window.myPie.update();
-                   });
-
 
 
        </script>
index 0828c1020344ee87fd3303e7f3be6130aec6087c..d3d3f01b47e0c8751a309a848a52e7661cef22eb 100644 (file)
@@ -3,47 +3,42 @@
        <head>
                <title>Polar Area Chart</title>
                <script src="../Chart.js"></script>
-               <script src="http://cdnjs.cloudflare.com/ajax/libs/jquery/2.1.3/jquery.min.js"></script>
        </head>
        <body>
                <div id="canvas-holder" style="width:30%">
                        <canvas id="chart-area" width="300" height="300"/>
                </div>
-               <button id="randomizeData">Randomize Data</button>
 
 
        <script>
 
-               var randomScalingFactor = function(){ return Math.round(Math.random()*100)};
-               var randomColorFactor = function(){ return Math.round(Math.random()*255)};
-
                var polarData = [
                                {
-                                       value: randomScalingFactor(),
+                                       value: 300,
                                        color:"#F7464A",
                                        highlight: "#FF5A5E",
                                        label: "Red"
                                },
                                {
-                                       value: randomScalingFactor(),
+                                       value: 50,
                                        color: "#46BFBD",
                                        highlight: "#5AD3D1",
                                        label: "Green"
                                },
                                {
-                                       value: randomScalingFactor(),
+                                       value: 100,
                                        color: "#FDB45C",
                                        highlight: "#FFC870",
                                        label: "Yellow"
                                },
                                {
-                                       value: randomScalingFactor(),
+                                       value: 40,
                                        color: "#949FB1",
                                        highlight: "#A8B3C5",
                                        label: "Grey"
                                },
                                {
-                                       value: randomScalingFactor(),
+                                       value: 120,
                                        color: "#4D5360",
                                        highlight: "#616774",
                                        label: "Dark Grey"
                                });
                        };
 
-                       $('#randomizeData').click(function(){
-                               $.each(polarData, function(i, piece){
-                                       polarData[i].value = randomScalingFactor();
-                               polarData[i].color = 'rgba(' + randomColorFactor() + ',' + randomColorFactor() + ',' + randomColorFactor() + ',.7)';
-                               });
-                       window.myPolarArea.update();
-                   });
-
 
 
        </script>
index d260797847aa3060a61d50bdb453746c59f29974..6a04f879c09089bd325f8f138f347d73471f7ed5 100644 (file)
@@ -3,20 +3,19 @@
        <head>
                <title>Radar Chart</title>
                <script src="../Chart.js"></script>
-               <script src="http://cdnjs.cloudflare.com/ajax/libs/jquery/2.1.3/jquery.min.js"></script>
+               <meta name = "viewport" content = "initial-scale = 1, user-scalable = no">
+               <style>
+                       canvas{
+                       }
+               </style>
        </head>
        <body>
                <div style="width:30%">
                        <canvas id="canvas" height="450" width="450"></canvas>
                </div>
-               <button id="randomizeData">Randomize Data</button>
 
 
        <script>
-
-       var randomScalingFactor = function(){ return Math.round(Math.random()*100)};
-       var randomColorFactor = function(){ return Math.round(Math.random()*255)};
-
        var radarChartData = {
                labels: ["Eating", "Drinking", "Sleeping", "Designing", "Coding", "Cycling", "Running"],
                datasets: [
@@ -28,7 +27,7 @@
                                pointStrokeColor: "#fff",
                                pointHighlightFill: "#fff",
                                pointHighlightStroke: "rgba(220,220,220,1)",
-                               data : [randomScalingFactor(),randomScalingFactor(),randomScalingFactor(),randomScalingFactor(),randomScalingFactor(),randomScalingFactor(),randomScalingFactor()]
+                               data: [65,59,90,81,56,55,40]
                        },
                        {
                                label: "My Second dataset",
@@ -38,7 +37,7 @@
                                pointStrokeColor: "#fff",
                                pointHighlightFill: "#fff",
                                pointHighlightStroke: "rgba(151,187,205,1)",
-                               data : [randomScalingFactor(),randomScalingFactor(),randomScalingFactor(),randomScalingFactor(),randomScalingFactor(),randomScalingFactor(),randomScalingFactor()]
+                               data: [28,48,40,19,96,27,100]
                        }
                ]
        };
                });
        }
 
-       $('#randomizeData').click(function(){
-       radarChartData.datasets[0].fillColor = 'rgba(' + randomColorFactor() + ',' + randomColorFactor() + ',' + randomColorFactor() + ',.3)';
-       radarChartData.datasets[0].data = [randomScalingFactor(),randomScalingFactor(),randomScalingFactor(),randomScalingFactor(),randomScalingFactor(),randomScalingFactor(),randomScalingFactor()];
-
-       radarChartData.datasets[1].fillColor = 'rgba(' + randomColorFactor() + ',' + randomColorFactor() + ',' + randomColorFactor() + ',.3)';
-       radarChartData.datasets[1].data = [randomScalingFactor(),randomScalingFactor(),randomScalingFactor(),randomScalingFactor(),randomScalingFactor(),randomScalingFactor(),randomScalingFactor()];
-
-       window.myRadar.update();
-    });
-
        </script>
        </body>
 </html>
index 8127d520aaf4fe58455855ee8979381c4c218f2c..a3496841fc5825a1a5f3688212196e522ec81caf 100644 (file)
@@ -48,9 +48,6 @@
                defaults : defaultConfig,
                initialize:  function(data){
 
-                       // Save data as a source for updating of values & methods
-                       this.data = data;
-
                        //Expose options as a scope variable here so we can access it in the ScaleClass
                        var options = this.options;
 
                        this.render();
                },
                update : function(){
-                       //Iterate through each of the datasets, and build this into a property of the chart
-                       helpers.each(this.data.datasets,function(dataset,datasetIndex){
-
-                               helpers.extend(this.datasets[datasetIndex], {
-                                       label : dataset.label || null,
-                                       fillColor : dataset.fillColor,
-                                       strokeColor : dataset.strokeColor,
-                               });
-
-                               helpers.each(dataset.data,function(dataPoint,index){
-                                       helpers.extend(this.datasets[datasetIndex].bars[index], {
-                                               value : dataPoint,
-                                               label : this.data.labels[index],
-                                               datasetLabel: dataset.label,
-                                               strokeColor : dataset.strokeColor,
-                                               fillColor : dataset.fillColor,
-                                               highlightFill : dataset.highlightFill || dataset.fillColor,
-                                               highlightStroke : dataset.highlightStroke || dataset.strokeColor
-                                       });
-                               },this);
-
-                       },this);
-
                        this.scale.update();
                        // Reset any highlight colours before updating.
                        helpers.each(this.activeElements, function(activeElement){
index 90f3d0265fd1199d0eea25754640dfc44a076279..364b5e51de8af609299bf7cc48d22d18017c8249 100644 (file)
@@ -45,9 +45,6 @@
                //Config is automatically merged by the core of Chart.js, and is available at this.options
                initialize:  function(data){
 
-                       // Save data as a source for updating of values & methods
-                       this.data = data;
-
                        //Declare segments as a static property to prevent inheriting across the Chart type prototype
                        this.segments = [];
                        this.outerRadius = (helpers.min([this.chart.width,this.chart.height]) - this.options.segmentStrokeWidth/2)/2;
                        },this);
                },
                update : function(){
-
-                       // Map new data to data points
-                       if(this.data.length == this.segments.length){
-                               helpers.each(this.data, function(segment, i){
-                                       helpers.extend(this.segments[i], {
-                                               value : segment.value,
-                                               fillColor : segment.color,
-                                               highlightColor : segment.highlight || segment.color,
-                                               showStroke : this.options.segmentShowStroke,
-                                               strokeWidth : this.options.segmentStrokeWidth,
-                                               strokeColor : this.options.segmentStrokeColor,
-                                               label : segment.label
-                                       });
-                               }, this);
-                       } else{
-                               // Data size changed without properly inserting, just redraw the chart
-                               this.initialize(this.data);
-                       }
-
                        this.calculateTotal(this.segments);
 
                        // Reset any highlight colours before updating.
index bc88488a950cdba043e2d1565181e921e900a1b7..dbc974cbb73dfd0c6be2016b03008327798d6428 100644 (file)
@@ -62,9 +62,6 @@
                name: "Line",
                defaults : defaultConfig,
                initialize:  function(data){
-                       // Save data as a source for updating of values & methods
-                       this.data = data;
-
                        //Declare the extension of the default point, to cater for the options passed in to the constructor
                        this.PointClass = Chart.Point.extend({
                                offsetGridLines : this.options.offsetGridLines,
                        this.render();
                },
                update : function(){
-                       //Iterate through each of the datasets, and build this into a property of the chart
-                       helpers.each(this.data.datasets,function(dataset,datasetIndex){
-
-                               helpers.extend(this.datasets[datasetIndex], {
-                                       label : dataset.label || null,
-                                       fillColor : dataset.fillColor,
-                                       strokeColor : dataset.strokeColor,
-                                       pointColor : dataset.pointColor,
-                                       pointStrokeColor : dataset.pointStrokeColor,
-                               });
-
-                               helpers.each(dataset.data,function(dataPoint,index){
-                                       helpers.extend(this.datasets[datasetIndex].points[index], {
-                                               value : dataPoint,
-                                               label : this.data.labels[index],
-                                               datasetLabel: dataset.label,
-                                               strokeColor : dataset.pointStrokeColor,
-                                               fillColor : dataset.pointColor,
-                                               highlightFill : dataset.pointHighlightFill || dataset.pointColor,
-                                               highlightStroke : dataset.pointHighlightStroke || dataset.pointStrokeColor
-                                       });
-                               },this);
-
-                       },this);
-
                        this.scale.update();
                        // Reset any highlight colours before updating.
                        helpers.each(this.activeElements, function(activeElement){
index c220a6f4b6784bb6e931b294d9ee3c723de16a90..63b7a1a954ffbc7fc2668bc83ae4f9142ad1bf47 100644 (file)
@@ -59,9 +59,6 @@
                //Initialize is fired when the chart is initialized - Data is passed in as a parameter
                //Config is automatically merged by the core of Chart.js, and is available at this.options
                initialize:  function(data){
-                       // Save data as a source for updating of values & methods
-                       this.data = data;
-
                        this.segments = [];
                        //Declare segment class as a chart instance specific class, so it can share props for this instance
                        this.SegmentArc = Chart.Arc.extend({
 
                },
                update : function(){
-
-                       // Map new data to data points
-                       if(this.data.length == this.segments.length){
-                               helpers.each(this.data, function(segment, i){
-                                       helpers.extend(this.segments[i], {
-                                               fillColor: segment.color,
-                                               highlightColor: segment.highlight || segment.color,
-                                               label: segment.label,
-                                               value: segment.value,
-                                       });
-                               },this);
-                       } else{
-                               // Data size changed without properly inserting, just redraw the chart
-                               this.initialize(this.data);
-                       }
-
                        this.calculateTotal(this.segments);
 
                        helpers.each(this.segments,function(segment){
index b033c8bb2f82752ee266c8470e7989e3dbca9810..0c63761abd0f82943caee9876fdd55c16cd40550 100644 (file)
@@ -67,9 +67,6 @@
                },
 
                initialize: function(data){
-                       // Save data as a source for updating of values & methods
-                       this.data = data;
-
                        this.PointClass = Chart.Point.extend({
                                strokeWidth : this.options.pointDotStrokeWidth,
                                radius : this.options.pointDotRadius,
                        this.update();
                },
                update : function(){
-                       //Iterate through each of the datasets, and build this into a property of the chart
-                       helpers.each(this.data.datasets,function(dataset,datasetIndex){
-
-                               helpers.extend(this.datasets[datasetIndex], {
-                                       label : dataset.label || null,
-                                       fillColor : dataset.fillColor,
-                                       strokeColor : dataset.strokeColor,
-                                       pointColor : dataset.pointColor,
-                                       pointStrokeColor : dataset.pointStrokeColor,
-                               });
-
-                               helpers.each(dataset.data,function(dataPoint,index){
-                                       helpers.extend(this.datasets[datasetIndex].points[index], {
-                                               value : dataPoint,
-                                               label : this.data.labels[index],
-                                               datasetLabel: dataset.label,
-                                               strokeColor : dataset.pointStrokeColor,
-                                               fillColor : dataset.pointColor,
-                                               highlightFill : dataset.pointHighlightFill || dataset.pointColor,
-                                               highlightStroke : dataset.pointHighlightStroke || dataset.pointStrokeColor
-                                       });
-                               },this);
-
-                       },this);
-                       
                        this.eachPoints(function(point){
                                point.save();
                        });