Changeset 1861

Timestamp:

04/01/08 01:04:30 (5 years ago)

Author:

wwalc

Message:

Fix for #1469 (repeated *'s, :'s, and #'s for indenting).

File:

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

MediaWiki/trunk/plugins/mediawiki/fckplugin.js

@@ -246 +246 @@
                                                 case 'li' :
 
-                                                        if ( stringBuilder.length > 1 && stringBuilder[ stringBuilder.length - 1 ] != "*" && stringBuilder[ stringBuilder.length - 1 ] != "#") {
-                                                                stringBuilder.push( '\n' ) ;
-                                                        }
-
                                                         var listPrefix = '' ;
                                                         var parent = htmlNode.parentNode ;
@@ -269 +265 @@
                                                         }
 
-                                                        stringBuilder.push( listPrefix ) ;
-                                                        stringBuilder.push( ' ' ) ;
+                                                        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 ) ;