jqgrid_rails 1.2.0 → 1.2.1

data/CHANGELOG.rdoc

@@ -1,3 +1,6 @@
+== v1.2.1
+* Auto select blank values in filter select boxes to combat Webkit ordering issues
+
 == v1.2.0
 * Forked to provide proper gem releases
 * Only load generator methods if appropriate

data/lib/jqgrid_rails/jqgrid.rb

@@ -16,6 +16,8 @@ module JqGridRails
     attr_accessor :table_id
     # Options used for links toolbar
     attr_reader :link_toolbar_options
+    # Detached javascript
+    attr_reader :detached_javascript
 
 
     # table_id:: DOM ID of table for grid to use
@@ -49,6 +51,13 @@ module JqGridRails
       end
       @local = []
       @output = ''
+      @detached_javascript = []
+    end
+
+    # js:: Javascript string
+    # Adds javascript to run on document ready
+    def add_javascript(js)
+      @detached_javascript << js
     end
     
     # name:: Name of column (Invoice)
@@ -158,23 +167,35 @@ module JqGridRails
 
     # Resizes grid after loading has completed to prevent blowing out container
     def fix_grid_width
-      js = "jQuery(#{convert_dom_id(@table_id)}).jqGrid('setGridWidth', jQuery(#{convert_dom_id(@table_id)} + '_holder').innerWidth(), true);"
-      if(@options[:load_complete])
-        @options[:load_complete] = RawJS.new(@options[:load_complete].to_s.sub(/^(\s*function.*?\{)/, "\\1#{js}"))
-      else
-        @options[:load_complete] = RawJS.new("function(){ #{js} return true; }")
-      end
+      insert_into_callback(
+        :load_complete,
+        "jQuery(#{convert_dom_id(@table_id)}).jqGrid('setGridWidth', jQuery(#{convert_dom_id(@table_id)} + '_holder').innerWidth(), true);"
+      )
+    end
+
+    # Auto selects blank drop down option to combat Chrome/webkit's unordered hashing
+    def filter_toolbar_autoselect_blanks
+      add_javascript(
+        "jQuery(#{convert_dom_id(@table_id)} + '_holder')" <<
+          ".find('th[role=\"columnheader\"]')" <<
+            ".find('option[value=\"\"]').each(" <<
+              'function(){' <<
+                "jQuery(this).attr('selected', true);" <<
+              '});'
+      )
     end
 
     # Builds out the jqGrid javascript and returns the string
     def build
       output = ''
       fix_grid_width
+      filter_toolbar_autoselect_blanks unless @options[:no_filter_toolbar_autoselect_blanks]
       @options[:datatype] = 'local' unless @local.blank?
       resizable = @options.delete(:resizable_grid)
       #############################################################
       load_multi_select_fix unless @options[:no_multi_select_fix] # TODO: Remove this when fixed in jqGrid
       #############################################################
+
       map_double_click
       map_single_click
       set_search_options
@@ -327,5 +348,16 @@ module JqGridRails
          }
        }).trigger('resize');"
     end
+
+    # key:: callback name
+    # js:: JS string
+    # Insert JS into callback leaving existing callback code intact
+    def insert_into_callback(key, js)
+      if(@options[key])
+        @options[key] = RawJS.new(@options[key].to_s.sub(/^(\s*function.*?\{)/, "\\1#{js}"))
+      else
+        @options[key] = RawJS.new("function(){ #{js} return true; }")
+      end
+    end
   end
 end

data/lib/jqgrid_rails/jqgrid_rails_view.rb

@@ -31,6 +31,9 @@ module JqGridRails
     def jq_grid(grid)
       output = jqgrid_html(grid)
       output << jqgrid_js(grid)
+      if grid.detached_javascript.present?
+        output << javascript_tag{ "jQuery(document).ready(function(){ #{grid.detached_javascript.join("\n")}});".html_safe }
+      end
       output.html_safe
     end
     alias_method :jqgrid, :jq_grid

data/lib/jqgrid_rails/version.rb

@@ -13,5 +13,5 @@ module JqGridRails
     end
   end
 
-  VERSION = Version.new('1.2.0')
+  VERSION = Version.new('1.2.1')
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: jqgrid_rails
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: 
   segments: 
   - 1
   - 2
-  - 0
-  version: 1.2.0
+  - 1
+  version: 1.2.1
 platform: ruby
 authors: 
 - Chris Roberts
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-23 00:00:00 -08:00
+date: 2012-02-29 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency