/*\r
-Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.\r
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.\r
For licensing, see LICENSE.html or http://ckeditor.com/license\r
*/\r
\r
classid : [ { type : ATTRTYPE_OBJECT, name : 'classid' } ],\r
codebase : [ { type : ATTRTYPE_OBJECT, name : 'codebase'} ],\r
pluginspage : [ { type : ATTRTYPE_EMBED, name : 'pluginspage' } ],\r
- src : [ { type : ATTRTYPE_PARAM, name : 'movie' }, { type : ATTRTYPE_EMBED, name : 'src' } ],\r
+ src : [ { type : ATTRTYPE_PARAM, name : 'movie' }, { type : ATTRTYPE_EMBED, name : 'src' }, { type : ATTRTYPE_OBJECT, name : 'data' } ],\r
name : [ { type : ATTRTYPE_EMBED, name : 'name' } ],\r
align : [ { type : ATTRTYPE_OBJECT, name : 'align' } ],\r
- title : [ { type : ATTRTYPE_OBJECT, name : 'title' }, { type : ATTRTYPE_EMBED, name : 'title' } ],\r
'class' : [ { type : ATTRTYPE_OBJECT, name : 'class' }, { type : ATTRTYPE_EMBED, name : 'class'} ],\r
width : [ { type : ATTRTYPE_OBJECT, name : 'width' }, { type : ATTRTYPE_EMBED, name : 'width' } ],\r
height : [ { type : ATTRTYPE_OBJECT, name : 'height' }, { type : ATTRTYPE_EMBED, name : 'height' } ],\r
for ( i = 0 ; i < names.length ; i++ )\r
attributesMap[ names[i] ][0]['default'] = attributesMap[ names[i] ][1]['default'] = true;\r
\r
+ var defaultToPixel = CKEDITOR.tools.cssLength;\r
+\r
function loadValue( objectNode, embedNode, paramMap )\r
{\r
var attributes = attributesMap[ this.id ];\r
switch ( attrDef.type )\r
{\r
case ATTRTYPE_OBJECT:\r
- if ( !objectNode )\r
+ // Avoid applying the data attribute when not needed (#7733)\r
+ if ( !objectNode || ( attrDef.name == 'data' && embedNode && !objectNode.hasAttribute( 'data' ) ) )\r
continue;\r
var value = this.getValue();\r
if ( isRemove || isCheckbox && value === attrDef[ 'default' ] )\r
\r
var previewPreloader,\r
previewAreaHtml = '<div>' + CKEDITOR.tools.htmlEncode( editor.lang.common.preview ) +'<br>' +\r
- '<div id="FlashPreviewLoader" style="display:none"><div class="loading"> </div></div>' +\r
- '<div id="FlashPreviewBox"></div></div>';\r
+ '<div id="cke_FlashPreviewLoader' + CKEDITOR.tools.getNextNumber() + '" style="display:none"><div class="loading"> </div></div>' +\r
+ '<div id="cke_FlashPreviewBox' + CKEDITOR.tools.getNextNumber() + '" class="FlashPreviewBox"></div></div>';\r
\r
return {\r
title : editor.lang.flash.title,\r
{\r
// Clear previously saved elements.\r
this.fakeImage = this.objectNode = this.embedNode = null;\r
- previewPreloader = new CKEDITOR.dom.element( 'embeded', editor.document );\r
+ previewPreloader = new CKEDITOR.dom.element( 'embed', editor.document );\r
\r
// Try to detect any embed or object tag that has Flash parameters.\r
var fakeImage = this.getSelectedElement();\r
- if ( fakeImage && fakeImage.getAttribute( '_cke_real_element_type' ) && fakeImage.getAttribute( '_cke_real_element_type' ) == 'flash' )\r
+ if ( fakeImage && fakeImage.data( 'cke-real-element-type' ) && fakeImage.data( 'cke-real-element-type' ) == 'flash' )\r
{\r
this.fakeImage = fakeImage;\r
\r
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
type : 'text',\r
id : 'width',\r
style : 'width:95px',\r
- label : editor.lang.flash.width,\r
- validate : CKEDITOR.dialog.validate.integer( editor.lang.flash.validateWidth ),\r
- setup : function( objectNode, embedNode, paramMap, fakeImage )\r
- {\r
- loadValue.apply( this, arguments );\r
- if ( fakeImage )\r
- {\r
- var fakeImageWidth = parseInt( fakeImage.$.style.width, 10 );\r
- if ( !isNaN( fakeImageWidth ) )\r
- this.setValue( fakeImageWidth );\r
- }\r
- },\r
- commit : function( objectNode, embedNode, paramMap, extraStyles )\r
- {\r
- commitValue.apply( this, arguments );\r
- if ( this.getValue() )\r
- extraStyles.width = this.getValue() + 'px';\r
- }\r
+ label : editor.lang.common.width,\r
+ validate : CKEDITOR.dialog.validate.htmlLength( editor.lang.common.invalidHtmlLength.replace( '%1', editor.lang.common.width ) ),\r
+ setup : loadValue,\r
+ commit : commitValue\r
},\r
{\r
type : 'text',\r
id : 'height',\r
style : 'width:95px',\r
- label : editor.lang.flash.height,\r
- validate : CKEDITOR.dialog.validate.integer( editor.lang.flash.validateHeight ),\r
- setup : function( objectNode, embedNode, paramMap, fakeImage )\r
- {\r
- loadValue.apply( this, arguments );\r
- if ( fakeImage )\r
- {\r
- var fakeImageHeight = parseInt( fakeImage.$.style.height, 10 );\r
- if ( !isNaN( fakeImageHeight ) )\r
- this.setValue( fakeImageHeight );\r
- }\r
- },\r
- commit : function( objectNode, embedNode, paramMap, extraStyles )\r
- {\r
- commitValue.apply( this, arguments );\r
- if ( this.getValue() )\r
- extraStyles.height = this.getValue() + 'px';\r
- }\r
+ label : editor.lang.common.height,\r
+ validate : CKEDITOR.dialog.validate.htmlLength( editor.lang.common.invalidHtmlLength.replace( '%1', editor.lang.common.height ) ),\r
+ setup : loadValue,\r
+ commit : commitValue\r
},\r
{\r
type : 'text',\r
{\r
id : 'align',\r
type : 'select',\r
- label : editor.lang.flash.align,\r
+ label : editor.lang.common.align,\r
'default' : '',\r
style : 'width : 100%;',\r
items :\r
[\r
[ editor.lang.common.notSet , ''],\r
- [ editor.lang.flash.alignLeft , 'left'],\r
+ [ editor.lang.common.alignLeft , 'left'],\r
[ editor.lang.flash.alignAbsBottom , 'absBottom'],\r
[ editor.lang.flash.alignAbsMiddle , 'absMiddle'],\r
[ editor.lang.flash.alignBaseline , 'baseline'],\r
- [ editor.lang.flash.alignBottom , 'bottom'],\r
- [ editor.lang.flash.alignMiddle , 'middle'],\r
- [ editor.lang.flash.alignRight , 'right'],\r
+ [ editor.lang.common.alignBottom , 'bottom'],\r
+ [ editor.lang.common.alignMiddle , 'middle'],\r
+ [ editor.lang.common.alignRight , 'right'],\r
[ editor.lang.flash.alignTextTop , 'textTop'],\r
- [ editor.lang.flash.alignTop , 'top']\r
+ [ editor.lang.common.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
[\r
{\r
type : 'hbox',\r
- widths : [ '45%', '55%' ],\r
children :\r
[\r
{\r
label : editor.lang.common.id,\r
setup : loadValue,\r
commit : commitValue\r
- },\r
- {\r
- type : 'text',\r
- id : 'title',\r
- label : editor.lang.common.advisoryTitle,\r
- setup : loadValue,\r
- commit : commitValue\r
}\r
]\r
},\r
{\r
type : 'text',\r
id : 'style',\r
+ validate : CKEDITOR.dialog.validate.inlineStyle( editor.lang.common.invalidInlineStyle ),\r
label : editor.lang.common.cssStyle,\r
setup : loadValue,\r
commit : commitValue\r
Got questions, comments, patches, etc.? Contact Jason Woofenden