fix double error message bug

Jobvite · Jan 2, 2012 · 8216cce · 8216cce
1 parent d905205
commit 8216cce
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 11 deletions.
diff --git a/lib/ajax-chosen.js b/lib/ajax-chosen.js
@@ -1,9 +1,11 @@
 
-  /*
-  ajax-chosen
-  A complement to the jQuery library Chosen that adds ajax autocomplete
-  https://github.com/bicouy0/ajax-chosen
-  */
+/*
+ajax-chosen
+A complement to the jQuery library Chosen that adds ajax autocomplete
+https://github.com/bicouy0/ajax-chosen
+*/
+
+(function() {
 
   (function($) {
     return $.fn.ajaxChosen = function(options, callback) {
@@ -27,8 +29,8 @@
       select = this;
       this.chosen(defaultedOptions.chosenOptions);
       return this.next('.chzn-container').find(inputSelector).bind('keyup', function(e) {
-        var search;
-        var _this = this;
+        var search,
+          _this = this;
         if (this.previousSearch) clearTimeout(this.previousSearch);
         search = function() {
           var clearSearchingLabel, currentOptions, field, prevVal, response, val, _ref;
@@ -69,6 +71,9 @@
               var $currentOpt, newOption, presenceInNewOptions;
               $currentOpt = $(currentOpt);
               if ($currentOpt.attr('selected') && multiple) return;
+              if ($currentOpt.attr('value') === '' && $currentOpt.html() === '' && !multiple) {
+                return;
+              }
               presenceInNewOptions = (function() {
                 var _j, _len2, _results;
                 _results = [];
@@ -130,3 +135,5 @@
       });
     };
   })(jQuery);
+
+}).call(this);
diff --git a/lib/ajax-chosen.min.js b/lib/ajax-chosen.min.js
diff --git a/src/ajax-chosen.coffee b/src/ajax-chosen.coffee
@@ -129,6 +129,7 @@ https://github.com/bicouy0/ajax-chosen
               do (currentOpt) -> 
                 $currentOpt = $(currentOpt)
                 return if $currentOpt.attr('selected') and multiple
+                return if $currentOpt.attr('value') is '' and $currentOpt.html() is ''  and !multiple #the deselect feature requires an empty entry
                 presenceInNewOptions = (newOption for newOption in newOptions when newOption.attr('value') is $currentOpt.attr('value'))
                 if presenceInNewOptions.length is 0
                   $currentOpt.remove()