Bump to 1.0.0-alpha3 as forgot to build the assets previously

jtblin · Mar 27, 2016 · 3cfe7b2 · 3cfe7b2
1 parent 3a5dd4f
commit 3cfe7b2
Show file tree

Hide file tree

Showing 8 changed files with 57 additions and 23 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "angular-chart.js",
-  "version": "1.0.0-alpha2",
+  "version": "1.0.0-alpha3",
   "main": [
     "./dist/angular-chart.js"
   ],

diff --git a/dist/angular-chart.js b/dist/angular-chart.js
@@ -96,7 +96,8 @@
           chartSeries: '=?',
           chartColors: '=?',
           chartClick: '=?',
-          chartHover: '=?'
+          chartHover: '=?',
+          chartYAxes: '=?'
         },
         link: function (scope, elem/*, attrs */) {
           var chart;
@@ -106,7 +107,10 @@
           // Order of setting "watch" matter
 
           scope.$watch('chartData', function (newVal, oldVal) {
-            if (! newVal || ! newVal.length || (Array.isArray(newVal[0]) && ! newVal[0].length)) return;
+            if (! newVal || ! newVal.length || (Array.isArray(newVal[0]) && ! newVal[0].length)) {
+              destroyChart(chart, scope);
+              return;
+            }
             var chartType = type || scope.chartType;
             if (! chartType) return;
 
@@ -128,7 +132,7 @@
           });
 
           scope.$on('$destroy', function () {
-            if (chart) chart.destroy();
+            destroyChart(chart, scope);
           });
 
           function resetChart (newVal, oldVal) {
@@ -154,13 +158,14 @@
             var colors = getColors(type, scope);
             var cvs = elem[0], ctx = cvs.getContext('2d');
             var data = Array.isArray(scope.chartData[0]) ?
-              getDataSets(scope.chartLabels, scope.chartData, scope.chartSeries || [], colors) :
+              getDataSets(scope.chartLabels, scope.chartData, scope.chartSeries || [], colors, scope.chartYAxes) :
               getData(scope.chartLabels, scope.chartData, colors);
 
             var options = angular.extend({}, ChartJs.getOptions(type), scope.chartOptions);
             // Destroy old chart if it exists to avoid ghost charts issue
             // https://github.com/jtblin/angular-chart.js/issues/187
-            if (chart) chart.destroy();
+            destroyChart(chart, scope);
+
             chart = new ChartJs.Chart(ctx, {
               type: type,
               data: data,
@@ -199,7 +204,6 @@
           if (triggerOnlyOnChange === false || angular.equals(lastState, activePoints) === false) {
             lastState = activePoints;
             scope[action](activePoints, evt);
-            scope.$apply();
           }
         }
       };
@@ -265,14 +269,18 @@
       return [r, g, b];
     }
 
-    function getDataSets (labels, data, series, colors) {
+    function getDataSets (labels, data, series, colors, yaxis) {
       return {
         labels: labels,
         datasets: data.map(function (item, i) {
-          return angular.extend({}, colors[i], {
+          var dataset = angular.extend({}, colors[i], {
             label: series[i],
             data: item
           });
+          if (yaxis) {
+            dataset.yAxisID = 'y-axis-' + (i + 1);
+          }
+          return dataset;
         })
       };
     }
@@ -315,5 +323,11 @@
       var options = angular.extend({}, Chart.defaults.global, ChartJs.getOptions(type), scope.chartOptions);
       return options.responsive;
     }
+
+    function destroyChart(chart, scope) {
+      if(! chart) return;
+      chart.destroy();
+      scope.$emit('chart-destroy', chart);
+    }
   }
 }));
diff --git a/dist/angular-chart.js.tar.gz b/dist/angular-chart.js.tar.gz
diff --git a/dist/angular-chart.min.js b/dist/angular-chart.min.js
diff --git a/dist/angular-chart.min.js.map b/dist/angular-chart.min.js.map
diff --git a/examples/charts.html b/examples/charts.html
@@ -61,7 +61,7 @@ <h1>
         <p>
           <a class="btn btn-default btn-lg" href="https://github.com/jtblin/angular-chart"><i class="icon-github"></i>Code on Github</a>
           <a class="btn btn-success btn-lg" href="../dist/angular-chart.js.tar.gz" download="angular-chart.js.tar.gz">
