Ticket #2802: 2802.patch

_source/plugins/dialog/plugin.js

@@ -69 +69 @@
                 return;
         }
         definition = new CKEDITOR.dialog._.definitionObject( this, definition );
-        definition = CKEDITOR.fire( 'dialogDefinition', { name : dialogName, definition : definition }, editor ).definition;
+        definition = editor.fire( 'dialogDefinition', { name : dialogName, definition : definition }, editor ).definition;
 
         // Initialize some basic parameters.
         CKEDITOR.tools.extend( ( this._ || ( this._ = {} ) ), {
@@ -1243 +1243 @@
 
         currentZIndex : null,
 
-        storedDialogs : {},
-
         margins : [0, 0, 0, 0],
 
         /**
@@ -2129 +2127 @@
                         // If the dialogDefinition is already loaded, open it immediately.
                         if ( typeof( CKEDITOR.dialog._.dialogDefinitions[dialogName] ) == 'function' )
                         {
-                                var dialog = CKEDITOR.dialog._.storedDialogs[dialogName] || new CKEDITOR.dialog( this, dialogName );
-                                CKEDITOR.dialog._.storedDialogs[dialogName] = dialog;
+                                if ( !this._.storedDialogs )
+                                        this._.storedDialogs = {};
+
+                                var dialog = this._.storedDialogs[dialogName] || new CKEDITOR.dialog( this, dialogName );
+                                this._.storedDialogs[dialogName] = dialog;
                                 dialog.show();
                                 return dialog;
                         }