Merge remote-tracking branch 'origin/fix-cutoff-placeholder-text'

harvesthq · Sep 5, 2017 · b200fa4 · b200fa4
2 parents 497c427 + c697408
commit b200fa4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/coffee/chosen.jquery.coffee b/coffee/chosen.jquery.coffee
@@ -500,9 +500,8 @@ class Chosen extends AbstractChosen
     width = div.width() + 25
     div.remove()
 
-    container_width = @container.outerWidth()
-
-    width = Math.min(container_width - 10, width)
+    if @container.is(':visible')
+      width = Math.min(@container.outerWidth() - 10, width)
 
     @search_field.width(width)
 

diff --git a/coffee/chosen.proto.coffee b/coffee/chosen.proto.coffee
@@ -499,9 +499,8 @@ class @Chosen extends AbstractChosen
     width = div.measure('width') + 25
     div.remove()
 
-    container_width = @container.getWidth()
-
-    width = Math.min(container_width - 10, width)
+    if container_width = @container.getWidth()
+      width = Math.min(container_width - 10, width)
 
     @search_field.setStyle(width: width + 'px')