effective_datatables 2.12.0 → 2.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 672de368787ac30eb2d42e8bfcde9cba24a61e98
-  data.tar.gz: fe3cb8fd151b68c9da65fd9f81fb949fa86caead
+  metadata.gz: 1ee8baa7089062ecb467e023374ca3ee9f8b5e9b
+  data.tar.gz: 54808a68095bbdc2950e329be40a0f195d81a44b
 SHA512:
-  metadata.gz: bdffcce1d831eb5d0e27a5242257647a717d043ee64799d264b3bbdd31b6b460c70a05b9ad14294fa981bfd9dd78c44310e1cf153428e25dc943656d2bfb945e
-  data.tar.gz: b831ffff4efc8d3b154e4d93747d155d90037b874293ffb786d3c2daaf8fcc4ed750ef59ff11da74dddc3ea2757d3af35c71b013210b035825b5942db91bde33
+  metadata.gz: ac424c688acd674ee6edd14791d1ffab0258c91e4f06e1b4dde28bb1d8bb4f73f62e4f74b681bd8b9afcbe623cedd7ff930df382d5ec1525a58eb4e1dc63142b
+  data.tar.gz: abb7e1eeadd0153336d59501cbc241964c1d6815ea6393f4e2c862f8c89cef9be1bba8d4499bc5e0fc9d3ff703e5934227e44ab0daf889d1c91359c5a6d0a4fe

data/app/assets/javascripts/effective_datatables/charts.js.coffee

@@ -1,4 +1,16 @@
 initializeCharts = ->
+  $charts = $('.effective-datatables-chart:not(.initialized)')
+  return unless $charts.length > 0
+
+  if typeof(google) != 'undefined' && typeof(google.charts) != 'undefined'
+    google.charts.load('current', { packages: ['corechart'] })
+    google.charts.setOnLoadCallback(renderCharts)
+
+  $charts.addClass('initialized')
+
+renderCharts = ->
+  return if (typeof(google) == 'undefined' || typeof(google.visualization) == 'undefined')
+
   $('.effective-datatables-chart').each ->
     $chart = $(this)
 
@@ -6,9 +18,8 @@ initializeCharts = ->
     type = $chart.data('type') || 'BarChart'
     options = $chart.data('options') || {}
 
-    if google
-      chart = new google.visualization[type](document.getElementById($chart.attr('id')))
-      chart.draw(google.visualization.arrayToDataTable(data), options)
+    chart = new google.visualization[type](document.getElementById($chart.attr('id')))
+    chart.draw(google.visualization.arrayToDataTable(data), options)
 
 $ -> initializeCharts()
 $(document).on 'page:change', -> initializeCharts()

data/app/assets/javascripts/effective_datatables/initialize.js.coffee

@@ -119,10 +119,11 @@ initializeDataTables = ->
           $.each values, (col, value) => $row.children().eq(col).html(value)
 
     drawCharts = ($table, charts) ->
-      $.each charts, (name, data) =>
-        $(".effective-datatables-chart[data-name='#{name}']").each (_, obj) =>
-          chart = new google.visualization[data['type']](obj)
-          chart.draw(google.visualization.arrayToDataTable(data['data']), data['options'])
+      if typeof(google) != 'undefined' && typeof(google.visualization) != 'undefined'
+        $.each charts, (name, data) =>
+          $(".effective-datatables-chart[data-name='#{name}']").each (_, obj) =>
+            chart = new google.visualization[data['type']](obj)
+            chart.draw(google.visualization.arrayToDataTable(data['data']), data['options'])
 
     # Appends the filter html, stored in the column definitions, into each column header
     initializeFilters = (api) ->

data/app/assets/stylesheets/effective_datatables/{_overrides.scss.erb → _overrides.scss}

@@ -1,16 +1,16 @@
-// Use asset_data_uri to prevent 3 additional GET requests for icons
+// Use asset-data-url to prevent 3 additional GET requests for icons
 table.dataTable thead .sorting {
-  background-image: url(<%= asset_data_uri('dataTables/sort_both.png') %>);
+  background-image: asset-data-url('dataTables/sort_both.png');
   background-position: 100% 70%;
 }
 
 table.dataTable thead .sorting_asc {
-  background-image: url(<%= asset_data_uri('dataTables/sort_asc.png') %>);
+  background-image: asset-data-url('dataTables/sort_asc.png');
   background-position: 100% 70%;
 }
 
 table.dataTable thead .sorting_desc {
-  background-image: url(<%= asset_data_uri('dataTables/sort_desc.png') %>);
+  background-image: asset-data-url('dataTables/sort_desc.png');
   background-position: 100% 70%;
 }
 
@@ -37,11 +37,6 @@ table.dataTable thead tr th {
   .form-group { margin-bottom: 0px; font-weight: normal; }
 }
 
-table.dataTable td ul {
-  list-style: none;
-  padding-left: 0;
-}
-
 // Sorting disabled
 table.dataTable.sort-hidden thead .sorting { background-image: none; }
 table.dataTable.sort-hidden thead .sorting_asc { background-image: none; }

data/app/helpers/effective_datatables_helper.rb

@@ -58,9 +58,7 @@ module EffectiveDatatablesHelper
     datatable.view ||= self
 
     unless @effective_datatables_chart_javascript_rendered
-      concat javascript_include_tag('https://www.google.com/jsapi')
-      concat javascript_tag("if(google && google.visualization === undefined) { google.load('visualization', '1', {packages:#{EffectiveDatatables.google_chart_packages}}); }")
-
+      concat javascript_include_tag('https://www.gstatic.com/charts/loader.js', data: { 'turbolinks-track' => :reload, 'turbolinks-eval' => false })
       @effective_datatables_chart_javascript_rendered = true
     end
 

data/app/models/effective/effective_datatable/ajax.rb

@@ -49,7 +49,7 @@ module Effective
         @display_entries ||= begin
           entries = (@default_entries.presence || EffectiveDatatables.default_entries)
           entries = -1 if entries.to_s.downcase == 'all'
-          [10, 25, 50, 100, 250, 1000, -1].include?(entries) ? entries : 25
+          [5, 10, 25, 50, 100, 250, 1000, -1].include?(entries) ? entries : 25
         end
       end
 

data/lib/effective_datatables/version.rb

@@ -1,3 +1,3 @@
 module EffectiveDatatables
-  VERSION = '2.12.0'.freeze
+  VERSION = '2.12.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_datatables
 version: !ruby/object:Gem::Version
-  version: 2.12.0
+  version: 2.12.1
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-07 00:00:00.000000000 Z
+date: 2017-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -133,7 +133,7 @@ files:
 - app/assets/stylesheets/dataTables/dataTables.bootstrap.css
 - app/assets/stylesheets/dataTables/responsive/responsive.bootstrap.css
 - app/assets/stylesheets/effective_datatables.scss
-- app/assets/stylesheets/effective_datatables/_overrides.scss.erb
+- app/assets/stylesheets/effective_datatables/_overrides.scss
 - app/assets/stylesheets/effective_datatables/_scopes.scss
 - app/controllers/effective/datatables_controller.rb
 - app/helpers/effective_datatables_controller_helper.rb