Ticket #3171: 3171.patch

_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 clearPreview = function( dialog )
+                {
+                        if ( dialog.preview )
+                                dialog.preview.setHtml('');
+                };
+                
                 return {
                         title : editor.lang.flash.title,
                         minWidth : 400,
@@ -285 +291 @@
                                         this.restoreSelection();
                                         editor.insertElement( newFakeImage );
                                 }
+                                clearPreview( this );
+                        },
+                        
+                        onCancel : function()
+                        {
+                                clearPreview( this );
                         },
+                        
                         contents : [
                                 {
                                         id : 'info',
@@ -317 +330 @@
                                                                                         commit : commitValue,
                                                                                         onLoad : function()
                                                                                         {
-                                                                                                var dialog = this.getDialog();
-                                                                                                var previewElement = dialog.getContentElement( 'info', 'preview' ).getElement().getChild( 3 );
-                                                                                                this.getInputElement().on( 'change', function()
-                                                                                                        {
-                                                                                                                previewElement.setHtml( '<embed height="100%" width="100%" src="'
-                                                                                                                                + CKEDITOR.tools.htmlEncode( this.getValue() )
-                                                                                                                                + '" type="application/x-shockwave-flash"></embed>' );
+                                                                                                var dialog = this.getDialog(), 
+                                                                                                updatePreview = function( src ){
+                                                                                                        
+                                                                                                        dialog.preview.setHtml( '<embed height="100%" width="100%" src="'
+                                                                                                                + CKEDITOR.tools.htmlEncode( src )
+                                                                                                                + '" type="application/x-shockwave-flash"></embed>' );
+                                                                                                };
+                                                                                                // Preview element
+                                                                                                dialog.preview = dialog.getContentElement( 'info', 'preview' ).getElement().getChild( 3 );
+                                                                                                
+                                                                                                // Sync on inital value loaded.
+                                                                                                this.on( 'change', function( evt ){
+                                                                                                        
+                                                                                                                if ( evt.data && evt.data.value )
+                                                                                                                        updatePreview( evt.data.value );
                                                                                                         } );
+                                                                                                // Sync when input value changed.
+                                                                                                this.getInputElement().on( 'change', function( evt ){
+                                                                                                        
+                                                                                                        updatePreview( this.getValue() );
+                                                                                                }, this );
                                                                                         }
                                                                                 },
                                                                                 {

_source/plugins/fakeobjects/plugin.js

@@ -12 +12 @@
                         $ : function( element, filter )
                         {
                                 var realHtml = element.attributes._cke_realelement;
-                                        realFragment = realHtml && new CKEDITOR.htmlParser.fragment.fromHtml( decodeURIComponent( realHtml ), filter ),
+                                        realFragment = realHtml && new CKEDITOR.htmlParser.fragment.fromHtml( decodeURIComponent( realHtml ) ),
                                         realElement = realFragment && realFragment.children[ 0 ];
 
                                 if ( realElement )