Index: /CKEditor/tests/dt/adapters/jquery/1.html =================================================================== --- /CKEditor/tests/dt/adapters/jquery/1.html (revision 5083) +++ /CKEditor/tests/dt/adapters/jquery/1.html (revision 5084) @@ -260,6 +260,6 @@ { editor.dataProcessor.writer._.rules = {}; - assert.areSame( '

foo bar

', editor.getData(), '1' ); - assert.areSame( editor.getData(), formData[ 0 ][ 'value' ], '2' ); + assert.areSame( '

foo bar

', editor.getData(), 'Compare editor data to awaited value.' ); + assert.areSame( editor.getData(), formData[ 0 ][ 'value' ], 'Compare editor data to serialized form value.' ); testFinished = true; cleanup( 'ajax_submit_textarea' ); @@ -279,4 +279,44 @@ testSelf.wait( function(){ cleanup( 'ajax_submit_textarea' ); + assert.isTrue( testFinished, 'Test not finished.' ); + }, testTimeout ); + }, + + test_ajax_submit2 : function() + { + var testSelf = this, + testFinished = false; + + jQuery( '#ajax_submit2 textarea' ).ckeditor( + { autoUpdateElementJquery: true }, + function( textarea ) + { + var editor = this; + editor.dataProcessor.writer._.rules = {}; + + $( textarea ).one( 'setData.ckeditor', function() + { + jQuery('#ajax_submit2').ajaxSubmit( + { + beforeSubmit: function( formData ) + { + testSelf.resume( function() + { + editor.dataProcessor.writer._.rules = {}; + assert.areSame( '

foo bar

', editor.getData(), 'Compare editor data to awaited value.' ); + assert.areSame( editor.getData(), formData[ 0 ][ 'value' ], 'Compare editor data to serialized form value.' ); + testFinished = true; + cleanup( 'ajax_submit_textarea2' ); + }); + return false; + } + } ); + } ); + + editor.setData( 'foo bar' ); + } ); + + testSelf.wait( function(){ + cleanup( 'ajax_submit_textarea2' ); assert.isTrue( testFinished, 'Test not finished.' ); }, testTimeout ); @@ -472,4 +512,8 @@ +
+ + +
default
Index: Editor/tests/dt/adapters/jquery/2.html =================================================================== --- /CKEditor/tests/dt/adapters/jquery/2.html (revision 5083) +++ (revision ) @@ -1,51 +1,0 @@ - - - - Plugin: jquery - - - - - - - - - - - Index: /CKEditor/trunk/_source/adapters/jquery.js =================================================================== --- /CKEditor/trunk/_source/adapters/jquery.js (revision 5083) +++ /CKEditor/trunk/_source/adapters/jquery.js (revision 5084) @@ -184,8 +184,12 @@ $element.parents( 'form' ).submit( onSubmit ); + // Bind to form-pre-serialize from jQuery Forms plugin. + $element.parents( 'form' ).bind( 'form-pre-serialize', onSubmit ); + // Unbind when editor destroyed. $element.bind( 'destroy.ckeditor', function() { $element.parents( 'form' ).unbind( 'submit', onSubmit ); + $element.parents( 'form' ).unbind( 'form-pre-serialize', onSubmit ); }); }