Index: /CKEditor/tests/tt/4246/1.html =================================================================== --- /CKEditor/tests/tt/4246/1.html (revision 4483) +++ /CKEditor/tests/tt/4246/1.html (revision 4484) @@ -25,9 +25,9 @@ { var editor = ts.editor, - input = '

', - outputGecko = '

', - outputIE = '

', - outputWebkit = '

', - outputOpera = '

 

'; + input = '

', + outputGecko = '

', + outputIE = '

', + outputWebkit = '

', + outputOpera = '

 

'; // Force result data un-formatted. @@ -49,6 +49,5 @@ hspaceField = dialog.getContentElement( 'info', 'txtHSpace' ), vspaceField = dialog.getContentElement( 'info', 'txtVSpace' ), - alignField = dialog.getContentElement( 'info', 'cmbAlign' ), - floatField = dialog.getContentElement( 'info', 'cmbFloat' ); + alignField = dialog.getContentElement( 'info', 'cmbAlign' ); widthField.setValue( 414 ); @@ -57,6 +56,58 @@ hspaceField.setValue( 5 ); vspaceField.setValue( 10 ); - alignField.setValue( 'bottom' ); - floatField.setValue( 'right' ); + alignField.setValue( 'right' ); + + dialog.fire( 'ok' ); + dialog.hide(); + + var result = editor.getData(); + assert.areEqual( + CKEDITOR.env.ie ? outputIE + : CKEDITOR.env.gecko? outputGecko + : CKEDITOR.env.webkit? outputWebkit + : outputOpera , + test.fixHtml( result ), 'Created image element attributes/style doesn\'t match.' ); + + }, CKEDITOR.env.ie ? 4000 : 1000 ); + }, + + /** + * Image dialog should produce valid xhtml image style instead of deprecated html attributes. + */ + test_alter_image_style2 : function() + { + var editor = ts.editor, + input = '

', + outputGecko = '

', + outputIE = '

', + outputWebkit = '

', + outputOpera = '

 

'; + + // Force result data un-formatted. + editor.dataProcessor.writer._.rules = {}; + + editor.loadSnapshot( input ); + editor.focus(); + var img = new CKEDITOR.dom.element( selector.query( 'img[src]', editor.document.$ )[ 0 ] ); + editor.getSelection().selectElement( img ); + + // Open dialog need some time. + editor.execCommand( 'image' ); + this.wait( function() + { + var dialog = editor._.storedDialogs[ 'image' ]; + var widthField = dialog.getContentElement( 'info', 'txtWidth' ), + heightField = dialog.getContentElement( 'info', 'txtHeight' ), + borderField = dialog.getContentElement( 'info', 'txtBorder' ), + hspaceField = dialog.getContentElement( 'info', 'txtHSpace' ), + vspaceField = dialog.getContentElement( 'info', 'txtVSpace' ), + alignField = dialog.getContentElement( 'info', 'cmbAlign' ); + + widthField.setValue( 414 ); + heightField.setValue( 86 ); + borderField.setValue( 2 ); + hspaceField.setValue( 5 ); + vspaceField.setValue( 10 ); + alignField.setValue( 'right' ); dialog.fire( 'ok' ); @@ -78,5 +129,4 @@ -
text
Index: /CKEditor/tests/tt/4246/2.html =================================================================== --- /CKEditor/tests/tt/4246/2.html (revision 4483) +++ /CKEditor/tests/tt/4246/2.html (revision 4484) @@ -23,4 +23,6 @@ ts.add( tc = new YAHOO.tool.TestCase( { +// shouldIgnoreAllBut : [ 'test_read_image_style_3', 'test_read_image_style_2' ], + tearDown : function() { @@ -29,5 +31,4 @@ dialog.hide(); }, -// shouldIgnoreAllBut : [ 'test_read_image_style_5' ], /** @@ -38,5 +39,5 @@ var editor = ts.editor, input = '

'; + 'style="border:solid 2px;height:86px;margin:10px 5px;float:right;width:414px;">

'; // Force result data un-formatted. @@ -59,45 +60,4 @@ vspaceField = dialog.getContentElement( 'info', 'txtVSpace' ), alignField = dialog.getContentElement( 'info', 'cmbAlign' ); - -// assert.areSame( 414, parseInt( widthField.getValue() ) ); - assert.areSame( 86, parseInt( heightField.getValue() ) ); - assert.areSame( 2, parseInt( borderField.getValue() ) ); - assert.areSame( 5, parseInt( hspaceField.getValue() ) ); - assert.areSame( 10, parseInt( vspaceField.getValue() ) ); - assert.areSame( 'baseline', alignField.getValue() ); - - - }, 1000 ); - }, - - /** - * Image dialog should be able to read from attributes. - */ - test_read_image_style_2 : function() - { - var editor = ts.editor, - input = '

'; - - // Force result data un-formatted. - editor.dataProcessor.writer._.rules = {}; - - editor.loadSnapshot( input ); - editor.focus(); - var img = new CKEDITOR.dom.element( selector.query( 'img[src]', editor.document.$ )[ 0 ] ); - editor.getSelection().selectElement( img ); - - // Open dialog need some time. - editor.execCommand( 'image' ); - this.wait( function() - { - var dialog = editor._.storedDialogs[ 'image' ]; - var widthField = dialog.getContentElement( 'info', 'txtWidth' ), - heightField = dialog.getContentElement( 'info', 'txtHeight' ), - borderField = dialog.getContentElement( 'info', 'txtBorder' ), - hspaceField = dialog.getContentElement( 'info', 'txtHSpace' ), - vspaceField = dialog.getContentElement( 'info', 'txtVSpace' ), - alignField = dialog.getContentElement( 'info', 'cmbAlign' ), - floatField = dialog.getContentElement( 'info', 'cmbFloat' ); assert.areSame( 414, parseInt( widthField.getValue() ) ); @@ -106,6 +66,6 @@ assert.areSame( 5, parseInt( hspaceField.getValue() ) ); assert.areSame( 10, parseInt( vspaceField.getValue() ) ); - assert.areSame( 'right', floatField.getValue() ); - assert.areSame ( '', alignField.getValue() ); + assert.areSame( 'right', alignField.getValue() ); + }, 1000 ); @@ -115,86 +75,22 @@ * Image dialog should be able to read from attributes. */ - test_read_image_style_3 : function() - { - var editor = ts.editor, - input = '

'; - - // Force result data un-formatted. - editor.dataProcessor.writer._.rules = {}; - - editor.loadSnapshot( input ); - editor.focus(); - var img = new CKEDITOR.dom.element( selector.query( 'img[src]', editor.document.$ )[ 0 ] ); - editor.getSelection().selectElement( img ); - - // Open dialog need some time. - editor.execCommand( 'image' ); - this.wait( function() - { - var dialog = editor._.storedDialogs[ 'image' ]; - alignField = dialog.getContentElement( 'info', 'cmbAlign' ), - floatField = dialog.getContentElement( 'info', 'cmbFloat' ); - - assert.areSame( 'left', floatField.getValue() ); - assert.areSame ( 'text-top', alignField.getValue() ); - - }, 1000 ); - }, - - /** - * Image dialog should be able to read from attributes. - */ - test_read_image_style_4 : function() - { - var editor = ts.editor, - input = '

'; - - // Force result data un-formatted. - editor.dataProcessor.writer._.rules = {}; - - editor.loadSnapshot( input ); - editor.focus(); - var img = new CKEDITOR.dom.element( selector.query( 'img[src]', editor.document.$ )[ 0 ] ); - editor.getSelection().selectElement( img ); - - // Open dialog need some time. - editor.execCommand( 'image' ); - this.wait( function() - { - var dialog = editor._.storedDialogs[ 'image' ]; - alignField = dialog.getContentElement( 'info', 'cmbAlign' ), - floatField = dialog.getContentElement( 'info', 'cmbFloat' ); - - assert.areSame( '', floatField.getValue() ); - assert.areSame ( 'middle', alignField.getValue() ); - - }, 1000 ); - }, - - /** - * Image dialog should read from inline style prior to attributes. - */ - test_read_image_style_5 : function() - { - var editor = ts.editor, - input = '

'; - - // Force result data un-formatted. - editor.dataProcessor.writer._.rules = {}; - - editor.loadSnapshot( input ); - editor.focus(); - var img = new CKEDITOR.dom.element( selector.query( 'img[src]', editor.document.$ )[ 0 ] ); - editor.getSelection().selectElement( img ); - - // Open dialog need some time. - editor.execCommand( 'image' ); - this.wait( function() - { - + test_read_image_style_2 : function() + { + var editor = ts.editor, + input = '

'; + + // Force result data un-formatted. + editor.dataProcessor.writer._.rules = {}; + + editor.loadSnapshot( input ); + editor.focus(); + var img = new CKEDITOR.dom.element( selector.query( 'img[src]', editor.document.$ )[ 0 ] ); + editor.getSelection().selectElement( img ); + + // Open dialog need some time. + editor.execCommand( 'image' ); + this.wait( function() + { var dialog = editor._.storedDialogs[ 'image' ]; var widthField = dialog.getContentElement( 'info', 'txtWidth' ), @@ -203,6 +99,5 @@ hspaceField = dialog.getContentElement( 'info', 'txtHSpace' ), vspaceField = dialog.getContentElement( 'info', 'txtVSpace' ), - alignField = dialog.getContentElement( 'info', 'cmbAlign' ), - floatField = dialog.getContentElement( 'info', 'cmbFloat' ); + alignField = dialog.getContentElement( 'info', 'cmbAlign' ); assert.areSame( 414, parseInt( widthField.getValue() ) ); @@ -211,6 +106,75 @@ assert.areSame( 5, parseInt( hspaceField.getValue() ) ); assert.areSame( 10, parseInt( vspaceField.getValue() ) ); - assert.areSame( 'right', floatField.getValue() ); - assert.areSame ( 'bottom', alignField.getValue() ); + assert.areSame ( 'left', alignField.getValue() ); + + }, 1000 ); + }, + + /** + * Image dialog should ignore unrelated attribute values. + */ + test_read_image_style_3 : function() + { + var editor = ts.editor, + input = '

'; + + // Force result data un-formatted. + editor.dataProcessor.writer._.rules = {}; + + editor.loadSnapshot( input ); + editor.focus(); + var img = new CKEDITOR.dom.element( selector.query( 'img[src]', editor.document.$ )[ 0 ] ); + editor.getSelection().selectElement( img ); + + // Open dialog need some time. + editor.execCommand( 'image' ); + this.wait( function() + { + var dialog = editor._.storedDialogs[ 'image' ], + alignField = dialog.getContentElement( 'info', 'cmbAlign' ); + + assert.areSame ( '', alignField.getValue() ); + + }, 1000 ); + }, + + /** + * Image dialog should read from inline style prior to attributes. + */ + test_read_image_style_5 : function() + { + var editor = ts.editor, + input = '

'; + + // Force result data un-formatted. + editor.dataProcessor.writer._.rules = {}; + + editor.loadSnapshot( input ); + editor.focus(); + var img = new CKEDITOR.dom.element( selector.query( 'img[src]', editor.document.$ )[ 0 ] ); + editor.getSelection().selectElement( img ); + + // Open dialog need some time. + editor.execCommand( 'image' ); + this.wait( function() + { + + var dialog = editor._.storedDialogs[ 'image' ]; + var widthField = dialog.getContentElement( 'info', 'txtWidth' ), + heightField = dialog.getContentElement( 'info', 'txtHeight' ), + borderField = dialog.getContentElement( 'info', 'txtBorder' ), + hspaceField = dialog.getContentElement( 'info', 'txtHSpace' ), + vspaceField = dialog.getContentElement( 'info', 'txtVSpace' ), + alignField = dialog.getContentElement( 'info', 'cmbAlign' ); + + assert.areSame( 414, parseInt( widthField.getValue() ) ); + assert.areSame( 86, parseInt( heightField.getValue() ) ); + assert.areSame( 2, parseInt( borderField.getValue() ) ); + assert.areSame( 5, parseInt( hspaceField.getValue() ) ); + assert.areSame( 10, parseInt( vspaceField.getValue() ) ); + assert.areSame ( 'right', alignField.getValue() ); }, 1000 ); @@ -283,4 +247,44 @@ assert.areSame( 5, parseInt( hspaceField.getValue() ) ); assert.isNaN( parseInt( vspaceField.getValue() ) ); + + }, 1000 ); + }, + + /** + * Fields rely on inline style should be updated when 'txtdlgGenStyle' changed. + */ + test_read_image_style_8 : function() + { + var editor = ts.editor, + input = '

'; + + // Force result data un-formatted. + editor.dataProcessor.writer._.rules = {}; + + editor.loadSnapshot( input ); + editor.focus(); + var img = new CKEDITOR.dom.element( selector.query( 'img[src]', editor.document.$ )[ 0 ] ); + editor.getSelection().selectElement( img ); + + // Open dialog need some time. + editor.execCommand( 'image' ); + this.wait( function() + { + var dialog = editor._.storedDialogs[ 'image' ], + styleTextField = dialog.getContentElement( 'advanced', 'txtdlgGenStyle' ), + widthField = dialog.getContentElement( 'info', 'txtWidth' ), + heightField = dialog.getContentElement( 'info', 'txtHeight' ), + borderField = dialog.getContentElement( 'info', 'txtBorder' ), + hspaceField = dialog.getContentElement( 'info', 'txtHSpace' ), + vspaceField = dialog.getContentElement( 'info', 'txtVSpace' ), + alignField = dialog.getContentElement( 'info', 'cmbAlign' ); + + styleTextField.setValue( 'height:300px;width:200px;border: 1px solid;margin:10px 5px;vertical-align:top;float:left' ); + assert.areSame( 200, parseInt( widthField.getValue() ) ); + assert.areSame( 300, parseInt( heightField.getValue() ) ); + assert.areSame( 1, parseInt( borderField.getValue() ) ); + assert.areSame( 5, parseInt( hspaceField.getValue() ) ); + assert.areSame( 10, parseInt( vspaceField.getValue() ) ); + assert.areSame ( 'left', alignField.getValue() ); }, 1000 );