magic_grid 0.10.3 → 0.10.4

data/lib/assets/javascripts/magic_grid.js

@@ -32,7 +32,7 @@ $(function () {
     // Micro-plugin for collecting all the listener and search inputs
     $.fn.getGridParams = $.fn.getGridParams || function (extras) {
         var listeners = this.data("listeners"),
-            params = $.extend({}, {'magic_grid_id' : this.attr('id')}, extras || {}),
+            params = $.extend({}, this.find("thead").data("params"), {'magic_grid_id' : this.attr('id')}, extras || {}),
             $input, param_key, listened_id;
         for (listened_id in listeners) {
             param_key = listeners[listened_id];
@@ -95,14 +95,11 @@ $(function () {
                     current = $input.data("current"),
                     value = $input.val(),
                     length = value.length,
-                    url = base_url,
+                    base_url = base_url.split("?", 2)[0],
                     relevant = is_manual || (value != current && (length >= minLength || length == 0)),
-                    pos = $input.getCursor();
+                    pos = $input.getCursor(),
+                    url = base_url + '?' + $.param($grid.getGridParams());
                 clearTimeout(timer);
-                if (! /\?/.test(url)) {
-                    url += '?';
-                }
-                url += $.param($grid.getGridParams());
                 if (relevant) {
                     $grid.trigger("magic_grid:loading");
                     if ($grid.data("remote")) {
@@ -129,10 +126,13 @@ $(function () {
     $(".magic_grid[data-listeners]").each( function () {
         var $grid = $(this),
             listeners = $grid.data("listeners"),
-            grid_id = this.id
-            base_url = $grid.data("current"),
+            grid_id = this.id,
             handler = function (change) {
-                var url = base_url + "?" + $.param($grid.getGridParams());
+                if (! $("#"+change.data.field).hasClass("ready")) {
+                    return;
+                }
+                var base_url = $grid.data("current").split("?", 2)[0];
+                var url = base_url + '?' + $.param($grid.getGridParams());
                 $grid.trigger("magic_grid:loading");
                 if ($grid.data("remote")) {
                     $grid.load(url + ' #' + grid_id + " > *", function () {
@@ -143,13 +143,10 @@ $(function () {
                 }
             };
         for (var k in listeners) {
-            if ($("#" + k).hasClass("ready")) {
-                $("#" + k).on("change", {"field": listeners[k]}, handler);
-            } else {
-                $("#" + k).on("ready", {"field": listeners[k]}, function (ready) {
-                    $(this).on("change", ready.data, handler);
-                });
-            }
+            $("#" + k).on("change", {"field": listeners[k]}, handler);
+            $("#" + k).on("ready", function (ready) {
+                $(this).addClass("ready");
+            });
         }
     });
 

data/lib/magic_grid/version.rb

@@ -1,3 +1,3 @@
 module MagicGrid
-  VERSION = "0.10.3"
+  VERSION = "0.10.4"
 end

data/spec/helpers_spec.rb

@@ -20,6 +20,7 @@ describe MagicGrid::Helpers do
       v.stub(:request) { request }
     }
   }
+  let(:view_renderer) { controller }
 
   describe "#normalize_magic" do
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: magic_grid
 version: !ruby/object:Gem::Version
-  version: 0.10.3
+  version: 0.10.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-09 00:00:00.000000000 Z
+date: 2012-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -208,7 +208,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3603937317512539474
+      hash: 591195015863992118
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -217,7 +217,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3603937317512539474
+      hash: 591195015863992118
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23