Index: _source/plugins/list/plugin.js
===================================================================
--- _source/plugins/list/plugin.js (revision 3607)
+++ _source/plugins/list/plugin.js Wed Jun 24 12:29:28 CST 2009
@@ -491,7 +491,8 @@
sibling.getName() == listCommand.type )
{
sibling.remove();
- sibling.moveChildren( listNode );
+ // Move children order by merge direction.(#3820)
+ sibling.moveChildren( listNode, rtl ? true : false );
}
} )();
mergeSibling( true );
Index: _source/tests/plugins/list/list.html
===================================================================
--- _source/tests/plugins/list/list.html (revision 3477)
+++ _source/tests/plugins/list/list.html Wed Jun 24 12:59:16 CST 2009
@@ -1,7 +1,7 @@
- Plugin: toolbar
+ Plugin: list
@@ -26,7 +26,10 @@
document.getElementById( elementId );
if ( isMe )
{
- callback.call( context, evt.editor );
+ var editor = evt.editor;
+ // Force result data unformatted.
+ editor.dataProcessor.writer._.rules = {};
+ callback.call( context, editor );
}
}, this );
@@ -105,9 +108,6 @@
{
editor.focus();
- // Force result data unformatted.
- editor.dataProcessor.writer._.rules = {};
-
var doc = editor.document,
range = new CKEDITOR.dom.range( doc );
@@ -119,127 +119,22 @@
this.wait( function(){
// Remove list.
editor.execCommand( 'numberedlist' );
- assert.areSame( getTextAreaValue( 'test_ticket_3151_resultContent' ),
+ assert.areSame( getTextAreaValue( 'test_ticket_3151_result' ),
editor.getData(),
'Remove list result not correct.' );
- }, 1000);
+ }, 1000 );
} );
}, this );
this.wait();
},
- name :document.title
- };
- } )() );
- //]]>
-
-
-
-
-
-
-
-
-
-
- Plugin: toolbar
-
-
-
-
-
+?
-
+
+
+