flashgrid-ext 2.2.0 → 2.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 51599e11b68a7eb4f5e0ab8c15833f79b4d3ac91
-  data.tar.gz: b5d7e5d6b8c0cf3cb8e6d43de69f01c4275d21f0
+  metadata.gz: dc8a1562a0f9ca9b276bd7bef00f80e9d5a2531e
+  data.tar.gz: 13c4541874fa7f0485f119607e712edce102d9ce
 SHA512:
-  metadata.gz: 9b3457406ff51c0f2723bd94342c65254bcc565bb726ad85ebcaea0a97c66929f3e642858dae24ab37d13bc57cb05030e02320e9c2916002974946fc38e58b06
-  data.tar.gz: 905f684cd553fa25eb38ad116b545007e3581b1b142bc07187e39d5c5101dcbfb33578737e991704606520100b4622b2459d335680034c4dc20dac2e38a70a86
+  metadata.gz: ca8c0ef30b07bd35f87468b97cc56076962232c8c43cdc7e511d307fec60e09f46a78934f77d4694164d7bcdd3b44af6a5b3f6fd4479d061a70cc784d81c8b38
+  data.tar.gz: eef1e631a8cfbc71fd9b7fe18b0cdeacc3ce767fd016a100682ac55b1c39ff653cb1bc3ba68dcbfd1a345e1bcc674a7d0ac81576d9ee4a6866b934c67a94de80

data/lib/flashgrid/ext/version.rb

@@ -1,5 +1,5 @@
 module Flashgrid
   module Ext
-    VERSION = "2.2.0"
+    VERSION = "2.2.5"
   end
 end

data/vendor/assets/javascripts/chart.js

@@ -81,6 +81,9 @@
       // Boolean - whether or not the chart should be responsive and resize when the browser does.
       responsive: true,
 
+      // Boolean - whether to maintain the starting aspect ratio or not when responsive, if set to false, will take up entire container
+      maintainAspectRatio: true,
+
       // Boolean - Determines whether to draw tooltips on the canvas or not - attaches events to touchmove & mousemove
       showTooltips: true,
 
@@ -392,6 +395,12 @@
     //Templating methods
     //Javascript micro templating by John Resig - source at http://ejohn.org/blog/javascript-micro-templating/
     template = helpers.template = function(templateString, valuesObject){
+      // If templateString is function rather than string-template - call the function for valuesObject
+      if(templateString instanceof Function)
+      {
+        return templateString(valuesObject);
+      }
+
       var cache = {};
       function tmpl(str, data){
         // Figure out if we're getting a template, or if we need to
@@ -683,11 +692,17 @@
         removeEvent(chartInstance.chart.canvas, eventName, handler);
       });
     },
-    getMaximumSize = helpers.getMaximumSize = function(domNode){
+    getMaximumWidth = helpers.getMaximumWidth = function(domNode){
       var container = domNode.parentNode;
       // TODO = check cross browser stuff with this.
       return container.clientWidth;
     },
+    getMaximumHeight = helpers.getMaximumHeight = function(domNode){
+      var container = domNode.parentNode;
+      // TODO = check cross browser stuff with this.
+      return container.clientHeight;
+    },
+    getMaximumSize = helpers.getMaximumSize = helpers.getMaximumWidth, // legacy support
     retinaScale = helpers.retinaScale = function(chart){
       var ctx = chart.ctx,
         width = chart.canvas.width,
@@ -766,8 +781,8 @@
     resize : function(callback){
       this.stop();
       var canvas = this.chart.canvas,
-        newWidth = getMaximumSize(this.chart.canvas),
-        newHeight = newWidth / this.chart.aspectRatio;
+        newWidth = getMaximumWidth(this.chart.canvas),
+        newHeight = this.options.maintainAspectRatio ? newWidth / this.chart.aspectRatio : getMaximumHeight(this.chart.canvas);
 
       canvas.width = this.chart.width = newWidth;
       canvas.height =  this.chart.height = newHeight;
@@ -1878,6 +1893,7 @@
   };
 
 }).call(this);
+
 (function(){
   "use strict";
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flashgrid-ext
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.5
 platform: ruby
 authors:
 - Juan Gomez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-16 00:00:00.000000000 Z
+date: 2014-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -86,7 +86,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.3.0
+rubygems_version: 2.4.1
 signing_key: 
 specification_version: 4
 summary: Flashgrid Extensions