Ticket #3401: 3401_3.patch

_source/plugins/image/dialogs/image.js

@@ -145 +145 @@
 
         var imageDialog = function( editor, dialogType )
         {
+                var absoluteURLRegex = /^[\/\\]|:/;;
+
                 var onImgLoadEvent = function()
                 {
                         // Image is ready.
@@ -422 +424 @@
                                                                                                         original.on( 'error', onImgLoadErrorEvent, dialog );
                                                                                                         original.on( 'abort', onImgLoadErrorEvent, dialog );
                                                                                                         original.setAttribute( 'src', newUrl );
+
+                                                                                                        // Prepend base href for non-absolute url.
+                                                                                                        if( !absoluteURLRegex.test( newUrl ) )
+                                                                                                                newUrl = editor.config.baseHref + '/' + newUrl;
+
                                                                                                         dialog.preview.setAttribute( 'src', newUrl );
 
                                                                                                         updatePreview( dialog );

_source/plugins/flash/dialogs/flash.js

@@ -177 +177 @@
                         '<div id="FlashPreviewLoader" style="display:none"><div class="loading">&nbsp;</div></div>' +
                         '<div id="FlashPreviewBox"></div></div>';
 
+                var absoluteURLRegex = /^[\/\\]|:/;
+
                 return {
                         title : editor.lang.flash.title,
                         minWidth : 420,
@@ -315 +317 @@
                                                                                         setup : loadValue,
                                                                                         commit : commitValue,
                                                                                         onLoad : function()
-                                                                                        {
                                                                                                 var dialog = this.getDialog(),
                                                                                                 updatePreview = function( src ){
 
+                                                                                                        // Prepend base href for non-absolute url.
+                                                                                                        if( !absoluteURLRegex.test( src ) )
+                                                                                                                src = editor.config.baseHref + '/' + src;
+
                                                                                                         dialog.preview.setHtml( '<embed height="100%" width="100%" src="'
                                                                                                                 + CKEDITOR.tools.htmlEncode( src )
                                                                                                                 + '" type="application/x-shockwave-flash"></embed>' );