Changeset 147

Timestamp:

2007-02-18 14:45:13 (3 years ago)

Author:

alfonsoml

Message:

Fix for SF Bug 1245504 and 1652240: Flash files without the .swf extension weren't recognized upon reload. Also they weren't recognized anyway in Opera.

Location:

FCKeditor/trunk

Files:

• editor/_source/internals/fckdocumentprocessor.js (modified) (2 diffs)
• _whatsnew.html (modified) (1 diff)

FCKeditor/trunk/editor/_source/internals/fckdocumentprocessor.js

@@ -134 +134 @@
         while ( i >= 0 && ( oEmbed = aEmbeds[i--] ) )
         {
-                if ( oEmbed.src.EndsWith( '.swf', true ) )
+                // IE doesn't return the type attribute with oEmbed.type or oEmbed.getAttribute("type") 
+                // But it turns out that after accessing it then it doesn't gets copied later
+                var oType = oEmbed.attributes[ 'type' ] ;
+
+                // Check the extension and the type. Now it should be enough with just the type
+                // Opera doesn't return oEmbed.src so oEmbed.src.EndsWith will fail
+                if ( (oEmbed.src && oEmbed.src.EndsWith( '.swf', true )) || ( oType && oType.nodeValue == 'application/x-shockwave-flash' ) )
                 {
                         var oCloned = oEmbed.cloneNode( true ) ;
@@ -148 +154 @@
                                         if ( oAtt ) oCloned.setAttribute( aAttributes[iAtt], oAtt ) ;
                                 }
+                                // It magically gets lost after reading it in oType
+                                oCloned.setAttribute( 'type', oType.nodeValue ) ;
                         }
 

FCKeditor/trunk/_whatsnew.html

@@ -55 +55 @@
                 <li>[<a target="_blank" href="https://sourceforge.net/tracker/?func=detail&atid=543653&aid=1288609&group_id=75348">SF
                         BUG-1288609</a>] The content of iframes are preserved.</li>
+                <li>[<a target="_blank" href="https://sourceforge.net/tracker/?func=detail&atid=543653&aid=1245504&group_id=75348">SF
+                        BUG-1245504</a>] [<a target="_blank" href="https://sourceforge.net/tracker/?func=detail&atid=543653&aid=1652240&group_id=75348">SF
+                                BUG-1652240</a>] Flash files without the .swf extension weren't recognized upon reload.</li>
         </ul>
         <h3>