Ticket #2944: 2944.patch

_source/core/event.js

@@ -121 +121 @@
                                         if ( isNaN( priority ) )
                                                 priority = 10;
 
+                                        var me = this;
+
                                         // Create the function to be fired for this listener.
                                         var listenerFirer = function( editor, publisherData, stopFn, cancelFn )
                                         {
@@ -132 +134 @@
                                                         data : publisherData,
                                                         listenerData : listenerData,
                                                         stop : stopFn,
-                                                        cancel : cancelFn
+                                                        cancel : cancelFn,
+                                                        removeListener : function()
+                                                        {
+                                                                me.removeListener( eventName, listenerFunction );
+                                                        }
                                                 };
 
                                                 listenerFunction.call( scopeObj, ev );

_source/plugins/editingblock/plugin.js

@@ -90 +90 @@
                                         if ( editor.mode )
                                                 getMode( editor ).loadSnapshotData( event.data );
                                 });
+
+                        // For the first "mode" call, we'll also fire the "instanceReady"
+                        // event.
+                        editor.on( 'mode', function( event )
+                                {
+                                        // Do that once only.
+                                        event.removeListener();
+
+                                        // Fire instanceReady for both the editor and CKEDITOR.
+                                        editor.fireOnce( 'instanceReady' );
+                                        CKEDITOR.fire( 'instanceReady', null, editor );
+                                });
                 }
         });