Merge pull request #1149 from foohey/master

added "change" triggers on filtering select's
railsadminteam · May 24, 2012 · 8fe0e3e · 8fe0e3e
2 parents ff4aea2 + 2fb5b05
commit 8fe0e3e
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/app/assets/javascripts/rails_admin/ra.filtering-multiselect.js b/app/assets/javascripts/rails_admin/ra.filtering-multiselect.js
@@ -103,24 +103,28 @@
       this.addAll.click(function(e){
         widget._select($('option', widget.collection));
         e.preventDefault();
+        widget.selection.trigger('change');
       });
 
       /* Add to selection */
       this.add.click(function(e){
         widget._select($(':selected', widget.collection));
         e.preventDefault();
+        widget.selection.trigger('change');
       });
 
       /* Remove all from selection */
       this.removeAll.click(function(e){
         widget._deSelect($('option', widget.selection));
         e.preventDefault();
+        widget.selection.trigger('change');
       });
 
       /* Remove from selection */
       this.remove.click(function(e){
         widget._deSelect($(':selected', widget.selection));
         e.preventDefault();
+        widget.selection.trigger('change');
       });
 
       var timeout = null;

diff --git a/app/assets/javascripts/rails_admin/ra.filtering-select.js b/app/assets/javascripts/rails_admin/ra.filtering-select.js
@@ -52,6 +52,7 @@
           select: function(event, ui) {
             var option = $('<option value="' + ui.item.id + '" selected="selected">' + ui.item.value + '</option>');
             select.html(option);
+            select.trigger("change", ui.item.id);
             self._trigger("selected", event, {
               item: option
             });
@@ -79,6 +80,14 @@
             }
           }
         })
+        .keyup(function() {
+          /* Clear select options and trigger change if selected item is deleted */
+          if ($(this).val().length == 0) {
+            select.empty();
+            select.trigger("change");
+          }
+        })
+
       if(select.attr('placeholder'))
         input.attr('placeholder', select.attr('placeholder'))