Changeset 483

Timestamp:

2007-07-20 10:24:50 (17 months ago)

Author:

martinkou

Message:

Fixed #143 : Writing <!{PS..x}--> in source mode and then switching between source mode and WYSIWYG mode would hang the browser.

Files:

• FCKeditor/trunk/editor/_source/internals/fckconfig.js (modified) (3 diffs)

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

@@ -161 +161 @@
 FCKConfig.ProtectedSource = new Object() ;
 
+FCKConfig.ProtectedSource._GenerateCodeTag = function()
+{
+        if ( this._CodeTag )
+                return ;
+        var codeTag = [] ;
+        for ( var i = 0 ; i < 16 ; i++ )
+                codeTag.push( String.fromCharCode( 0x41 + parseInt( Math.random() * 26 ) ) ) ;
+        this._CodeTag = codeTag.join( "" ) ;
+}
+FCKConfig.ProtectedSource._GenerateCodeTag() ;
+
 // Initialize the regex array with the default ones.
 FCKConfig.ProtectedSource.RegexEntries = [
@@ -184 +195 @@
 FCKConfig.ProtectedSource.Protect = function( html )
 {
+        var codeTag = this._CodeTag ;
         function _Replace( protectedSource )
         {
                 var index = FCKTempBin.AddElement( protectedSource ) ;
-                return '<!--{PS..' + index + '}-->' ;
+                return '<!--{' + codeTag + index + '}-->' ;
         }
 
@@ -207 +219 @@
         }
 
-        return html.replace( /(<|&lt;)!--\{PS..(\d+)\}--(>|&gt;)/g, _Replace ) ;
+        var regex = new RegExp( "(<|&lt;)!--\\{" + this._CodeTag + "(\\d+)\\}--(>|&gt;)", "g" ) ;
+        return html.replace( regex, _Replace ) ;
 }