Changeset 1823

Timestamp:

2008-03-27 17:37:14 (4 months ago)

Author:

wwalc

Message:

Fix for #1015 (Badly nested italic/bold markup).

Files:

• MediaWiki/trunk/plugins/mediawiki/fckplugin.js (modified) (1 diff)

MediaWiki/trunk/plugins/mediawiki/fckplugin.js

@@ -191 +191 @@
                                 if ( basicElement )
                                 {
+                                        var basic0 = basicElement[0];
+                                        var basic1 = basicElement[1];
+
                                         if ( ( basicElement[0] == "''" || basicElement[0] == "'''" ) && stringBuilder.length > 2 )
                                         {
                                                 var pr1 = stringBuilder[stringBuilder.length-1];
                                                 var pr2 = stringBuilder[stringBuilder.length-2];
-                                                
-                                                if ( pr1 + pr2 == "'''''")
-                                                        stringBuilder.push( ' ' ) ;
+
+                                                if ( pr1 + pr2 == "'''''") {
+                                                        if ( basicElement[0] == "''")
+                                                        {
+                                                                basic0 = '<i>';
+                                                                basic1 = '</i>';
+                                                        }
+                                                        if ( basicElement[0] == "'''")
+                                                        {
+                                                                basic0 = '<b>';
+                                                                basic1 = '</b>';
+                                                        }
+                                                }
                                         }
-                                        
-                                        if ( basicElement[0] )
-                                                stringBuilder.push( basicElement[0] ) ;
+
+                                        if ( basic0 )
+                                                stringBuilder.push( basic0 ) ;
 
                                         if ( !basicElement[2] )
                                                 this._AppendChildNodes( htmlNode, stringBuilder ) ;
 
-                                        if ( basicElement[1] )
-                                                stringBuilder.push( basicElement[1] ) ;
+                                        if ( basic1 )
+                                                stringBuilder.push( basic1 ) ;
                                 }
                                 else