1.0.0-alpha7

jtblin · Jun 18, 2016 · d58886f · d58886f
1 parent 132102d
commit d58886f
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 17 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "angular-chart.js",
-  "version": "1.0.0-alpha6",
+  "version": "1.0.0-alpha7",
   "main": [
     "./dist/angular-chart.js"
   ],

diff --git a/dist/angular-chart.js b/dist/angular-chart.js
@@ -18,6 +18,7 @@
   'use strict';
 
   Chart.defaults.global.multiTooltipTemplate = '<%if (datasetLabel){%><%=datasetLabel%>: <%}%><%= value %>';
+  Chart.defaults.global.tooltips.mode = 'label';
   Chart.defaults.global.elements.line.borderWidth = 2;
   Chart.defaults.global.elements.rectangle.borderWidth = 2;
   Chart.defaults.global.legend.display = false;
@@ -31,11 +32,11 @@
     '#4D5360'  // dark grey
   ];
 
-  var usingExcanvas = typeof window.G_vmlCanvasManager === 'object' &&
+  var useExcanvas = typeof window.G_vmlCanvasManager === 'object' &&
     window.G_vmlCanvasManager !== null &&
     typeof window.G_vmlCanvasManager.initElement === 'function';
 
-  if (usingExcanvas) Chart.defaults.global.animation = false;
+  if (useExcanvas) Chart.defaults.global.animation = false;
 
   return angular.module('chart.js', [])
     .provider('ChartJs', ChartJsProvider)
@@ -106,7 +107,7 @@
         link: function (scope, elem/*, attrs */) {
           var chart;
 
-          if (usingExcanvas) window.G_vmlCanvasManager.initElement(elem[0]);
+          if (useExcanvas) window.G_vmlCanvasManager.initElement(elem[0]);
 
           // Order of setting "watch" matter
 
@@ -139,6 +140,10 @@
             destroyChart(chart, scope);
           });
 
+          scope.$on('$resize', function () {
+            if (chart) chart.resize();
+          });
+
           function resetChart (newVal, oldVal) {
             if (isEmpty(newVal)) return;
             if (angular.equals(newVal, oldVal)) return;
@@ -242,11 +247,11 @@
     function getColor (color) {
       return {
         backgroundColor: rgba(color, 0.2),
-        borderColor: rgba(color, 1),
         pointBackgroundColor: rgba(color, 1),
+        pointHoverBackgroundColor: rgba(color, 0.8),
+        borderColor: rgba(color, 1),
         pointBorderColor: '#fff',
-        pointHoverBackgroundColor: '#fff',
-        pointHoverBorderColor: rgba(color, 0.8)
+        pointHoverBorderColor: rgba(color, 1)
       };
     }
 
@@ -255,12 +260,8 @@
     }
 
     function rgba (color, alpha) {
-      if (usingExcanvas) {
-        // rgba not supported by IE8
-        return 'rgb(' + color.join(',') + ')';
-      } else {
-        return 'rgba(' + color.concat(alpha).join(',') + ')';
-      }
+      // rgba not supported by IE8
+      return useExcanvas ? 'rgb(' + color.join(',') + ')' : 'rgba(' + color.concat(alpha).join(',') + ')';
     }
 
     // Credit: http://stackoverflow.com/a/11508164/1190235

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
@@ -94,7 +94,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-alpha6)</small>
+            <i class="fa fa-download"></i> Download <small>(1.0.0-alpha7)</small>
           </a>
         </p>
       </div>

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