Ticket #6589: 6589.patch

_source/plugins/iframedialog/plugin.js

@@ -12 +12 @@
         requires : [ 'dialog' ],
         onLoad : function()
         {
-                CKEDITOR.dialog.addIframe = function( name, title, src, width, height, onContentLoad )
+                /**
+                 * An iframe base dialog.
+                 * @param {String} name Name of the dialog
+                 * @param {String} title Title of the dialog
+                 * @param {Number} width Width of the dialog
+                 * @param {Number} height Height of the dialog
+                 * @param {Function} [onContentLoad] Function called when the iframe has been loaded.
+                 * If it isn't specified, the inner frame is notified of the dialog events ('load', 'ok' and 'cancel')
+                 * on a function called 'onDialogEvent'
+                 * @param {Object} [userDefinition] Additional properties for the dialog definition
+                 * @example
+                 */
+                CKEDITOR.dialog.addIframe = function( name, title, src, width, height, onContentLoad, userDefinition )
                 {
                         var element =
                         {
@@ -24 +36 @@
 
                         if ( typeof( onContentLoad ) == 'function' )
                                 element.onContentLoad = onContentLoad;
+                        else
+                                element.onContentLoad = function()
+                                {
+                                        var element = this.getElement(),
+                                                childWindow = element.$.contentWindow;
 
+                                        // If the inner frame has defined a "onDialogEvent" function, setup listeners
+                                        if ( childWindow.onDialogEvent )
+                                        {
+                                                var dialog = this.getDialog(),
+                                                        notifyEvent = function(e)
+                                                        {
+                                                                return childWindow.onDialogEvent(e);
+                                                        };
+
+                                                dialog.on( 'ok', notifyEvent );
+                                                dialog.on( 'cancel', notifyEvent );
+
+                                                // Clear listeners
+                                                dialog.on( 'hide', function(e)
+                                                        {
+                                                                dialog.removeListener( 'ok', notifyEvent );
+                                                                dialog.removeListener( 'cancel', notifyEvent );
+
+                                                                e.removeListener();
+                                                        } );
+
+                                                // Notify child iframe of load:
+                                                childWindow.onDialogEvent( {
+                                                                name : 'load',
+                                                                sender : this,
+                                                                editor : dialog._.editor
+                                                        } );
+                                        }
+                                };
+
                         var definition =
                         {
                                 title : title,
@@ -41 +88 @@
                                 ]
                         };
 
-                        return this.add( name, function(){ return definition; } );
+                        for ( var i in userDefinition )
+                                definition[i] = userDefinition[i];
+
+                        this.add( name, function(){ return definition; } );
                 };
 
                 (function()