-            <i class="fa fa-download"></i> Download <small>(1.0.0-alpha1)</small>
+            <i class="fa fa-download"></i> Download <small>(1.0.0-alpha3)</small>
           </a>
         </p>
       </div>
@@ -126,7 +126,7 @@ <h1>Directives</h1>
             <div class="panel-heading">Line Chart</div>
             <div class="panel-body">
               <canvas id="line" class="chart chart-line" chart-data="data" chart-labels="labels"
-                      chart-click="onClick" chart-hover="onHover" chart-series="series"></canvas>
+                      chart-click="onClick" chart-hover="onHover" chart-series="series" chart-options="options" chart-y-axes="multiAxis"></canvas>
             </div>
           </div>
         </div>
@@ -143,13 +143,14 @@ <h1>Directives</h1>
                   <li><code>chart-click</code> (optional): onclick event handler</li>
                   <li><code>chart-hover</code> (optional): onmousemove event handler</li>
                   <li><code>chart-colors</code> (default to global colors): colors for the chart</li>
+                  <li><code>chart-y-axes</code> (optional): if true add multiple axis, <strong>required:</strong> ids y-axis-{n} in the options (view Javascript)</li>
                 </ul>
               </div>
             </tab>
             <tab heading="Markup">
-              <pre><code data-language="html">&lt;canvas id=&quot;line&quot; class=&quot;chart chart-line&quot; chart-data=&quot;data&quot;
-  chart-labels=&quot;labels&quot; chart-series=&quot;series&quot;
-  chart-click=&quot;onClick&quot; &gt;
+            <pre><code data-language="html">&lt;canvas id=&quot;line&quot; class=&quot;chart chart-line&quot; chart-data=&quot;data&quot;
+chart-labels=&quot;labels&quot; chart-series=&quot;series&quot; chart-options=&quot;options&quot;
+chart-y-axes=&quot;true&quot; chart-click=&quot;onClick&quot;
 &lt;/canvas&gt; </code></pre>
             </tab>
             <tab heading="Javascript">
@@ -164,6 +165,24 @@ <h1>Directives</h1>
   $scope.onClick = function (points, evt) {
     console.log(points, evt);
   };
+  $scope.options = {
+    scales: {
+      yAxes: [
+        {
+          id: 'y-axis-1',
+          type: 'linear',
+          display: true,
+          position: 'left'
+        },
+        {
+          id: 'y-axis-2',
+          type: 'linear',
+          display: true,
+          position: 'right'
+        }
+      ]
+    }
+  };
 });
               </code></pre>
             </tab>
@@ -184,6 +203,7 @@ <h1>Directives</h1>
                   <li><code>chart-click</code> (optional): onclick event handler</li>
                   <li><code>chart-hover</code> (optional): onmousemove event handler</li>
                   <li><code>chart-colors</code> (default to global colors): colors for the chart</li>
+                  <li><code>chart-y-axes</code> (optional): if true add multiple axis, <strong>required:</strong>: ids y-axis-{n} in the options</li>
                 </ul>
               </div>
             </tab>

diff --git a/examples/charts.template.html b/examples/charts.template.html
@@ -169,16 +169,16 @@ <h1>Directives</h1>
     scales: {
       yAxes: [
         {
-          id: "y-axis-1",
-          type: "linear",
+          id: 'y-axis-1',
+          type: 'linear',
           display: true,
-          position: "left"
+          position: 'left'
         },
         {
-          id: "y-axis-2",
-          type: "linear",
+          id: 'y-axis-2',
+          type: 'linear',
           display: true,
-          position: "right"
+          position: 'right'
         }
       ]
     }

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "angular-chart.js",
-  "version": "1.0.0-alpha2",
+  "version": "1.0.0-alpha3",
   "description": "An angular.js wrapper for Chart.js",
   "main": "dist/angular-chart.js",
   "directories": {