Ticket #1572: 1572.patch

fckeditor.cfc

@@ -112 +112 @@
         hint="Create a textarea field for non-compatible browsers."
 >
         <cfset var result = "" />
+        <cfset var sWidthCSS = "" />
+        <cfset var sHeightCSS = "" />
 
         <cfscript>
-        // append unit "px" for numeric width and/or height values
-        if( isNumeric( this.width ) )
-                this.width = this.width & "px";
-        if( isNumeric( this.height ) )
-                this.height = this.height & "px";
-        </cfscript>
+        if( Find( "%", this.width ) gt 0)
+                sWidthCSS = this.width;
+        else
+                sWidthCSS = this.width & "px";
 
-        <cfscript>
-        result = result & "<textarea name=""#this.instanceName#"" rows=""4"" cols=""40"" style=""WIDTH: #this.width#; HEIGHT: #this.height#"">#HTMLEditFormat(this.value)#</textarea>" & chr(13) & chr(10);
+        if( Find( "%", this.width ) gt 0)
+                sHeightCSS = this.height;
+        else
+                sHeightCSS = this.height & "px";
+
+        result = "<textarea name=""#this.instanceName#"" rows=""4"" cols=""40"" style=""width: #sWidthCSS#; height: #sHeightCSS#"">#HTMLEditFormat(this.value)#</textarea>" & chr(13) & chr(10);
         </cfscript>
         <cfreturn result />
 </cffunction>