Index: /CKEditor/tests/tt/4548/1.html
===================================================================
--- /CKEditor/tests/tt/4548/1.html (revision 4513)
+++ /CKEditor/tests/tt/4548/1.html (revision 4514)
@@ -19,5 +19,6 @@
var ts, tc,
- assert = CKEDITOR.test.assert,
+ test = CKEDITOR.test,
+ assert = test.assert,
selector = YAHOO.util.Selector,
doc = CKEDITOR.document;
@@ -27,12 +28,14 @@
config :
{
- extraPlugins : 'fakecomment',
- fakeComments :
- [
- { pattern : /^break$/, styles : { display : 'block' }, displayName : 'page-break' },
- // IE downlevel-revealed conditional comments.
- { pattern : /\[if[^\]]*?\]>[\s\S]+/g ]
+ extraPlugins : 'drupalpagebreak',
+ drupalPageBreak :
+ {
+ content : "pagebreak",
+ styles : { display : 'block' },
+ displayName : 'drupal_page_break',
+ dtdParents : { body : 1 } // Live inside body.
+// dtdParents : CKEDITOR.dtd.$block // Live side blocks.
+ },
+ toolbar : [ [ 'Source', 'Bold', 'Italic', '-', 'NumberedList', 'BulletedList', '-', 'Link', 'Unlink','-','DrupalPageBreak', 'Table' ] ]
},
name :document.title
@@ -41,4 +44,5 @@
ts.add( tc = new YAHOO.tool.TestCase(
{
+// shouldIgnoreAllBut : [ 'test_insert_drupalpagebreak' ],
/**
* Test the 'fakecomment' plugin is working properly.
@@ -51,13 +55,29 @@
tc.resume( function()
{
+ var fakeObjects = selector.query( 'img.cke_drupal_break', editor.document.$ ),
+ fakeObject = new CKEDITOR.dom.element( fakeObjects[ 0 ] );
+
assert.areEqual( getTextAreaValue( 'editor_data_output' ), editor.getData(), 'editor output data doesn\'t match.' );
- var fakeObjects = selector.query( 'img.cke_comment', editor.document.$ );
- assert.areEqual( 2, fakeObjects.length, 'There should be two image placeholders.' );
- assert.isTrue( new CKEDITOR.dom.element( fakeObjects[ 0 ] ).hasClass( 'cke_fc_page-break' ) );
- assert.areEqual( 'display: block;', new CKEDITOR.dom.element( fakeObjects[ 0 ] ).getAttribute( 'style' ) );
+ assert.isTrue( fakeObject.hasClass( 'cke_drupal_page_break' ) );
+ assert.isTrue( fakeObject.hasClass( 'cke_drupal_break' ) );
+ assert.areEqual( 'block', new CKEDITOR.dom.element( fakeObjects[ 0 ] ).getStyle( 'display') );
} );
} );
tc.wait();
+ },
+
+ // Test insert a drupal-page-break inside table.
+ test_insert_drupalpagebreak : function ()
+ {
+ var editor = ts.editor,
+ contentWithSelection = test.getValueAsHtml( 'drupal_page_break_input' );
+ editor.focus();
+ test.setHtmlWithSelection( editor.document.getBody(), contentWithSelection );
+ editor.execCommand( 'drupalpagebreak' );
+ var snapshot = editor.document.getBody().getHtml();
+ assert.areEqual( test.getValueAsHtml( 'drupal_page_break_output' ),
+ test.fixHtml( editor.getData(), false, true ) , 'editor output data doesn\'t match.' );
}
+
} ) );
} )();
@@ -66,21 +86,51 @@
-
+
+