Changeset 1708

Timestamp:

2008-03-17 04:37:08 (4 months ago)

Author:

martinkou

Message:

Fixed #1055 : Added logic to override JavaScript errors occuring inside the editing frame due to user added JavaScript code.

Location:

FCKeditor/trunk

Files:

• editor/_source/classes/fckeditingarea.js (modified) (3 diffs)
• _whatsnew.html (modified) (1 diff)

FCKeditor/trunk/editor/_source/classes/fckeditingarea.js

@@ -93 +93 @@
                 var oIFrame = this.IFrame = oTargetDocument.createElement( 'iframe' ) ;
 
+                // IE: Avoid JavaScript errors thrown by the editing are source (like tags events).
+                // See #1055.
+                var sOverrideError = '<script type="text/javascript" _fcktemp="true">window.onerror=function(){return true;};</script>' ;
+
                 oIFrame.frameBorder = 0 ;
                 oIFrame.width = oIFrame.height = '100%' ;
@@ -98 +102 @@
                 if ( FCK_IS_CUSTOM_DOMAIN && FCKBrowserInfo.IsIE )
                 {
-                        window._FCKHtmlToLoad = html ;
+                        window._FCKHtmlToLoad = sOverrideError + html ;
                         oIFrame.src = 'javascript:void( (function(){' +
                                 'document.open() ;' +
@@ -130 +134 @@
 
                         oDoc.open() ;
-                        oDoc.write( html ) ;
+                        oDoc.write( sOverrideError + html ) ;
                         oDoc.close() ;
                 }

FCKeditor/trunk/_whatsnew.html

@@ -68 +68 @@
                 <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2000">#2000</a>] The #
                         character is now properly encoded in file names returned by the File Browser.</li>
-                <li>[<a href="http://dev.fckeditor.net/ticket/1945" target="_blank">#1945</a>] New folders
-                        and file names are now properly sanitized against control characters. </li>
+                <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1945">#1945</a>] New 
+                        folders and file names are now properly sanitized against control characters.
+                        </li>
+                <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1055">#1055</a>] Added logic
+                        to override JavaScript errors occuring inside the editing frame due to user added
+                        JavaScript code.</li>
         </ul>
         <h3>