X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=_source%2Fplugins%2Fflash%2Fplugin.js;h=21772f3fa6e86a1abf33841d49319d96e2b7a4fe;hb=039a051ccf3901311661022a30afd60fc38130c9;hp=c76a7fe32c28283118b70994f02a2a7ac0b21b6e;hpb=f8fc585c18d287eb325c575596d183122486b641;p=ckeditor.git diff --git a/_source/plugins/flash/plugin.js b/_source/plugins/flash/plugin.js index c76a7fe..21772f3 100644 --- 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 (function() { - var flashFilenameRegex = /\.swf(?:$|\?)/i, - numberRegex = /^\d+(?:\.\d+)?$/; + var flashFilenameRegex = /\.swf(?:$|\?)/i; - function cssifyLength( length ) - { - if ( numberRegex.test( length ) ) - return length + 'px'; - return length; - } + var cssifyLength = CKEDITOR.tools.cssLength; function isFlashEmbed( element ) { @@ -90,7 +84,8 @@ For licensing, see LICENSE.html or http://ckeditor.com/license { editor.contextMenu.addListener( function( element, selection ) { - if ( element && element.is( 'img' ) && element.getAttribute( '_cke_real_element_type' ) == 'flash' ) + if ( element && element.is( 'img' ) && !element.isReadOnly() + && element.getAttribute( '_cke_real_element_type' ) == 'flash' ) return { flash : CKEDITOR.TRISTATE_OFF }; }); }