vanilla ckeditor-3.2.1

[ckeditor.git] / _source / plugins / flash / dialogs / flash.js

diff --git a/_source/plugins/flash/dialogs/flash.js b/_source/plugins/flash/dialogs/flash.js
index 0e74e01..666d3c8 100644 (file)
--- a/_source/plugins/flash/dialogs/flash.js
+++ b/_source/plugins/flash/dialogs/flash.js
@@ -174,7 +174,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
                        makeEmbedTag = editor.config.flashAddEmbedTag || editor.config.flashEmbedTagOnly;\r
 \r
                var previewPreloader,\r
-                       previewAreaHtml = '<div>' + CKEDITOR.tools.htmlEncode( editor.lang.image.preview ) +'<br>' +\r
+                       previewAreaHtml = '<div>' + CKEDITOR.tools.htmlEncode( editor.lang.common.preview ) +'<br>' +\r
                        '<div id="FlashPreviewLoader" style="display:none"><div class="loading">&nbsp;</div></div>' +\r
                        '<div id="FlashPreviewBox"></div></div>';\r
 \r
@@ -265,12 +265,15 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
                                                paramMap[ paramList.getItem( i ).getAttribute( 'name' ) ] = paramList.getItem( i );\r
                                }\r
 \r
-                               // Apply or remove flash parameters.\r
-                               var extraStyles = {};\r
-                               this.commitContent( objectNode, embedNode, paramMap, extraStyles );\r
+                               // A subset of the specified attributes/styles\r
+                               // should also be applied on the fake element to\r
+                               // have better visual effect. (#5240)\r
+                               var extraStyles = {}, extraAttributes = {};\r
+                               this.commitContent( objectNode, embedNode, paramMap, extraStyles, extraAttributes );\r
 \r
                                // Refresh the fake image.\r
                                var newFakeImage = editor.createFakeElement( objectNode || embedNode, 'cke_flash', 'flash', true );\r
+                               newFakeImage.setAttributes( extraAttributes );\r
                                newFakeImage.setStyles( extraStyles );\r
                                if ( this.fakeImage )\r
                                {\r
@@ -300,10 +303,6 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
                                                        children :\r
                                                        [\r
                                                                {\r
-                                                                       type : 'html',\r
-                                                                       html : '<span>' + CKEDITOR.tools.htmlEncode( editor.lang.image.url ) + '</span>'\r
-                                                               },\r
-                                                               {\r
                                                                        type : 'hbox',\r
                                                                        widths : [ '280px', '110px' ],\r
                                                                        align : 'right',\r
@@ -312,7 +311,8 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
                                                                                {\r
                                                                                        id : 'src',\r
                                                                                        type : 'text',\r
-                                                                                       label : '',\r
+                                                                                       label : editor.lang.common.url,\r
+                                                                                       required : true,\r
                                                                                        validate : CKEDITOR.dialog.validate.notEmpty( editor.lang.flash.validateSrc ),\r
                                                                                        setup : loadValue,\r
                                                                                        commit : commitValue,\r
@@ -347,7 +347,9 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
                                                                                        id : 'browse',\r
                                                                                        filebrowser : 'info:src',\r
                                                                                        hidden : true,\r
-                                                                                       align : 'center',\r
+                                                                                       // v-align with the 'src' field.\r
+                                                                                       // TODO: We need something better than a fixed size here.\r
+                                                                                       style : 'display:inline-block;margin-top:10px;',\r
                                                                                        label : editor.lang.common.browseServer\r
                                                                                }\r
                                                                        ]\r
@@ -573,7 +575,12 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
                                                                                [ editor.lang.flash.alignTop , 'top']\r
                                                                        ],\r
                                                                        setup : loadValue,\r
-                                                                       commit : commitValue\r
+                                                                       commit : function( objectNode, embedNode, paramMap, extraStyles, extraAttributes )\r
+                                                                       {\r
+                                                                               var value = this.getValue();\r
+                                                                               commitValue.apply( this, arguments );\r
+                                                                               value && ( extraAttributes.align = value );\r
+                                                                       }\r
                                                                },\r
                                                                {\r
                                                                        type : 'html',\r
@@ -582,45 +589,48 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
                                                        ]\r
                                                },\r
                                                {\r
-                                                       type : 'vbox',\r
-                                                       padding : 0,\r
+                                                       type : 'fieldset',\r
+                                                       label : CKEDITOR.tools.htmlEncode( editor.lang.flash.flashvars ),\r
                                                        children :\r
                                                        [\r
                                                                {\r
-                                                                       type : 'html',\r
-                                                                       html : CKEDITOR.tools.htmlEncode( editor.lang.flash.flashvars )\r
-                                                               },\r
-                                                               {\r
-                                                                       type : 'checkbox',\r
-                                                                       id : 'menu',\r
-                                                                       label : editor.lang.flash.chkMenu,\r
-                                                                       'default' : true,\r
-                                                                       setup : loadValue,\r
-                                                                       commit : commitValue\r
-                                                               },\r
-                                                               {\r
-                                                                       type : 'checkbox',\r
-                                                                       id : 'play',\r
-                                                                       label : editor.lang.flash.chkPlay,\r
-                                                                       'default' : true,\r
-                                                                       setup : loadValue,\r
-                                                                       commit : commitValue\r
-                                                               },\r
-                                                               {\r
-                                                                       type : 'checkbox',\r
-                                                                       id : 'loop',\r
-                                                                       label : editor.lang.flash.chkLoop,\r
-                                                                       'default' : true,\r
-                                                                       setup : loadValue,\r
-                                                                       commit : commitValue\r
-                                                               },\r
-                                                               {\r
-                                                                       type : 'checkbox',\r
-                                                                       id : 'allowFullScreen',\r
-                                                                       label : editor.lang.flash.chkFull,\r
-                                                                       'default' : true,\r
-                                                                       setup : loadValue,\r
-                                                                       commit : commitValue\r
+                                                                       type : 'vbox',\r
+                                                                       padding : 0,\r
+                                                                       children :\r
+                                                                       [\r
+                                                                               {\r
+                                                                                       type : 'checkbox',\r
+                                                                                       id : 'menu',\r
+                                                                                       label : editor.lang.flash.chkMenu,\r
+                                                                                       'default' : true,\r
+                                                                                       setup : loadValue,\r
+                                                                                       commit : commitValue\r
+                                                                               },\r
+                                                                               {\r
+                                                                                       type : 'checkbox',\r
+                                                                                       id : 'play',\r
+                                                                                       label : editor.lang.flash.chkPlay,\r
+                                                                                       'default' : true,\r
+                                                                                       setup : loadValue,\r
+                                                                                       commit : commitValue\r
+                                                                               },\r
+                                                                               {\r
+                                                                                       type : 'checkbox',\r
+                                                                                       id : 'loop',\r
+                                                                                       label : editor.lang.flash.chkLoop,\r
+                                                                                       'default' : true,\r
+                                                                                       setup : loadValue,\r
+                                                                                       commit : commitValue\r
+                                                                               },\r
+                                                                               {\r
+                                                                                       type : 'checkbox',\r
+                                                                                       id : 'allowFullScreen',\r
+                                                                                       label : editor.lang.flash.chkFull,\r
+                                                                                       'default' : true,\r
+                                                                                       setup : loadValue,\r
+                                                                                       commit : commitValue\r
+                                                                               }\r
+                                                                       ]\r
                                                                }\r
                                                        ]\r
                                                }\r