Ticket #6023: 6023.patch

_source/plugins/wysiwygarea/plugin.js

@@ -38 +38 @@
 
                                 insertFunc.call( this, evt.data );
 
+                                postDomFixing.call( this );
+
                                 // Save snaps after the whole execution completed.
                                 // This's a workaround for make DOM modification's happened after
                                 // 'insertElement' to be included either, e.g. Form-based dialogs' 'commitContents'
@@ -375 +377 @@
                         }
                 }
 
+                if ( CKEDITOR.env.opera && range.collapsed )
+                {
+                        var start = range.startContainer;
+                        if ( start.type == CKEDITOR.NODE_ELEMENT
+                                        && start.getName() in CKEDITOR.dtd.$listItem
+                                        && range.checkStartOfBlock() && range.checkEndOfBlock() )
+                        {
+                                fixEmptyListItem( start );
+                        }
+                }
+
                 // When enterMode set to block, we'll establing new paragraph only if we're
                 // selecting inline contents right under body. (#3657)
                 if ( enterMode != CKEDITOR.ENTER_BR
@@ -463 +476 @@
                 }
         }
 
+        function postDomFixing()
+        {
+                if ( CKEDITOR.env.opera )
+                {
+                        var listItems = this.document.getElementsByTag( 'li' ),
+                                length = listItems.count();
+
+                        for ( var i = 0; i < length; i++ )
+                                 fixEmptyListItem( listItems.getItem( i ) );
+                }
+        }
+
+        // Opera doesn't display empty list item bullet well with a bogus br,
+        // empty text node to the rescue. (#6023)
+        function fixEmptyListItem( element )
+        {
+                if ( element.$.children.length == 1 && element.getFirst().is( 'br' ) )
+                        element.getDocument().createText( '' ).replace( element.getFirst() );
+        }
+
         CKEDITOR.plugins.add( 'wysiwygarea',
         {
                 requires : [ 'editingblock' ],
@@ -1131 +1164 @@
                                         var title = editor.document.getElementsByTag( 'title' ).getItem( 0 );
                                         title.data( 'cke-title', editor.document.$.title );
                                         editor.document.$.title = frameLabel;
+
+                                        postDomFixing.call( editor );
                                 });
 
                         // IE>=8 stricts mode doesn't have 'contentEditable' in effect