Changeset 645

Timestamp:

2007-08-09 12:14:32 (3 years ago)

Author:

martinkou

Message:

Fixed JavaScript error in IE when the user is switching to and from Source mode.
Fixed #462 : Fixed the issue where Firefox freezes if it is fed HTML code missing an ending </body> tag in Source mode.

Location:

FCKeditor/trunk/editor/_source

Files:

• classes/fckeditingarea.js (modified) (1 diff)
• internals/fckregexlib.js (modified) (1 diff)
• internals/fckundo.js (modified) (1 diff)

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

@@ -75 +75 @@
 
                         // Extract the BODY contents from the html.
-                        var oMatch = html.match( FCKRegexLib.BodyContents ) ;
-
-                        if ( oMatch )
-                        {
+                        var oMatchBefore = html.match( FCKRegexLib.BeforeBody ) ;
+                        var oMatchAfter = html.match( FCKRegexLib.AfterBody ) ;
+
+                        if ( oMatchBefore && oMatchAfter )
+                        {
+                                var sBody = html.substr( oMatchBefore[1].length,
+                                               html.length - oMatchBefore[1].length - oMatchAfter[1].length ) ; // This is the BODY tag contents.
+
                                 html =
-                                        oMatch[1] +                                     // This is the HTML until the <body...> tag, inclusive.
+                                        oMatchBefore[1] +                       // This is the HTML until the <body...> tag, inclusive.
                                         '&nbsp;' +
-                                        oMatch[3] ;                                     // This is the HTML from the </body> tag, inclusive.
-
-                                var sBody = oMatch[2].Trim() ;  // This is the BODY tag contents.
+                                        oMatchAfter[1] ;                        // This is the HTML from the </body> tag, inclusive.
 
                                 // If nothing in the body, place a BOGUS tag so the cursor will appear.

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

@@ -33 +33 @@
 NamedCommands   : /^(?:Cut|Copy|Paste|Print|SelectAll|RemoveFormat|Unlink|Undo|Redo|Bold|Italic|Underline|StrikeThrough|Subscript|Superscript|JustifyLeft|JustifyCenter|JustifyRight|JustifyFull|Outdent|Indent|InsertOrderedList|InsertUnorderedList|InsertHorizontalRule)$/i ,
 
-BodyContents    : /([\s\S]*\<body[^\>]*\>)([\s\S]*)(\<\/body\>[\s\S]*)/i ,
+BeforeBody      : /(^[\s\S]*\<body[^\>]*\>)/i,
+AfterBody       : /(\<\/body\>[\s\S]*$)/i,
 
 // Temporary text used to solve some browser specific limitations.

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

@@ -96 +96 @@
 FCKUndo._CheckIsBookmarksEqual = function( bookmark1, bookmark2 )
 {
+        if ( ! ( bookmark1 && bookmark2 ) )
+                return false ;
         if ( FCKBrowserInfo.IsIE )
         {