consider disabled fieldset for disabled state

fixes harvesthq#2389
koenpunt · Oct 2, 2016 · dcaac33 · dcaac33
1 parent 439a711
commit dcaac33
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 4 deletions.
diff --git a/coffee/chosen.jquery.coffee b/coffee/chosen.jquery.coffee
@@ -113,8 +113,16 @@ class Chosen extends AbstractChosen
     @form_field_jq.show()
 
   search_field_disabled: ->
-    @is_disabled = @form_field_jq[0].disabled
-    if(@is_disabled)
+    @is_disabled = @form_field.disabled || (=>
+      element = @form_field
+      disabled = false
+      while (element = element.parentElement) && element != element.ownerDocument
+        disabled = element.nodeName.toUpperCase() == 'FIELDSET' && element.disabled
+        break if disabled
+      disabled
+    )()
+
+    if @is_disabled
       @container.addClass 'chosen-disabled'
       @search_field[0].disabled = true
       @selected_item.unbind "focus.chosen", @activate_action if !@is_multiple

diff --git a/coffee/chosen.proto.coffee b/coffee/chosen.proto.coffee
@@ -108,8 +108,16 @@ class @Chosen extends AbstractChosen
     @form_field.show()
 
   search_field_disabled: ->
-    @is_disabled = @form_field.disabled
-    if(@is_disabled)
+    @is_disabled = @form_field.disabled || (=>
+      element = @form_field
+      disabled = false
+      while (element = element.parentElement) && element != element.ownerDocument
+        disabled = element.nodeName.toUpperCase() == 'FIELDSET' && element.disabled
+        break if disabled
+      disabled
+    )()
+
+    if @is_disabled
       @container.addClassName 'chosen-disabled'
       @search_field.disabled = true
       @selected_item.stopObserving "focus", @activate_action if !@is_multiple