X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=_source%2Fplugins%2Fflash%2Fplugin.js;h=97f8a1242d98f1c18071e94b5e516c119b0aa0ab;hb=f0610347140239143439a511ee2bd48cb784f470;hp=21772f3fa6e86a1abf33841d49319d96e2b7a4fe;hpb=039a051ccf3901311661022a30afd60fc38130c9;p=ckeditor.git

diff --git a/_source/plugins/flash/plugin.js b/_source/plugins/flash/plugin.js
index 21772f3..97f8a12 100644
--- a/_source/plugins/flash/plugin.js
+++ b/_source/plugins/flash/plugin.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
 
@@ -7,8 +7,6 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 {
 	var flashFilenameRegex = /\.swf(?:$|\?)/i;
 
-	var cssifyLength = CKEDITOR.tools.cssLength;
-
 	function isFlashEmbed( element )
 	{
 		var attributes = element.attributes;
@@ -18,19 +16,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 
 	function createFakeElement( editor, realElement )
 	{
-		var fakeElement = editor.createFakeParserElement( realElement, 'cke_flash', 'flash', true ),
-			fakeStyle = fakeElement.attributes.style || '';
-
-		var width = realElement.attributes.width,
-			height = realElement.attributes.height;
-
-		if ( typeof width != 'undefined' )
-			fakeStyle = fakeElement.attributes.style = fakeStyle + 'width:' + cssifyLength( width ) + ';';
-
-		if ( typeof height != 'undefined' )
-			fakeStyle = fakeElement.attributes.style = fakeStyle + 'height:' + cssifyLength( height ) + ';';
-
-		return fakeElement;
+		return editor.createFakeParserElement( realElement, 'cke_flash', 'flash', true );
 	}
 
 	CKEDITOR.plugins.add( 'flash',
@@ -75,7 +61,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 				{
 					var element = evt.data.element;
 
-					if ( element.is( 'img' ) && element.getAttribute( '_cke_real_element_type' ) == 'flash' )
+					if ( element.is( 'img' ) && element.data( 'cke-real-element-type' ) == 'flash' )
 						evt.data.dialog = 'flash';
 				});
 
@@ -85,7 +71,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 				editor.contextMenu.addListener( function( element, selection )
 					{
 						if ( element && element.is( 'img' ) && !element.isReadOnly()
-								&& element.getAttribute( '_cke_real_element_type' ) == 'flash' )
+								&& element.data( 'cke-real-element-type' ) == 'flash' )
 							return { flash : CKEDITOR.TRISTATE_OFF };
 					});
 			}
@@ -107,7 +93,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 								var attributes = element.attributes,
 									classId = attributes.classid && String( attributes.classid ).toLowerCase();
 
-								if ( !classId )
+								if ( !classId && !isFlashEmbed( element ) )
 								{
 									// Look for the inner <embed>
 									for ( var i = 0 ; i < element.children.length ; i++ )