chartjs-ror 2.1.3 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 15873e55290aeff9ab7a1158c453c812bd1ddf74
-  data.tar.gz: 438ac9bf94d00dbe2f6e13f4b028d4a1a77f6dcb
+  metadata.gz: 1305eb04d1021aef24382d5abd858e7d7e1bf6cc
+  data.tar.gz: dead45fff2f7983a0b633ae2b701e9096af037d7
 SHA512:
-  metadata.gz: 1ab60fe252736290e22baf456dde201ae9fda3f6a682aa316d9c4823f23f8f6a6499dba07d4819ac2831eb9c555b74588218026dc8b9fd962dbda5fbad9bd453
-  data.tar.gz: 07b15fda6fb63a3a3d6a5692dbcb9e4cceefbac044f97e43348d07a52e47aeb3d5ad0caa66e03a5e93d52777ee74e28fc0746fbc95ac76253564e6c0d09de555
+  metadata.gz: 2bb3b65298f372dd4bebd06bd5129f17e017b0ea5751b1928cfa8aadff630300db31a6bbb24880afe3350efe02744d84cb4d902f86affee65b03dff7700bf215
+  data.tar.gz: 8227ca71cdab84e8a8d28ebc49f564109d82f63aad66444e6903f39f5ced067ad81e4cdffbb38be813dce3bd24941d80a4d7c52202a9b242a7063b1297dfbaf3

data/README.md

@@ -3,7 +3,6 @@
 Simplifies using [Chart.js][] in Rails views.
 
 * All of Chart.js's features via one line of Ruby.
-* Renders charts on page load rather than DOMContentReady ([reason][browsersupport]).
 * Animates unless you have Modernizr and it doesn't detect canvas support ([reason][browsersupport]).  You can manually override this.
 * Optional alternative abscissa scale calculations (see [Chart.js#132][calculations]).
 * Optional utility method for filling in gaps in integer series.
@@ -11,7 +10,7 @@ Simplifies using [Chart.js][] in Rails views.
 
 ## Current Chart.js version
 
-This gem includes [Chart.js v1.0.1](https://github.com/nnnick/Chart.js/tree/v1.0.1).
+This gem includes [Chart.js v1.0.2](https://github.com/nnnick/Chart.js/tree/v1.0.2).
 
 
 ## Installation
@@ -165,13 +164,16 @@ You can put anything in the `options` hash that Chart.js recognises.  It also su
       legendHolder.innerHTML = legend;
       canvas.parentNode.insertBefore(legendHolder.firstChild, canvas.nextSibling);
     };
-    if (window.addEventListener) {
-      window.addEventListener("load", initChart, false);
-      document.addEventListener("page:load", initChart, false);
+    if (typeof Chart !== "undefined" && Chart !== null) {
+      initChart();
     }
-    else if (window.attachEvent) {
-      window.attachEvent("onload", initChart);
-      document.attachEvent("page:load", initChart);
+    else {
+      if (window.addEventListener) {
+        window.addEventListener("load", initChart, false);
+      }
+      else if (window.attachEvent) {
+        window.attachEvent("onload", initChart);
+      }
     }
   })();
 </script>

data/lib/chartjs/version.rb

@@ -1,3 +1,3 @@
 module Chartjs
-  VERSION = "2.1.3"
+  VERSION = "2.2.0"
 end

data/vendor/assets/javascripts/Chart.js

@@ -1,7 +1,7 @@
 /*!
  * Chart.js
  * http://chartjs.org/
- * Version: 1.0.1
+ * Version: 1.0.2
  *
  * Copyright 2015 Nick Downie
  * Released under the MIT license
@@ -25,6 +25,25 @@
 		this.ctx = context;
 
 		//Variables global to the chart
+		var computeDimension = function(element,dimension)
+		{
+			if (element['offset'+dimension])
+			{
+				return element['offset'+dimension];
+			}
+			else
+			{
+				return document.defaultView.getComputedStyle(element).getPropertyValue(dimension);
+			}
+		}
+
+		var width = this.width = computeDimension(context.canvas,'Width');
+		var height = this.height = computeDimension(context.canvas,'Height');
+
+		// Firefox requires this to work correctly
+		context.canvas.width  = width;
+		context.canvas.height = height;
+
 		var width = this.width = context.canvas.width;
 		var height = this.height = context.canvas.height;
 		this.aspectRatio = this.width / this.height;
@@ -825,7 +844,7 @@
 		},
 		stop : function(){
 			// Stops any current animation loop occuring
-			helpers.cancelAnimFrame.call(root, this.animationFrame);
+			cancelAnimFrame(this.animationFrame);
 			return this;
 		},
 		resize : function(callback){
@@ -1368,7 +1387,6 @@
 			var halfHeight = this.height/2;
 
 			//Check to ensure the height will fit on the canvas
-			//The three is to buffer form the very
 			if (this.y - halfHeight < 0 ){
 				this.y = halfHeight;
 			} else if (this.y + halfHeight > this.chart.height){
@@ -1575,7 +1593,7 @@
 			var isRotated = (this.xLabelRotation > 0),
 				// innerWidth = (this.offsetGridLines) ? this.width - offsetLeft - this.padding : this.width - (offsetLeft + halfLabelWidth * 2) - this.padding,
 				innerWidth = this.width - (this.xScalePaddingLeft + this.xScalePaddingRight),
-				valueWidth = innerWidth/(this.valuesCount - ((this.offsetGridLines) ? 0 : 1)),
+				valueWidth = innerWidth/Math.max((this.valuesCount - ((this.offsetGridLines) ? 0 : 1)), 1),
 				valueOffset = (valueWidth * index) + this.xScalePaddingLeft;
 
 			if (this.offsetGridLines){
@@ -2416,12 +2434,12 @@
 			}
 		},
 		calculateCircumference : function(value){
-			return (Math.PI*2)*(value / this.total);
+			return (Math.PI*2)*(Math.abs(value) / this.total);
 		},
 		calculateTotal : function(data){
 			this.total = 0;
 			helpers.each(data,function(segment){
-				this.total += segment.value;
+				this.total += Math.abs(segment.value);
 			},this);
 		},
 		update : function(){
@@ -3061,6 +3079,8 @@
 			helpers.each(this.segments,function(segment){
 				segment.save();
 			});
+
+			this.reflow();
 			this.render();
 		},
 		reflow : function(){

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chartjs-ror
 version: !ruby/object:Gem::Version
-  version: 2.1.3
+  version: 2.2.0
 platform: ruby
 authors:
 - Andy Stewart