Ticket #7168: 7168.patch

_source/plugins/editingblock/plugin.js

@@ -71 +71 @@
                                         if ( !isHandlingData && editor.mode )
                                         {
                                                 isHandlingData = true;
-                                                editor.setData( getMode( editor ).getData() );
+                                                editor.setData( getMode( editor ).getData(), null, 1 );
                                                 isHandlingData = false;
                                         }
                                 });

_source/core/editor.js

@@ -547 +547 @@
                         if ( !noUpdate )
                                 this.updateElement();
 
+                        this.fire( 'destroy' );
                         this.theme && this.theme.destroy( this );
 
-                        this.fire( 'destroy' );
                         CKEDITOR.remove( this );
                         CKEDITOR.fire( 'instanceDestroyed', null, this );
                 },
@@ -684 +684 @@
                  *              editor.
                  * @param {Function} callback Function to be called after the setData
                  *              is completed.
+                 *@param {Boolean} internal Whether suppress  any event firing when copying data internally inside editor.
                  * @example
                  * CKEDITOR.instances.editor1.<b>setData</b>( '&lt;p&gt;This is the editor data.&lt;/p&gt;' );
                  * @example
@@ -692 +693 @@
                  *         this.checkDirty();    // true
                  *     });
                  */
-                setData : function( data , callback )
+                setData : function( data , callback, internal )
                 {
                         if( callback )
                         {
@@ -705 +706 @@
 
                         // Fire "setData" so data manipulation may happen.
                         var eventData = { dataValue : data };
-                        this.fire( 'setData', eventData );
+                        !internal && this.fire( 'setData', eventData );
 
                         this._.data = eventData.dataValue;
 
-                        this.fire( 'afterSetData', eventData );
+                        !internal && this.fire( 'afterSetData', eventData );
                 },
 
                 /**