wice_grid 3.6.0.pre1 → 3.6.0.pre2

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 CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: e2d67863c4c04cf42e55ef57f832f4de049094a9
4
- data.tar.gz: 3f68e7390b56385d51a397b4f8c262ad6d8ca2f9
3
+ metadata.gz: c5a6198777c04e4a7e84dd1001b45153e7f698be
4
+ data.tar.gz: 86c0e94d25fe56352b025dee328b2f4ac6a30810
5
5
  SHA512:
6
- metadata.gz: 5d6154aeede19e92e6ca4847984fbe44932652887fd8fa9dfc7566d9d6b693aa26b3012d30f077b7b1817ba6f05f6006b7ac0288890986422dc84cebfe1223cf
7
- data.tar.gz: d008ad82a090b98a7dd5c8e75f70ee57bedb16d18005f401eb4e56de57e02f01672a27d0470cd4636f22c1c1d259f8c2fa4fc56f041336f65569bc5a6f860db1
6
+ metadata.gz: f0cb441071b5824f8b5ac04b4985ae2b8c12476daf243175fcb42e0dda0bc2f02c54cedb1baac134c4134de012d5ce52e018ffdc443f66fdd5fe98da6fdcbe6a
7
+ data.tar.gz: 90683cf991b2f109be612ed02e80562a712ae17f5fc645d1cba4f90c6ca924d98206dec08fed28eb0bc46717d58bbc787e36c073f929c5bbefb57ae2aaab2e7b
@@ -506,13 +506,10 @@ module Wice
506
506
  grid.output_buffer << javascript_tag(%/ $(document).ready(function(){ \n/ +
507
507
  %$ if (typeof(WiceGridProcessor) == "undefined"){\n$ +
508
508
  %$ alert("wice_grid.js not loaded, WiceGrid cannot proceed!\\n" +\n$ +
509
- %( "Make sure that you have loaded wice_grid.js.\n" +
510
- ) +
511
- %( "Add line\n//= require wice_grid.js\n" +
512
- ) +
509
+ %( "Make sure that you have loaded wice_grid.js.\\n" + ) +
510
+ %( "Add line //= require wice_grid.js " + ) +
513
511
  %$ "to app/assets/javascripts/application.js")\n$ +
514
- %( }
515
- ) +
512
+ %( } ) +
516
513
  %$ }) $)
517
514
  end
518
515
 
@@ -23,6 +23,11 @@ require 'wice/columns/common_js_date_datetime_conditions_generator_mixin.rb'
23
23
  require 'wice/columns/common_rails_date_datetime_conditions_generator_mixin.rb'
24
24
  require 'kaminari.rb'
25
25
 
26
+ unless Kernel.const_defined?(:FontAwesome)
27
+ gem 'font-awesome-sass'
28
+ require 'font-awesome-sass.rb'
29
+ end
30
+
26
31
  ActionController::Base.send(:helper_method, :wice_grid_custom_filter_params)
27
32
 
28
33
  module Wice
@@ -41,6 +46,7 @@ module Wice
41
46
 
42
47
  # It is here only because of this: https://github.com/amatsuda/kaminari/pull/267
43
48
  require 'wice/kaminari_monkey_patching.rb'
49
+
44
50
  end
45
51
 
46
52
  class WiceGridEngine < ::Rails::Engine #:nodoc:
@@ -1,7 +1,7 @@
1
1
  # encoding: utf-8
2
2
  Gem::Specification.new do |s|
3
3
  s.name = 'wice_grid'
4
- s.version = '3.6.0.pre1'
4
+ s.version = '3.6.0.pre2'
5
5
  s.authors = ['Yuri Leikind']
6
6
  s.email = ['yuri.leikind@gmail.com']
7
7
  s.homepage = 'https://github.com/leikind/wice_grid'
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: wice_grid
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.6.0.pre1
4
+ version: 3.6.0.pre2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Yuri Leikind