chartkick 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 00b03d10b24d6e36edf3061bdd594b83b831776f
-  data.tar.gz: eb2175cda000c9ed560f9b28dc08fd3eb9fd5b19
+  metadata.gz: f267372477ee8ee07e58cfd1d8aa238f46852804
+  data.tar.gz: 9d72a752e72eb9cbc2cbdc5b9a78864f1d889e5b
 SHA512:
-  metadata.gz: 133267fc6a6a015495905656bac3be481ad205ed6aa81a5b7bdd68523617b798a72f3e2aac5f62834f62382c63d0462a28f1b1b934239db955cf6abfbd5f3999
-  data.tar.gz: c7ebf3c44d41a69f099e5a46cd81f21ae501b99c7a5660d4e3a082ef87f01d7cbc9efd7fe393a8f1499b85458197ce4d76d2d1b7b52b9084bcebe4f3be96d718
+  metadata.gz: 3dded5fa96105623a3e52cfc18c6ad73cca64698583388da68df0bf30a2239f0c382c724ffd2a95acdae2207c5bb5db357c8cf8cba54aba88e37a5475efe2fe5
+  data.tar.gz: a71a15aa62707face8f1a3f84ee826e923ba6f6a8f59582e00d921daf0e9fda4930405b0ec214cdd20f3a1a1e9bb2f4e4115db793e65cfad5f537b2d284c0adc

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 1.3.1
+
+- Fixed blank screen bug
+- Fixed language support
+
 ## 1.3.0
 
 - Added timelines

data/README.md

@@ -51,7 +51,11 @@ Geo chart
 Timeline
 
 ```erb
-<%= timeline [["Washington", "1789-04-29", "1797-03-03"], ["Adams", "1797-03-03", "1801-03-03"]] %>
+<%= timeline [
+  ["Washington", "1789-04-29", "1797-03-03"],
+  ["Adams", "1797-03-03", "1801-03-03"],
+  ["Jefferson", "1801-03-03", "1809-03-03"]
+] %>
 ```
 
 Multiple series

data/app/assets/javascripts/chartkick.js

@@ -11,6 +11,7 @@
 (function (window) {
   'use strict';
 
+  var config = window.Chartkick || {};
   var Chartkick, ISO8601_PATTERN, DECIMAL_SEPARATOR, adapters = [];
 
   // helpers
@@ -403,11 +404,11 @@
       var loaded = {};
       var callbacks = [];
 
-      var runCallbacks = function() {
+      var runCallbacks = function () {
         var cb, call;
         for (var i = 0; i < callbacks.length; i++) {
           cb = callbacks[i];
-          call = (cb.pack == "corechart" && isFunction(google.visualization.LineChart)) || (cb.pack == "timeline" && isFunction(google.visualization.Timeline))
+          call = google.visualization && ((cb.pack == "corechart" && google.visualization.LineChart) || (cb.pack == "timeline" && google.visualization.Timeline))
           if (call) {
             cb.callback();
             callbacks.splice(i, 1);
@@ -416,8 +417,6 @@
         }
       };
 
-      google.setOnLoadCallback(runCallbacks);
-
       var waitForLoaded = function (pack, callback) {
         if (!callback) {
           callback = pack;
@@ -430,7 +429,16 @@
           runCallbacks();
         } else {
           loaded[pack] = true;
-          google.load("visualization", "1.0", {"packages": [pack]});
+
+          // https://groups.google.com/forum/#!topic/google-visualization-api/fMKJcyA2yyI
+          var loadOptions = {
+            packages: [pack],
+            callback: runCallbacks
+          };
+          if (config.language) {
+            loadOptions.language = config.language;
+          }
+          google.load("visualization", "1", loadOptions);
         }
       };
 

data/lib/chartkick/version.rb

@@ -1,3 +1,3 @@
 module Chartkick
-  VERSION = "1.3.0"
+  VERSION = "1.3.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chartkick
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-29 00:00:00.000000000 Z
+date: 2014-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler