htmlarea: fix in FF - MDL-11242

The previous fix for IE left some problems in the FF side of
things because we were trying additions/substractions on
width once its had turned to a string of value + unit.

Do the math before we attach 'px' to it...

diff --git a/lib/editor/htmlarea/htmlarea.php b/lib/editor/htmlarea/htmlarea.php
index 0e682a3381c75756eca98c3207c64dbbbf2b5f14..562014587925cf45c06ac83b03124fc2f4c30995 100644 (file)
--- a/lib/editor/htmlarea/htmlarea.php
+++ b/lib/editor/htmlarea/htmlarea.php
@@ -808,13 +808,10 @@ HTMLArea.prototype.generate = function () {
     // width = Math.max(parseInt(width), 598);
 
     width = String(width);
-    if (width.match(/^\d+$/)) { // is this a pure int? if so, let it be in px
-        width=width+"px";
-    }
-
-    if (!HTMLArea.is_ie) {
+    if (width.match(/^\d+$/)) { // is this a pure int? if so, let it be in px, and remove 2px
         height -= 2;
-        width -= 2;
+        width  -= 2;
+        width=width+"px";
     }
 
     iframe.style.width = width;