chartkickm 3.0.4 → 3.0.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/{chartkick → chartkickm}/engine.rb +1 -1
- data/lib/{chartkick → chartkickm}/helper.rb +4 -4
- data/lib/chartkickm/version.rb +3 -0
- data/lib/{chartkick.rb → chartkickm.rb} +5 -5
- data/vendor/assets/javascripts/{chartkick.js → chartkickm.js} +12 -12
- metadata +7 -7
- data/lib/chartkick/version.rb +0 -3
- /data/lib/{chartkick → chartkickm}/sinatra.rb +0 -0
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 4e475144f41c43195d230db9cbe4aab53dc10dad
|
4
|
+
data.tar.gz: 137688853ea9ef1b115ff5bc9955f6547a98cfe0
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: d1199c92cfebecd8d1002d4bae33a0fb7dd1329b5dfa8a92ae184c19bc1016d1f77d21b5440da3b24ed8fb85410459db12aea28532d0ac286a1fd4eb59809659
|
7
|
+
data.tar.gz: 4b376b250175e298e4e2d520de9f738e6154ce326a315fa166d1f113e7a1e077a685ded75ca6b0add437ab2146fdfa9618a5d28207cffe8069b784dd77f42463
|
@@ -1,7 +1,7 @@
|
|
1
1
|
require "json"
|
2
2
|
require "erb"
|
3
3
|
|
4
|
-
module
|
4
|
+
module Chartkickm
|
5
5
|
module Helper
|
6
6
|
def line_chart(data_source, **options)
|
7
7
|
chartkick_chart "LineChart", data_source, options
|
@@ -39,13 +39,13 @@ module Chartkick
|
|
39
39
|
|
40
40
|
def chartkick_chart(klass, data_source, **options)
|
41
41
|
@chartkick_chart_id ||= 0
|
42
|
-
options = chartkick_deep_merge(
|
42
|
+
options = chartkick_deep_merge(Chartkickm.options, options)
|
43
43
|
element_id = options.delete(:id) || "chart-#{@chartkick_chart_id += 1}"
|
44
44
|
height = options.delete(:height) || "300px"
|
45
45
|
width = options.delete(:width) || "100%"
|
46
46
|
defer = !!options.delete(:defer)
|
47
47
|
# content_for: nil must override default
|
48
|
-
content_for = options.key?(:content_for) ? options.delete(:content_for) :
|
48
|
+
content_for = options.key?(:content_for) ? options.delete(:content_for) : Chartkickm.content_for
|
49
49
|
|
50
50
|
nonce = options.delete(:nonce)
|
51
51
|
if nonce == true
|
@@ -63,7 +63,7 @@ module Chartkick
|
|
63
63
|
|
64
64
|
html = (options.delete(:html) || %(<div id="%{id}" style="height: %{height}; width: %{width}; text-align: center; color: #999; line-height: %{height}; font-size: 14px; font-family: 'Lucida Grande', 'Lucida Sans Unicode', Verdana, Arial, Helvetica, sans-serif;">Loading...</div>)) % {id: ERB::Util.html_escape(element_id), height: ERB::Util.html_escape(height), width: ERB::Util.html_escape(width)}
|
65
65
|
|
66
|
-
createjs = "new
|
66
|
+
createjs = "new Chartkickm.#{klass}(#{element_id.to_json}, #{data_source.respond_to?(:chart_json) ? data_source.chart_json : data_source.to_json}, #{options.to_json});"
|
67
67
|
if defer
|
68
68
|
js = <<JS
|
69
69
|
<script type="text/javascript"#{nonce_html}>
|
@@ -1,9 +1,9 @@
|
|
1
|
-
require "
|
2
|
-
require "
|
1
|
+
require "chartkickm/helper"
|
2
|
+
require "chartkickm/version"
|
3
3
|
|
4
4
|
# integrations
|
5
|
-
require "
|
6
|
-
require "
|
5
|
+
require "chartkickm/engine" if defined?(Rails)
|
6
|
+
require "chartkickm/sinatra" if defined?(Sinatra)
|
7
7
|
|
8
8
|
if defined?(ActiveSupport.on_load)
|
9
9
|
ActiveSupport.on_load(:action_view) do
|
@@ -11,7 +11,7 @@ if defined?(ActiveSupport.on_load)
|
|
11
11
|
end
|
12
12
|
end
|
13
13
|
|
14
|
-
module
|
14
|
+
module Chartkickm
|
15
15
|
class << self
|
16
16
|
attr_accessor :content_for
|
17
17
|
attr_accessor :options
|
@@ -1,7 +1,7 @@
|
|
1
1
|
/*
|
2
|
-
*
|
2
|
+
* Chartkickm.js
|
3
3
|
* Create beautiful charts with one line of JavaScript
|
4
|
-
* https://github.com/ankane/
|
4
|
+
* https://github.com/ankane/chartkickm.js
|
5
5
|
* v3.0.2
|
6
6
|
* MIT License
|
7
7
|
*/
|
@@ -9,7 +9,7 @@
|
|
9
9
|
(function (global, factory) {
|
10
10
|
typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
|
11
11
|
typeof define === 'function' && define.amd ? define(factory) :
|
12
|
-
(global.
|
12
|
+
(global.Chartkickm = factory());
|
13
13
|
}(this, (function () { 'use strict';
|
14
14
|
|
15
15
|
function isArray(variable) {
|
@@ -1897,10 +1897,10 @@
|
|
1897
1897
|
}
|
1898
1898
|
}
|
1899
1899
|
this.element = element;
|
1900
|
-
this.options = merge(
|
1900
|
+
this.options = merge(Chartkickm.options, options || {});
|
1901
1901
|
this.dataSource = dataSource;
|
1902
1902
|
|
1903
|
-
|
1903
|
+
Chartkickm.charts[element.id] = this;
|
1904
1904
|
|
1905
1905
|
fetchDataSource(this, dataSource);
|
1906
1906
|
|
@@ -2026,7 +2026,7 @@
|
|
2026
2026
|
|
2027
2027
|
Chart.prototype.__updateOptions = function __updateOptions (options) {
|
2028
2028
|
var updateRefresh = options.refresh && options.refresh !== this.options.refresh;
|
2029
|
-
this.options = merge(
|
2029
|
+
this.options = merge(Chartkickm.options, options);
|
2030
2030
|
if (updateRefresh) {
|
2031
2031
|
this.stopRefresh();
|
2032
2032
|
this.startRefresh();
|
@@ -2227,7 +2227,7 @@
|
|
2227
2227
|
return Timeline;
|
2228
2228
|
}(Chart));
|
2229
2229
|
|
2230
|
-
var
|
2230
|
+
var Chartkickm = {
|
2231
2231
|
LineChart: LineChart,
|
2232
2232
|
PieChart: PieChart,
|
2233
2233
|
ColumnChart: ColumnChart,
|
@@ -2246,12 +2246,12 @@
|
|
2246
2246
|
}
|
2247
2247
|
},
|
2248
2248
|
setDefaultOptions: function (opts) {
|
2249
|
-
|
2249
|
+
Chartkickm.options = opts;
|
2250
2250
|
},
|
2251
2251
|
eachChart: function (callback) {
|
2252
|
-
for (var chartId in
|
2253
|
-
if (
|
2254
|
-
callback(
|
2252
|
+
for (var chartId in Chartkickm.charts) {
|
2253
|
+
if (Chartkickm.charts.hasOwnProperty(chartId)) {
|
2254
|
+
callback(Chartkickm.charts[chartId]);
|
2255
2255
|
}
|
2256
2256
|
}
|
2257
2257
|
},
|
@@ -2261,6 +2261,6 @@
|
|
2261
2261
|
addAdapter: addAdapter
|
2262
2262
|
};
|
2263
2263
|
|
2264
|
-
return
|
2264
|
+
return Chartkickm;
|
2265
2265
|
|
2266
2266
|
})));
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: chartkickm
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 3.0.
|
4
|
+
version: 3.0.5
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Andrew Kane
|
@@ -62,13 +62,13 @@ files:
|
|
62
62
|
- CONTRIBUTING.md
|
63
63
|
- LICENSE.txt
|
64
64
|
- README.md
|
65
|
-
- lib/
|
66
|
-
- lib/
|
67
|
-
- lib/
|
68
|
-
- lib/
|
69
|
-
- lib/
|
65
|
+
- lib/chartkickm.rb
|
66
|
+
- lib/chartkickm/engine.rb
|
67
|
+
- lib/chartkickm/helper.rb
|
68
|
+
- lib/chartkickm/sinatra.rb
|
69
|
+
- lib/chartkickm/version.rb
|
70
70
|
- vendor/assets/javascripts/Chart.bundle.js
|
71
|
-
- vendor/assets/javascripts/
|
71
|
+
- vendor/assets/javascripts/chartkickm.js
|
72
72
|
homepage: https://chartkick.com
|
73
73
|
licenses:
|
74
74
|
- MIT
|
data/lib/chartkick/version.rb
DELETED
File without changes
|