Changeset 4465

Timestamp:

11/12/09 15:34:13 (4 years ago)

Author:

tobiasz.cudnik

Message:

Updating #4210 branch with review fixes.

Location:

CKEditor/branches/features/4210/3.1.x/_source/adapters

Files:

• jquery (deleted)
• jquery.js (copied) (copied from CKEditor/branches/features/4210/3.1.x/_source/adapters/jquery/adapter.js) (4 diffs)

CKEditor/branches/features/4210/3.1.x/_source/adapters/jquery.js

@@ -8 +8 @@
  *   and access to internal API. It also integrates some aspects of CKEditor with
  *   jQuery framework.
+ *
+ * Every TEXTAREA, DIV and P elements can be converted to working editor.
+ *
+ * Plugin exposes some of editor's event to jQuery event system. All of those are namespaces inside
+ * ".ckeditor" namespace and can be binded/listened on supported textarea, div and p nodes.
+ *
+ * Available jQuery events:
+ * - instanceReady.ckeditor( editor, rootNode )
+ *   Triggered when new instance is ready.
+ * - destroy.ckeditor( editor )
+ *   Triggered when instance is destroyed.
+ * - getData.ckeditor( editor, eventData )
+ *   Triggered when getData event is fired inside editor. It can change returned data using eventData reference.
+ * - setData.ckeditor( editor )
+ *   Triggered when getData event is fired inside editor.
  * 
  * @example
+ * <script src="jquery.js"></script>
  * <script src="ckeditor.js"></script>
- * <script src="jquery.js"></script>
  * <script src="adapters/jquery/adapter.js"></script>
  */
@@ -143 +158 @@
                                                                 setTimeout( function()
                                                                 {
-                                                                        $element.trigger( 'setData' + '.ckeditor', [ editor, editor.getData() ] );
+                                                                        $element.trigger( 'setData' + '.ckeditor', [ editor ] );
                                                                 }, 100 );
                                                         });
 
                                                         // Forward setData only for sourcearea mode.
-                                                        editor.on( 'afterSetData', function( event ) {
+                                                        editor.on( 'afterSetData', function( event ) {`
                                                                 if ( editor.mode != 'wysiwyg' )
-                                                                        $element.trigger( 'setData' + '.ckeditor', [ editor, event.data.dataValue ] );
+                                                                        $element.trigger( 'setData' + '.ckeditor', [ editor ] );
                                                         });
 
                                                         // Forward getData.
                                                         editor.on( 'getData', function( event ) {
-                                                                $element.trigger( 'getData' + '.ckeditor', [ editor, event.data.dataValue ] );
-                                                        });
+                                                                $element.trigger( 'getData' + '.ckeditor', [ editor, event.data ] );
+                                                        }, 999 );
 
                                                         // Forward destroy event.
@@ -189 +204 @@
 
                                                         // Garbage collect on destroy.
-                                                        $element.bind( 'destroy.ckeditor', function()
+                                                        editor.on( 'destroy', function()
                                                         {
                                                                 $element.data( 'ckeditorInstance', null );
@@ -226 +241 @@
 
         // New val() method for objects.
-        if ( CKEDITOR.config.jqueryOverrideVal )
+        if ( typeof CKEDITOR.config.jqueryOverrideVal == 'undefined' || CKEDITOR.config.jqueryOverrideVal )
         {
                 jQuery.fn.val = CKEDITOR.tools.override( jQuery.fn.val, function( oldValMethod )