0.8.9

jtblin · Mar 12, 2016 · 523332e · 523332e
1 parent 171d8c9
commit 523332e
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 11 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "angular-chart.js",
-  "version": "0.8.8",
+  "version": "0.8.9",
   "main": [
     "./dist/angular-chart.js",
     "./dist/angular-chart.css"

diff --git a/dist/angular-chart.js b/dist/angular-chart.js
@@ -186,11 +186,11 @@
             }
             if (! scope.data || ! scope.data.length) return;
             scope.getColour = typeof scope.getColour === 'function' ? scope.getColour : getRandomColour;
-            scope.colours = getColours(type, scope);
+            var colours = getColours(type, scope);
             var cvs = elem[0], ctx = cvs.getContext('2d');
             var data = Array.isArray(scope.data[0]) ?
-              getDataSets(scope.labels, scope.data, scope.series || [], scope.colours) :
-              getData(scope.labels, scope.data, scope.colours);
+              getDataSets(scope.labels, scope.data, scope.series || [], colours) :
+              getData(scope.labels, scope.data, colours);
             var options = angular.extend({}, ChartJs.getOptions(type), scope.options);
             chart = new ChartJs.Chart(ctx)[type](data, options);
             scope.$emit('create', chart);
@@ -245,13 +245,18 @@
     }
 
     function getColours (type, scope) {
+      var notEnoughColours = false;
       var colours = angular.copy(scope.colours ||
         ChartJs.getOptions(type).colours ||
         Chart.defaults.global.colours
       );
       while (colours.length < scope.data.length) {
         colours.push(scope.getColour());
+        notEnoughColours = true;
       }
+      // mutate colours in this case as we don't want
+      // the colours to change on each refresh
+      if (notEnoughColours) scope.colours = colours;
       return colours.map(convertColour);
     }
 

diff --git a/dist/angular-chart.js.tar.gz b/dist/angular-chart.js.tar.gz
diff --git a/dist/angular-chart.min.css b/dist/angular-chart.min.css
diff --git a/dist/angular-chart.min.css.map b/dist/angular-chart.min.css.map
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
@@ -62,7 +62,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>(0.8.8)</small>
+            <i class="fa fa-download"></i> Download <small>(0.8.9)</small>
           </a>
         </p>
       </div>

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

diff --git a/test/fixtures/coverage.js b/test/fixtures/coverage.js