Changeset 5084

Timestamp:

2010-02-10 14:51:24 (2 years ago)

Author:

tobiasz.cudnik

Message:

FIxed #5046 - jQuery adapter and ajaxSubmit method.

Location:

CKEditor

Files:

• tests/dt/adapters/jquery/1.html (modified) (3 diffs)
• tests/dt/adapters/jquery/2.html (deleted)
• trunk/_source/adapters/jquery.js (modified) (1 diff)

CKEditor/tests/dt/adapters/jquery/1.html

@@ -260 +260 @@
                                                         {
                                                                 editor.dataProcessor.writer._.rules = {};
-                                                                assert.areSame( '<p>foo bar</p>', editor.getData(), '1' );
-                                                                assert.areSame( editor.getData(), formData[ 0 ][ 'value' ], '2' );
+                                                                assert.areSame( '<p>foo bar</p>', 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 +279 @@
                         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( '<p>foo bar</p>', 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 +512 @@
                         <input type="submit" value="Submit" />
                 </form>
+                <form action="/" method="post" id="ajax_submit2">
+                        <textarea rows="10" cols="30" name="ajax_submit_textarea2" id="ajax_submit_textarea2">default</textarea>
+                        <input type="submit" value="Submit" />
+                </form>
                 <div style="padding: 15px; background-color: lightblue;">
                         <div id="div_replace" style="width: 200px; height: 300px; background-color: black;">default</div>

CKEditor/trunk/_source/adapters/jquery.js

@@ -184 +184 @@
                                                                 $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 );
                                                                 });
                                                         }