vanilla ckeditor-3.5.3

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

diff --git a/_source/plugins/flash/plugin.js b/_source/plugins/flash/plugin.js
index 21772f3..7641a9e 100644 (file)
--- a/_source/plugins/flash/plugin.js
+++ b/_source/plugins/flash/plugin.js
@@ -1,5 +1,5 @@
 /*\r
-Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.\r
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.\r
 For licensing, see LICENSE.html or http://ckeditor.com/license\r
 */\r
 \r
@@ -75,7 +75,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
                                {\r
                                        var element = evt.data.element;\r
 \r
-                                       if ( element.is( 'img' ) && element.getAttribute( '_cke_real_element_type' ) == 'flash' )\r
+                                       if ( element.is( 'img' ) && element.data( 'cke-real-element-type' ) == 'flash' )\r
                                                evt.data.dialog = 'flash';\r
                                });\r
 \r
@@ -85,7 +85,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
                                editor.contextMenu.addListener( function( element, selection )\r
                                        {\r
                                                if ( element && element.is( 'img' ) && !element.isReadOnly()\r
-                                                               && element.getAttribute( '_cke_real_element_type' ) == 'flash' )\r
+                                                               && element.data( 'cke-real-element-type' ) == 'flash' )\r
                                                        return { flash : CKEDITOR.TRISTATE_OFF };\r
                                        });\r
                        }\r
@@ -107,7 +107,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
                                                                var attributes = element.attributes,\r
                                                                        classId = attributes.classid && String( attributes.classid ).toLowerCase();\r
 \r
-                                                               if ( !classId )\r
+                                                               if ( !classId && !isFlashEmbed( element ) )\r
                                                                {\r
                                                                        // Look for the inner <embed>\r
                                                                        for ( var i = 0 ; i < element.children.length ; i++ )\r