Changeset 703

Timestamp:

2007-08-22 18:53:08 (16 months ago)

Author:

martinkou

Message:

Fixed #268 : Simplified protect event encode/decode logic by using encodeURICompoenent() and decodeURICompoenent().
Removed FCKTools.EncodeToHex() and FCKTools.DecodeHex() since they are no longer needed.

Location:

FCKeditor/trunk/editor

Files:

• dialog/fck_link/fck_link.js (modified) (3 diffs)
• _source/internals/fck.js (modified) (1 diff)
• _source/internals/fcktools.js (modified) (1 diff)

FCKeditor/trunk/editor/dialog/fck_link/fck_link.js

@@ -231 +231 @@
                 {
                         // Decode the protected string
-                        onclick = FCKTools.DecodeHex( onclick ) ;
+                        onclick = decodeURIComponent( onclick ) ;
                         
                         oPopupMatch = oRegex.OnClickPopup.exec( onclick ) ;
@@ -564 +564 @@
                         onclick = BuildOnClickPopup() ;
                         // Encode the attribute
-                        onclick = FCKTools.EncodeToHex( " onclick=\"" + onclick + "\"" )  ;
+                        onclick = encodeURIComponent( " onclick=\"" + onclick + "\"" )  ;
                         SetAttribute( oLink, 'onclick_fckprotectedatt', onclick ) ;
                 }
@@ -575 +575 @@
                         {
                                 // Decode the protected string
-                                onclick = FCKTools.DecodeHex( onclick ) ;
+                                onclick = decodeURIComponent( onclick ) ;
                         
                                 if( oRegex.OnClickPopup.test( onclick ) )

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

@@ -755 +755 @@
 function _FCK_ProtectEvents_ReplaceEvents( eventMatch, attName )
 {
-        return ' ' + attName + '_fckprotectedatt="' + FCKTools.EncodeToHex( eventMatch ) + '"' ;
+        return ' ' + attName + '_fckprotectedatt="' + encodeURIComponent( eventMatch ) + '"' ;
 }
 
 function _FCK_ProtectEvents_RestoreEvents( match, encodedOriginal )
 {
-        return FCKTools.DecodeHex( encodedOriginal ) ;
+        return decodeURIComponent( encodedOriginal ) ;
 }
 

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

@@ -417 +417 @@
 }
 
-FCKTools.EncodeToHex = function( str )
-{
-        var symbols = FCKListsLib.HexList ;
-        var output = [] ;
-        // assume code points are 16-bits
-        for ( var i = 0 ; i < str.length ; i++ )
-        {
-                var c = str.charCodeAt( i ) ;
-                var lsn = c & 0x000f ;
-                var second = ( c & 0x00f0 ) >> 4 ;
-                var third = ( c & 0x0f00 ) >> 8 ;
-                var msn = ( c & 0xf000 ) >> 12 ;
-                output.push( [ symbols[msn], symbols[third], symbols[second], symbols[lsn] ].join( "" ) ) ;
-        }
-        return output.join( "" ) ;
-}
-
-FCKTools.DecodeHex = function( hexstr )
-{
-        if ( hexstr.length % 4 != 0 )
-                throw "FCKTools.DecodeHex(): hexstr length must be multiple of 4." ;
-
-        var symbols = FCKListsLib.HexMap ;
-        var output = [] ;
-        for ( var i = 0 ; i < hexstr.length ; i+=4 )
-        {
-                var codePoint = symbols[ hexstr.charAt( i ) ] << 12 ;
-                codePoint |= symbols[ hexstr.charAt( i + 1 ) ] << 8 ;
-                codePoint |= symbols[ hexstr.charAt( i + 2 ) ] << 4 ;
-                codePoint |= symbols[ hexstr.charAt( i + 3 ) ] ;
-                output.push( String.fromCharCode( codePoint ) ) ;
-        }
-        return output.join( "" ) ;
-}
-
 FCKTools.GetDocumentPosition = function( w, node )
 {