Changeset 1868

Timestamp:

2008-04-02 07:58:55 (5 months ago)

Author:

wwalc

Message:

Fix for #1785: whitespaces removed inside a pre tag

Files:

• MediaWiki/trunk/plugins/mediawiki/fckplugin.js (modified) (6 diffs)

MediaWiki/trunk/plugins/mediawiki/fckplugin.js

@@ -97 +97 @@
                 var stringBuilder = new Array() ;
                 this._AppendNode( rootNode, stringBuilder, '' ) ;
-                return stringBuilder.join( '' ).Trim() ;
+                return stringBuilder.join( '' ).RTrim() ;
         },
 
@@ -509 +509 @@
                                                                 this._AppendChildNodes( htmlNode, stringBuilder, prefix ) ;
                                                                 this._inLSpace = false ;
-                                                                if ( stringBuilder[stringBuilder.length-2] == "\n" && stringBuilder[stringBuilder.length-1] == " " )
-                                                                        stringBuilder.pop() ;
-                                                                else
+                                                                if ( !stringBuilder[stringBuilder.length-1].EndsWith("\n") )
                                                                         stringBuilder.push( "\n" ) ;
                                                         }
@@ -526 +524 @@
                                                                 this._AppendChildNodes( htmlNode, stringBuilder, prefix ) ;
                                                                 this._inPre = false ;
+
                                                                 stringBuilder.push( '<\/' ) ;
                                                                 stringBuilder.push( sNodeName ) ;
-                                                                stringBuilder.push( '>' ) ;                                                             
+                                                                stringBuilder.push( '>' ) ;
                                                         }
                                                 
@@ -561 +560 @@
                                 if ( !parentIsSpecialTag ) 
                                 {
+                                        if ( FCKBrowserInfo.IsIE && this._inLSpace ) {
+                                                textValue = textValue.replace(/\r/, "\r ") ;
+                                        }
+                                        
                                         textValue = textValue.replace( /[\n\t]/g, ' ' ) ; 
         
@@ -566 +569 @@
                                         textValue = textValue.replace( /\u00A0/g, '&nbsp;' ) ;
 
-                                        if ( !htmlNode.previousSibling ||
-                                        ( stringBuilder.length > 0 && stringBuilder[ stringBuilder.length - 1 ].EndsWith( '\n' ) ) && !this._inLSpace )
+                                        if ( ( !htmlNode.previousSibling ||
+                                        ( stringBuilder.length > 0 && stringBuilder[ stringBuilder.length - 1 ].EndsWith( '\n' ) ) ) && !this._inLSpace && !this._inPre )
                                         {
                                                 textValue = textValue.LTrim() ;
                                         }
 
-                                        if ( !htmlNode.nextSibling && !this._inLSpace && (!htmlNode.parentNode || !htmlNode.parentNode.nextSibling))
+                                        if ( !htmlNode.nextSibling && !this._inLSpace && !this._inPre && (!htmlNode.parentNode || !htmlNode.parentNode.nextSibling))
                                                 textValue = textValue.RTrim() ;
 
-                                        textValue = textValue.replace( / {2,}/g, ' ' ) ;
+                                        if (!this._inLSpace && !this._inPre)
+                                                textValue = textValue.replace( / {2,}/g, ' ' ) ;
 
                                         if ( this._inLSpace && textValue.length == 1 && textValue.charCodeAt(0) == 13 )
@@ -583 +587 @@
                                 }
                                 else 
-                                {                                       
+                                {
                                         textValue = FCKTools.HTMLDecode(textValue).replace(/fckLR/g,'\r\n');
                                 }