vanilla ckeditor-3.4.2

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

diff --git a/_source/plugins/flash/plugin.js b/_source/plugins/flash/plugin.js
index c76a7fe..21772f3 100644 (file)
--- a/_source/plugins/flash/plugin.js
+++ b/_source/plugins/flash/plugin.js
@@ -5,15 +5,9 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 \r
 (function()\r
 {\r
-       var flashFilenameRegex = /\.swf(?:$|\?)/i,\r
-               numberRegex = /^\d+(?:\.\d+)?$/;\r
+       var flashFilenameRegex = /\.swf(?:$|\?)/i;\r
 \r
-       function cssifyLength( length )\r
-       {\r
-               if ( numberRegex.test( length ) )\r
-                       return length + 'px';\r
-               return length;\r
-       }\r
+       var cssifyLength = CKEDITOR.tools.cssLength;\r
 \r
        function isFlashEmbed( element )\r
        {\r
@@ -90,7 +84,8 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
                        {\r
                                editor.contextMenu.addListener( function( element, selection )\r
                                        {\r
-                                               if ( element && element.is( 'img' ) && element.getAttribute( '_cke_real_element_type' ) == 'flash' )\r
+                                               if ( element && element.is( 'img' ) && !element.isReadOnly()\r
+                                                               && element.getAttribute( '_cke_real_element_type' ) == 'flash' )\r
                                                        return { flash : CKEDITOR.TRISTATE_OFF };\r
                                        });\r
                        }\r