Changeset 1862

Timestamp:

2008-04-01 11:14:57 (4 months ago)

Author:

wwalc

Message:

Fix for #1003: improved lists parsing.

Files:

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

MediaWiki/trunk/plugins/mediawiki/fckplugin.js

@@ -234 +234 @@
                                                 case 'ol' :
                                                 case 'ul' :
-                                                        var isFirstLevel = !htmlNode.parentNode.nodeName.IEquals( 'ul', 'ol', 'li' ) ;
+                                                        var isFirstLevel = !htmlNode.parentNode.nodeName.IEquals( 'ul', 'ol', 'li', 'dl', 'dt', 'dd' ) ;
 
                                                         this._AppendChildNodes( htmlNode, stringBuilder, prefix ) ;
@@ -246 +246 @@
                                                 case 'li' :
 
-                                                        var listPrefix = '' ;
+                                                        if( stringBuilder.length > 1)
+                                                        {
+                                                                var sLastStr = stringBuilder[ stringBuilder.length - 1 ] ;
+                                                                if ( sLastStr != ";" && sLastStr != ":" && sLastStr != "#" && sLastStr != "*")
+                                                                        stringBuilder.push( '\n' + prefix ) ;
+                                                        }
+                                                        
                                                         var parent = htmlNode.parentNode ;
-
+                                                        var listType = "#" ;
+                                                        
                                                         while ( parent )
                                                         {
                                                                 if ( parent.nodeName.toLowerCase() == 'ul' )
-                                                                        listPrefix = '*' + listPrefix ;
+                                                                {
+                                                                        listType = "*" ;
+                                                                        break ;
+                                                                }
                                                                 else if ( parent.nodeName.toLowerCase() == 'ol' )
-                                                                        listPrefix = '#' + listPrefix ;
-                                                                else if ( parent.nodeName.toLowerCase() == 'dt' )
-                                                                        listPrefix = ';' + listPrefix ;
-                                                                else if ( parent.nodeName.toLowerCase() == 'dd' )
-                                                                        listPrefix = ':' + listPrefix ;
+                                                                {
+                                                                        listType = "#" ;
+                                                                        break ;
+                                                                }
                                                                 else if ( parent.nodeName.toLowerCase() != 'li' )
                                                                         break ;
@@ -264 +273 @@
                                                                 parent = parent.parentNode ;
                                                         }
-
-                                                        var sChildTag = '' ;
-                                                        
-                                                        if ( htmlNode.childNodes.length == 1 && htmlNode.childNodes[0].tagName )
-                                                                sChildTag = htmlNode.childNodes[0].tagName.toLowerCase();
-                                                        else if ( htmlNode.childNodes.length == 2 && htmlNode.childNodes[1].nodeType == 3 && htmlNode.childNodes[1].nodeValue == "\n")
-                                                                sChildTag = htmlNode.childNodes[0].tagName.toLowerCase();
-                                                        
-                                                        var sbLen = stringBuilder.length ;
-                                                        if (sChildTag != 'ul' && sChildTag != 'ol') 
-                                                        {
-                                                                if ( sbLen > 1 && stringBuilder[ sbLen - 1 ] != "*" && stringBuilder[ sbLen - 1 ] != "#") {
-                                                                        stringBuilder.push( '\n' ) ;
-                                                                }
-                                                                stringBuilder.push( listPrefix ) ;
-                                                                stringBuilder.push( ' ' ) ;
-                                                        }
-                                                        this._AppendChildNodes( htmlNode, stringBuilder, listPrefix ) ;
-
+                                                        
+                                                        stringBuilder.push( listType ) ;
+                                                        this._AppendChildNodes( htmlNode, stringBuilder, prefix + listType ) ;
+                                                        
                                                         break ;
 
@@ -316 +310 @@
                                                         
                                                 case 'dl' :
+                                                
                                                         this._AppendChildNodes( htmlNode, stringBuilder, prefix ) ;
-                                                        var isFirstLevel = !htmlNode.parentNode.nodeName.IEquals( 'ul', 'ol', 'li', 'dl', 'dd' ) ;
-                                                        if (isFirstLevel)
+                                                        var isFirstLevel = !htmlNode.parentNode.nodeName.IEquals( 'ul', 'ol', 'li', 'dl', 'dd', 'dt' ) ;
+                                                        if ( isFirstLevel )
                                                                 stringBuilder.push( '\n') ;
+                                                        
                                                         break ;
 
                                                 case 'dt' :
-                                                        if( stringBuilder.length > 1 && stringBuilder[ stringBuilder.length - 1 ] != ";" && stringBuilder[ stringBuilder.length - 1 ] != ":" )
-                                                        {
-                                                                stringBuilder.push( '\n' + prefix ) ;
+                                                
+                                                        if( stringBuilder.length > 1)
+                                                        {
+                                                                var sLastStr = stringBuilder[ stringBuilder.length - 1 ] ;
+                                                                if ( sLastStr != ";" && sLastStr != ":" && sLastStr != "#" && sLastStr != "*" )
+                                                                        stringBuilder.push( '\n' + prefix ) ;
                                                         }
                                                         stringBuilder.push( ';' ) ;
-                                                        this._AppendChildNodes( htmlNode, stringBuilder, prefix ) ;
+                                                        this._AppendChildNodes( htmlNode, stringBuilder, prefix + ";") ;
+                                                        
                                                         break ;
 
                                                 case 'dd' :
-                                                        if ( stringBuilder.length > 1 && stringBuilder[ stringBuilder.length - 1 ] != ":" )
-                                                        {
-                                                                stringBuilder.push( '\n' + prefix ) ;
+                                                
+                                                        if( stringBuilder.length > 1)
+                                                        {
+                                                                var sLastStr = stringBuilder[ stringBuilder.length - 1 ] ;
+                                                                if ( sLastStr != ";" && sLastStr != ":" && sLastStr != "#" && sLastStr != "*" )
+                                                                        stringBuilder.push( '\n' + prefix ) ;
                                                         }
                                                         stringBuilder.push( ':' ) ;
                                                         this._AppendChildNodes( htmlNode, stringBuilder, prefix + ":" ) ;
+                                                        
                                                         break ;