Merge pull request #1172 from harvesthq/firefox-width-disparity

Use the better supported offsetWidth property to get a fields width
harvesthq · May 14, 2013 · 0058167 · 0058167
2 parents c306562 + 5dc8419
commit 0058167
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 18 deletions.
diff --git a/chosen/chosen.jquery.js b/chosen/chosen.jquery.js
@@ -293,12 +293,11 @@ Copyright (c) 2011 by Harvest
     };
 
     AbstractChosen.prototype.container_width = function() {
-      var width;
       if (this.options.width != null) {
         return this.options.width;
+      } else {
+        return "" + this.form_field.offsetWidth + "px";
       }
-      width = window.getComputedStyle != null ? parseFloat(window.getComputedStyle(this.form_field).getPropertyValue('width')) : (typeof jQuery !== "undefined" && jQuery !== null) && (this.form_field_jq != null) ? this.form_field_jq.outerWidth() : this.form_field.getWidth();
-      return width + "px";
     };
 
     AbstractChosen.browser_is_supported = function() {

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
@@ -293,12 +293,11 @@ Copyright (c) 2011 by Harvest
     };
 
     AbstractChosen.prototype.container_width = function() {
-      var width;
       if (this.options.width != null) {
         return this.options.width;
+      } else {
+        return "" + this.form_field.offsetWidth + "px";
       }
-      width = window.getComputedStyle != null ? parseFloat(window.getComputedStyle(this.form_field).getPropertyValue('width')) : (typeof jQuery !== "undefined" && jQuery !== null) && (this.form_field_jq != null) ? this.form_field_jq.outerWidth() : this.form_field.getWidth();
-      return width + "px";
     };
 
     AbstractChosen.browser_is_supported = function() {

diff --git a/chosen/chosen.proto.min.js b/chosen/chosen.proto.min.js
diff --git a/coffee/lib/abstract-chosen.coffee b/coffee/lib/abstract-chosen.coffee
@@ -131,16 +131,7 @@ class AbstractChosen
     newchar = chars.substring rand, rand+1
 
   container_width: ->
-    return @options.width if @options.width?
-
-    width = if window.getComputedStyle?
-      parseFloat window.getComputedStyle(@form_field).getPropertyValue('width')
-    else if jQuery? and @form_field_jq?
-      @form_field_jq.outerWidth()
-    else
-      @form_field.getWidth()
-
-    width + "px"
+    return if @options.width? then @options.width else "#{@form_field.offsetWidth}px"
 
   # class methods and variables ============================================================