Changeset 443

Timestamp:

2007-07-13 11:38:44 (17 months ago)

Author:

alfonsoml

Message:

The changes in [427] broke the handling of popup windows in the link dialog. Fix it.

Files:

• FCKeditor/trunk/editor/dialog/fck_link/fck_link.js (modified) (7 diffs)

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

@@ -27 +27 @@
 var FCKConfig   = oEditor.FCKConfig ;
 var FCKRegexLib = oEditor.FCKRegexLib ;
+var FCKTools    = oEditor.FCKTools ;
 
 //#### Dialog Tabs
@@ -182 +183 @@
         }
 
-        var aIds = oEditor.FCKTools.GetAllChildrenIds( oEditor.FCK.EditorDocument.body ) ;
+        var aIds = FCKTools.GetAllChildrenIds( oEditor.FCK.EditorDocument.body ) ;
 
         bHasAnchors = ( aAnchors.length > 0 || aIds.length > 0 ) ;
@@ -190 +191 @@
                 var sName = aAnchors[i].name ;
                 if ( sName && sName.length > 0 )
-                        oEditor.FCKTools.AddSelectOption( GetE('cmbAnchorName'), sName, sName ) ;
+                        FCKTools.AddSelectOption( GetE('cmbAnchorName'), sName, sName ) ;
         }
 
         for ( i = 0 ; i < aIds.length ; i++ )
         {
-                oEditor.FCKTools.AddSelectOption( GetE('cmbAnchorId'), aIds[i], aIds[i] ) ;
+                FCKTools.AddSelectOption( GetE('cmbAnchorId'), aIds[i], aIds[i] ) ;
         }
 
@@ -224 +225 @@
 
         // Accesible popups, the popup data is in the onclick attribute
-        if ( !oPopupMatch ) {
+        if ( !oPopupMatch ) 
+        {
                 var onclick = oLink.getAttribute( 'onclick_fckprotectedatt' ) ;
-                oPopupMatch = oRegex.OnClickPopup.exec( onclick ) ;
-                if( oPopupMatch )
-                {
-                        GetE( 'cmbTarget' ).value = 'popup' ;
-                        FillPopupFields( oPopupMatch[1], oPopupMatch[2] ) ;
-                        SetTarget( 'popup' ) ;
+                if ( onclick )
+                {
+                        // Decode the protected string
+                        onclick = FCKTools.DecodeHex( onclick ) ;
+                        
+                        oPopupMatch = oRegex.OnClickPopup.exec( onclick ) ;
+                        if( oPopupMatch )
+                        {
+                                GetE( 'cmbTarget' ).value = 'popup' ;
+                                FillPopupFields( oPopupMatch[1], oPopupMatch[2] ) ;
+                                SetTarget( 'popup' ) ;
+                        }
                 }
         }
@@ -348 +356 @@
         GetE('tdTargetFrame').style.display     = ( targetType == 'popup' ? 'none' : '' ) ;
         GetE('tdPopupName').style.display       =
-                GetE('tablePopupFeatures').style.display = ( targetType == 'popup' ? '' : 'none' ) ;
+        GetE('tablePopupFeatures').style.display = ( targetType == 'popup' ? '' : 'none' ) ;
 
         switch ( targetType )
@@ -550 +558 @@
                 SetAttribute( oLink, '_fcksavedurl', sUri ) ;
 
+                var onclick;
                 // Accesible popups
                 if( GetE('cmbTarget').value == 'popup' )
                 {
-                        SetAttribute( oLink, 'onclick_fckprotectedatt', " onclick=\"" + BuildOnClickPopup() + "\"") ;
+                        onclick = BuildOnClickPopup() ;
+                        // Encode the attribute
+                        onclick = FCKTools.EncodeToHex( " onclick=\"" + onclick + "\"" )  ;
+                        SetAttribute( oLink, 'onclick_fckprotectedatt', onclick ) ;
                 }
                 else
@@ -559 +571 @@
                         // Check if the previous onclick was for a popup:
                         // In that case remove the onclick handler.
-                        var onclick = oLink.getAttribute( 'onclick_fckprotectedatt' ) ;
-                        if( oRegex.OnClickPopup.test( onclick ) )
-                                SetAttribute( oLink, 'onclick_fckprotectedatt', '' ) ;
+                        onclick = oLink.getAttribute( 'onclick_fckprotectedatt' ) ;
+                        if ( onclick )
+                        {
+                                // Decode the protected string
+                                onclick = FCKTools.DecodeHex( onclick ) ;
+                        
+                                if( oRegex.OnClickPopup.test( onclick ) )
+                                        SetAttribute( oLink, 'onclick_fckprotectedatt', '' ) ;
+                        }
                 }