Ticket #3401: 3401_2.patch

_source/plugins/image/dialogs/image.js

@@ -145 +145 @@
 
         var imageDialog = function( editor, dialogType )
         {
+                var previewPreloader;
+
                 var onImgLoadEvent = function()
                 {
                         // Image is ready.
@@ -358 +360 @@
                                 var doc = this._.element.getDocument();
                                 this.addFocusable( doc.getById( 'btnResetSize' ), 5 );
                                 this.addFocusable( doc.getById( 'btnLockSizes' ), 5 );
+                                previewPreloader = new CKEDITOR.dom.element( 'img', editor.document )
                         },
                         onHide : function()
                         {
@@ -422 +425 @@
                                                                                                         original.on( 'error', onImgLoadErrorEvent, dialog );
                                                                                                         original.on( 'abort', onImgLoadErrorEvent, dialog );
                                                                                                         original.setAttribute( 'src', newUrl );
-                                                                                                        dialog.preview.setAttribute( 'src', newUrl );
-
+                                                                                                        // Query the preloader to figure out the url impacted by based href.
+                                                                                                        previewPreloader.setAttribute( 'src', newUrl );
+                                                                                                        dialog.preview.setAttribute( 'src', previewPreloader.$.src );
                                                                                                         updatePreview( dialog );
                                                                                                 }
                                                                                                 // Dont show preview if no URL given.

_source/plugins/flash/dialogs/flash.js

@@ -173 +173 @@
                 var makeObjectTag = !editor.config.flashEmbedTagOnly,
                         makeEmbedTag = editor.config.flashAddEmbedTag || editor.config.flashEmbedTagOnly;
 
-                var previewAreaHtml = '<div>' + CKEDITOR.tools.htmlEncode( editor.lang.image.preview ) +'<br>' +
+                var previewPreloader,
+                        previewAreaHtml = '<div>' + CKEDITOR.tools.htmlEncode( editor.lang.image.preview ) +'<br>' +
                         '<div id="FlashPreviewLoader" style="display:none"><div class="loading">&nbsp;</div></div>' +
                         '<div id="FlashPreviewBox"></div></div>';
 
@@ -279 +280 @@
                                         editor.insertElement( newFakeImage );
                         },
 
+                        onLoad : function ()
+                        {
+                                previewPreloader = new CKEDITOR.dom.element( 'img', editor.document )
+                        },
+
                         onHide : function()
                         {
                                 if ( this.preview )
@@ -318 +324 @@
                                                                                         {
                                                                                                 var dialog = this.getDialog(),
                                                                                                 updatePreview = function( src ){
-
+                                                                                                        // Query the preloader to figure out the url impacted by based href.
+                                                                                                        previewPreloader.setAttribute( 'src', src );
                                                                                                         dialog.preview.setHtml( '<embed height="100%" width="100%" src="'
-                                                                                                                + CKEDITOR.tools.htmlEncode( src )
+                                                                                                                + CKEDITOR.tools.htmlEncode( previewPreloader.$.src )
                                                                                                                 + '" type="application/x-shockwave-flash"></embed>' );
                                                                                                 };
                                                                                                 // Preview element