Merge pull request #2717 from koenpunt/unbind-label-click

unbind label click
harvesthq · Oct 11, 2016 · f2fe103 · f2fe103
2 parents 5285c15 + 435dd2d
commit f2fe103
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/coffee/chosen.jquery.coffee b/coffee/chosen.jquery.coffee
@@ -104,7 +104,9 @@ class Chosen extends AbstractChosen
       @container.bind 'click.chosen', (evt) -> evt.preventDefault(); return # gobble click of anchor
 
   destroy: ->
-    $(@container[0].ownerDocument).unbind "click.chosen", @click_test_action
+    $(@container[0].ownerDocument).unbind 'click.chosen', @click_test_action
+    @form_field_label.unbind 'click.chosen' if @form_field_label.length > 0
+
     if @search_field[0].tabIndex
       @form_field_jq[0].tabIndex = @search_field[0].tabIndex
 

diff --git a/coffee/chosen.proto.coffee b/coffee/chosen.proto.coffee
@@ -88,7 +88,9 @@ class @Chosen extends AbstractChosen
   destroy: ->
     @container.ownerDocument.stopObserving "click", @click_test_action
 
-    @form_field.stopObserving()
+    for event in ['chosen:updated', 'chosen:activate', 'chosen:open', 'chosen:close']
+      @form_field.stopObserving(event)
+
     @container.stopObserving()
     @search_results.stopObserving()
     @search_field.stopObserving()