Ticket #2922: 2922_3.patch

_source/plugins/dialog/plugin.js

@@ -2600 +2600 @@
 
                                 return dialog;
                         }
+                        else if ( dialogDefinitions == 'failed' )
+                                throw new Error( '[CKEDITOR.dialog.openDialog] Dialog "' + dialogName + '" failed when loading definition.' );
 
                         // Not loaded? Load the .js file first.
                         var body = CKEDITOR.document.getBody(),
@@ -2609 +2611 @@
                         body.setStyle( 'cursor', 'wait' );
                         CKEDITOR.scriptLoader.load( CKEDITOR.getUrl( dialogDefinitions ), function()
                                 {
+                                        // In case of plugin error, mark it as loading failed. 
+                                        if ( typeof CKEDITOR.dialog._.dialogDefinitions[ dialogName ] != 'function' )
+                                                        CKEDITOR.dialog._.dialogDefinitions[ dialogName ] =  'failed';
                                         me.openDialog( dialogName );
                                         body.setStyle( 'cursor', cursor );
                                 } );