Index: /CKEditor/tests/dt/plugins/htmldataprocessor/htmldataprocessor.html
===================================================================
--- /CKEditor/tests/dt/plugins/htmldataprocessor/htmldataprocessor.html (revision 4357)
+++ /CKEditor/tests/dt/plugins/htmldataprocessor/htmldataprocessor.html (revision 4358)
@@ -14,4 +14,41 @@
CKEDITOR.test.runner.run();
} );
+/**
+ * Load the editor and wait for fully interactable.
+ * @param {Object} elementId
+ * @parma {Object} mode
+ * @param {Object} config
+ * @param {Object} callback Continuation with {@param editor}.
+ * @param {Object} context
+ */
+function prepareEditor( elementId, mode, config, callback, context )
+{
+ CKEDITOR.on( 'instanceReady',
+ function( evt )
+ {
+ var isMe = mode == CKEDITOR.ELEMENT_MODE_REPLACE ?
+ evt.editor.name == elementId
+ : evt.editor.element.$ ==
+ document.getElementById( elementId );
+ if ( isMe )
+ {
+ var editor = evt.editor;
+ // Force result data unformatted.
+ editor.dataProcessor.writer._.rules = {};
+ callback.call( context, editor );
+ }
+ }, this );
+
+ mode = mode || CKEDITOR.ELEMENT_MODE_REPLACE;
+ switch( mode )
+ {
+ case CKEDITOR.ELEMENT_MODE_REPLACE :
+ CKEDITOR.replace( elementId, config );
+ break;
+ case CKEDITOR.ELEMENT_MODE_APPENDTO :
+ CKEDITOR.appendTo( elementId, config );
+ break;
+ }
+}
var testCase;
@@ -114,27 +151,13 @@
test_toDataFormat_ticket_2886_1 : function()
{
- var editor = CKEDITOR.instances.editor1;
- var test = this;
- var isReady = !!editor.dataProcessor;
-
- if ( !isReady )
+ prepareEditor( 'editor1', null, {}, function( editor )
{
- editor.on( 'instanceReady', function()
+ this.resume( function()
{
- isReady = true;
+ assert.areSame( '
',
+ editor.dataProcessor.toDataFormat( '' ) );
} );
- }
-
- this.wait( function()
- {
- if ( !isReady )
- {
- test.wait( arguments.callee, 100 );
- return;
- }
-
- assert.areSame( '\n\t
\n',
- editor.dataProcessor.toDataFormat( '' ) );
- }, 100 );
+ }, this );
+ this.wait();
},
@@ -146,5 +169,5 @@
if ( CKEDITOR.env.ie )
source = 'Some text
';
- assert.areSame( '\n\tSome text
\n\t
\n\t
\n',
+ assert.areSame( 'Some text
',
dataProcessor.toDataFormat( source ) );
},
@@ -154,5 +177,5 @@
var dataProcessor = CKEDITOR.instances.editor1.dataProcessor;
- assert.areSame( '\n\tSome text
\n\t
\n\t
\n\tSome more text
\n',
+ assert.areSame( 'Some text
Some more text
',
dataProcessor.toDataFormat( 'Some text
Some more text
' ) );
},
@@ -162,5 +185,5 @@
var dataProcessor = CKEDITOR.instances.editor1.dataProcessor;
- assert.areSame( '\n\tSome text
\n\t
\n\t
\n',
+ assert.areSame( 'Some text
',
dataProcessor.toDataFormat( 'Some text
' ) );
},
@@ -173,5 +196,5 @@
var dataProcessor = CKEDITOR.instances.editor1.dataProcessor;
- assert.areSame( '\n\t
\n',
+ assert.areSame( '
',
dataProcessor.toDataFormat( '
' ) );
},
@@ -185,5 +208,5 @@
source = '
';
- assert.areSame( '\n\t
\n\t
\n',
+ assert.areSame( '
',
dataProcessor.toDataFormat( source ) );
},
@@ -229,6 +252,6 @@
{
var dataProcessor = CKEDITOR.instances.editor1.dataProcessor;
- assert.areSame( '\n\t
\n\t
\n',
- dataProcessor.toDataFormat( dataProcessor.toHtml( '
\n
' ) ) );
+ assert.areSame( '
',
+ dataProcessor.toDataFormat( dataProcessor.toHtml( '
' ) ) );
},
@@ -360,5 +383,5 @@
-
+