Merge pull request #1163 from harvesthq/clean-up-choices-click-method

Make choices_click() method more readable.
harvesthq · Apr 25, 2013 · 69030a5 · 69030a5
2 parents 1760a47 + bcd6f60
commit 69030a5
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 10 deletions.
diff --git a/chosen/chosen.jquery.js b/chosen/chosen.jquery.js
@@ -745,7 +745,7 @@ Copyright (c) 2011 by Harvest
 
     Chosen.prototype.choices_click = function(evt) {
       evt.preventDefault();
-      if (this.active_field && !($(evt.target).hasClass("search-choice" || $(evt.target).parents('.search-choice').first)) && !this.results_showing) {
+      if (!this.results_showing) {
         return this.results_show();
       }
     };

diff --git a/chosen/chosen.jquery.min.js b/chosen/chosen.jquery.min.js
diff --git a/chosen/chosen.proto.js b/chosen/chosen.proto.js
@@ -732,7 +732,7 @@ Copyright (c) 2011 by Harvest
 
     Chosen.prototype.choices_click = function(evt) {
       evt.preventDefault();
-      if (this.active_field && !(evt.target.hasClassName('search-choice') || evt.target.up('.search-choice')) && !this.results_showing) {
+      if (!this.results_showing) {
         return this.results_show();
       }
     };

diff --git a/chosen/chosen.proto.min.js b/chosen/chosen.proto.min.js
diff --git a/coffee/chosen.jquery.coffee b/coffee/chosen.jquery.coffee
@@ -297,11 +297,9 @@ class Chosen extends AbstractChosen
   search_results_mouseout: (evt) ->
     this.result_clear_highlight() if $(evt.target).hasClass "active-result" or $(evt.target).parents('.active-result').first()
 
-
   choices_click: (evt) ->
     evt.preventDefault()
-    if( @active_field and not($(evt.target).hasClass "search-choice" or $(evt.target).parents('.search-choice').first) and not @results_showing )
-      this.results_show()
+    this.results_show() unless @results_showing
 
   choice_build: (item) ->
     if @is_multiple and @max_selected_options <= @choices

diff --git a/coffee/chosen.proto.coffee b/coffee/chosen.proto.coffee
@@ -286,11 +286,9 @@ class Chosen extends AbstractChosen
   search_results_mouseout: (evt) ->
     this.result_clear_highlight() if evt.target.hasClassName('active-result') or evt.target.up('.active-result')
 
-
   choices_click: (evt) ->
     evt.preventDefault()
-    if( @active_field and not(evt.target.hasClassName('search-choice') or evt.target.up('.search-choice')) and not @results_showing )
-      this.results_show()
+    this.results_show() unless @results_showing
 
   choice_build: (item) ->
     if @is_multiple and @max_selected_options <= @choices