[freeside-commits] freeside/httemplate/elements/fckeditor/editor/dialog/fck_link fck_link.js, 1.1, 1.2
Mark Wells
mark at wavetail.420.am
Tue Mar 16 00:49:25 PDT 2010
Update of /home/cvs/cvsroot/freeside/httemplate/elements/fckeditor/editor/dialog/fck_link
In directory wavetail.420.am:/tmp/cvs-serv19732/fckeditor/editor/dialog/fck_link
Modified Files:
fck_link.js
Log Message:
FCKeditor 2.6.6
Index: fck_link.js
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/elements/fckeditor/editor/dialog/fck_link/fck_link.js,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -d -r1.1 -r1.2
--- fck_link.js 1 Aug 2007 22:25:18 -0000 1.1
+++ fck_link.js 16 Mar 2010 07:49:23 -0000 1.2
@@ -1,6 +1,6 @@
/*
* FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2007 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2010 Frederico Caldeira Knabben
*
* == BEGIN LICENSE ==
*
@@ -21,25 +21,28 @@
* Scripts related to the Link dialog window (see fck_link.html).
*/
-var oEditor = window.parent.InnerDialogLoaded() ;
+var dialog = window.parent ;
+var oEditor = dialog.InnerDialogLoaded() ;
+
var FCK = oEditor.FCK ;
var FCKLang = oEditor.FCKLang ;
var FCKConfig = oEditor.FCKConfig ;
var FCKRegexLib = oEditor.FCKRegexLib ;
+var FCKTools = oEditor.FCKTools ;
//#### Dialog Tabs
// Set the dialog tabs.
-window.parent.AddTab( 'Info', FCKLang.DlgLnkInfoTab ) ;
+dialog.AddTab( 'Info', FCKLang.DlgLnkInfoTab ) ;
if ( !FCKConfig.LinkDlgHideTarget )
- window.parent.AddTab( 'Target', FCKLang.DlgLnkTargetTab, true ) ;
+ dialog.AddTab( 'Target', FCKLang.DlgLnkTargetTab, true ) ;
if ( FCKConfig.LinkUpload )
- window.parent.AddTab( 'Upload', FCKLang.DlgLnkUpload, true ) ;
+ dialog.AddTab( 'Upload', FCKLang.DlgLnkUpload, true ) ;
if ( !FCKConfig.LinkDlgHideAdvanced )
- window.parent.AddTab( 'Advanced', FCKLang.DlgAdvancedTag ) ;
+ dialog.AddTab( 'Advanced', FCKLang.DlgAdvancedTag ) ;
// Function called when a dialog tag is selected.
function OnDialogTabChange( tabCode )
@@ -49,7 +52,7 @@
ShowE('divUpload' , ( tabCode == 'Upload' ) ) ;
ShowE('divAttribs' , ( tabCode == 'Advanced' ) ) ;
- window.parent.SetAutoSize( true ) ;
+ dialog.SetAutoSize( true ) ;
}
//#### Regular Expressions library.
@@ -74,7 +77,32 @@
var oParser = new Object() ;
-oParser.ParseEMailUrl = function( emailUrl )
+// This method simply returns the two inputs in numerical order. You can even
+// provide strings, as the method would parseInt() the values.
+oParser.SortNumerical = function(a, b)
+{
+ return parseInt( a, 10 ) - parseInt( b, 10 ) ;
+}
+
+oParser.ParseEMailParams = function(sParams)
+{
+ // Initialize the oEMailParams object.
+ var oEMailParams = new Object() ;
+ oEMailParams.Subject = '' ;
+ oEMailParams.Body = '' ;
+
+ var aMatch = sParams.match( /(^|^\?|&)subject=([^&]+)/i ) ;
+ if ( aMatch ) oEMailParams.Subject = decodeURIComponent( aMatch[2] ) ;
+
+ aMatch = sParams.match( /(^|^\?|&)body=([^&]+)/i ) ;
+ if ( aMatch ) oEMailParams.Body = decodeURIComponent( aMatch[2] ) ;
+
+ return oEMailParams ;
+}
+
+// This method returns either an object containing the email info, or FALSE
+// if the parameter is not an email link.
+oParser.ParseEMailUri = function( sUrl )
{
// Initializes the EMailInfo object.
var oEMailInfo = new Object() ;
@@ -82,28 +110,154 @@
oEMailInfo.Subject = '' ;
oEMailInfo.Body = '' ;
- var oParts = emailUrl.match( /^([^\?]+)\??(.+)?/ ) ;
- if ( oParts )
+ var aLinkInfo = sUrl.match( /^(\w+):(.*)$/ ) ;
+ if ( aLinkInfo && aLinkInfo[1] == 'mailto' )
+ {
+ // This seems to be an unprotected email link.
+ var aParts = aLinkInfo[2].match( /^([^\?]+)\??(.+)?/ ) ;
+ if ( aParts )
{
// Set the e-mail address.
- oEMailInfo.Address = oParts[1] ;
+ oEMailInfo.Address = aParts[1] ;
// Look for the optional e-mail parameters.
- if ( oParts[2] )
+ if ( aParts[2] )
{
- var oMatch = oParts[2].match( /(^|&)subject=([^&]+)/i ) ;
- if ( oMatch ) oEMailInfo.Subject = decodeURIComponent( oMatch[2] ) ;
+ var oEMailParams = oParser.ParseEMailParams( aParts[2] ) ;
+ oEMailInfo.Subject = oEMailParams.Subject ;
+ oEMailInfo.Body = oEMailParams.Body ;
+ }
+ }
+ return oEMailInfo ;
+ }
+ else if ( aLinkInfo && aLinkInfo[1] == 'javascript' )
+ {
+ // This may be a protected email.
- oMatch = oParts[2].match( /(^|&)body=([^&]+)/i ) ;
- if ( oMatch ) oEMailInfo.Body = decodeURIComponent( oMatch[2] ) ;
+ // Try to match the url against the EMailProtectionFunction.
+ var func = FCKConfig.EMailProtectionFunction ;
+ if ( func != null )
+ {
+ try
+ {
+ // Escape special chars.
+ func = func.replace( /([\/^$*+.?()\[\]])/g, '\\$1' ) ;
+
+ // Define the possible keys.
+ var keys = new Array('NAME', 'DOMAIN', 'SUBJECT', 'BODY') ;
+
+ // Get the order of the keys (hold them in the array <pos>) and
+ // the function replaced by regular expression patterns.
+ var sFunc = func ;
+ var pos = new Array() ;
+ for ( var i = 0 ; i < keys.length ; i ++ )
+ {
+ var rexp = new RegExp( keys[i] ) ;
+ var p = func.search( rexp ) ;
+ if ( p >= 0 )
+ {
+ sFunc = sFunc.replace( rexp, '\'([^\']*)\'' ) ;
+ pos[pos.length] = p + ':' + keys[i] ;
+ }
+ }
+
+ // Sort the available keys.
+ pos.sort( oParser.SortNumerical ) ;
+
+ // Replace the excaped single quotes in the url, such they do
+ // not affect the regexp afterwards.
+ aLinkInfo[2] = aLinkInfo[2].replace( /\\'/g, '###SINGLE_QUOTE###' ) ;
+
+ // Create the regexp and execute it.
+ var rFunc = new RegExp( '^' + sFunc + '$' ) ;
+ var aMatch = rFunc.exec( aLinkInfo[2] ) ;
+ if ( aMatch )
+ {
+ var aInfo = new Array();
+ for ( var i = 1 ; i < aMatch.length ; i ++ )
+ {
+ var k = pos[i-1].match(/^\d+:(.+)$/) ;
+ aInfo[k[1]] = aMatch[i].replace(/###SINGLE_QUOTE###/g, '\'') ;
+ }
+
+ // Fill the EMailInfo object that will be returned
+ oEMailInfo.Address = aInfo['NAME'] + '@' + aInfo['DOMAIN'] ;
+ oEMailInfo.Subject = decodeURIComponent( aInfo['SUBJECT'] ) ;
+ oEMailInfo.Body = decodeURIComponent( aInfo['BODY'] ) ;
+
+ return oEMailInfo ;
+ }
+ }
+ catch (e)
+ {
}
}
+ // Try to match the email against the encode protection.
+ var aMatch = aLinkInfo[2].match( /^(?:void\()?location\.href='mailto:'\+(String\.fromCharCode\([\d,]+\))\+'(.*)'\)?$/ ) ;
+ if ( aMatch )
+ {
+ // The link is encoded
+ oEMailInfo.Address = eval( aMatch[1] ) ;
+ if ( aMatch[2] )
+ {
+ var oEMailParams = oParser.ParseEMailParams( aMatch[2] ) ;
+ oEMailInfo.Subject = oEMailParams.Subject ;
+ oEMailInfo.Body = oEMailParams.Body ;
+ }
return oEMailInfo ;
}
+ }
+ return false;
+}
oParser.CreateEMailUri = function( address, subject, body )
{
+ // Switch for the EMailProtection setting.
+ switch ( FCKConfig.EMailProtection )
+ {
+ case 'function' :
+ var func = FCKConfig.EMailProtectionFunction ;
+ if ( func == null )
+ {
+ if ( FCKConfig.Debug )
+ {
+ alert('EMailProtection alert!\nNo function defined. Please set "FCKConfig.EMailProtectionFunction"') ;
+ }
+ return '';
+ }
+
+ // Split the email address into name and domain parts.
+ var aAddressParts = address.split( '@', 2 ) ;
+ if ( aAddressParts[1] == undefined )
+ {
+ aAddressParts[1] = '' ;
+ }
+
+ // Replace the keys by their values (embedded in single quotes).
+ func = func.replace(/NAME/g, "'" + aAddressParts[0].replace(/'/g, '\\\'') + "'") ;
+ func = func.replace(/DOMAIN/g, "'" + aAddressParts[1].replace(/'/g, '\\\'') + "'") ;
+ func = func.replace(/SUBJECT/g, "'" + encodeURIComponent( subject ).replace(/'/g, '\\\'') + "'") ;
+ func = func.replace(/BODY/g, "'" + encodeURIComponent( body ).replace(/'/g, '\\\'') + "'") ;
+
+ return 'javascript:' + func ;
+
+ case 'encode' :
+ var aParams = [] ;
+ var aAddressCode = [] ;
+
+ if ( subject.length > 0 )
+ aParams.push( 'subject='+ encodeURIComponent( subject ) ) ;
+ if ( body.length > 0 )
+ aParams.push( 'body=' + encodeURIComponent( body ) ) ;
+ for ( var i = 0 ; i < address.length ; i++ )
+ aAddressCode.push( address.charCodeAt( i ) ) ;
+
+ return 'javascript:void(location.href=\'mailto:\'+String.fromCharCode(' + aAddressCode.join( ',' ) + ')+\'?' + aParams.join( '&' ) + '\')' ;
+ }
+
+ // EMailProtection 'none'
+
var sBaseUri = 'mailto:' + address ;
var sParams = '' ;
@@ -123,7 +277,7 @@
//#### Initialization Code
// oLink: The actual selected link in the editor.
-var oLink = FCK.Selection.MoveToAncestorNode( 'A' ) ;
+var oLink = dialog.Selection.GetSelection().MoveToAncestorNode( 'A' ) ;
if ( oLink )
FCK.Selection.SelectNode( oLink ) ;
@@ -155,7 +309,23 @@
SetDefaultTarget() ;
// Activate the "OK" button.
- window.parent.SetOkButton( true ) ;
+ dialog.SetOkButton( true ) ;
+
+ // Select the first field.
+ switch( GetE('cmbLinkType').value )
+ {
+ case 'url' :
+ SelectField( 'txtUrl' ) ;
+ break ;
+ case 'email' :
+ SelectField( 'txtEMailAddress' ) ;
+ break ;
+ case 'anchor' :
+ if ( GetE('divSelAnchor').style.display != 'none' )
+ SelectField( 'cmbAnchorName' ) ;
+ else
+ SelectField( 'cmbLinkType' ) ;
+ }
}
var bHasAnchors ;
@@ -181,7 +351,7 @@
aAnchors[ aAnchors.length ] = oLinks[i] ;
}
- var aIds = oEditor.FCKTools.GetAllChildrenIds( oEditor.FCK.EditorDocument.body ) ;
+ var aIds = FCKTools.GetAllChildrenIds( oEditor.FCK.EditorDocument.body ) ;
bHasAnchors = ( aAnchors.length > 0 || aIds.length > 0 ) ;
@@ -189,12 +359,12 @@
{
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] ) ;
}
ShowE( 'divSelAnchor' , bHasAnchors ) ;
@@ -222,9 +392,15 @@
SetTarget( 'popup' ) ;
}
- // Accesible popups, the popup data is in the onclick attribute
- if ( !oPopupMatch ) {
+ // Accessible popups, the popup data is in the onclick attribute
+ if ( !oPopupMatch )
+ {
var onclick = oLink.getAttribute( 'onclick_fckprotectedatt' ) ;
+ if ( onclick )
+ {
+ // Decode the protected string
+ onclick = decodeURIComponent( onclick ) ;
+
oPopupMatch = oRegex.OnClickPopup.exec( onclick ) ;
if( oPopupMatch )
{
@@ -233,33 +409,32 @@
SetTarget( 'popup' ) ;
}
}
+ }
// Search for the protocol.
var sProtocol = oRegex.UriProtocol.exec( sHRef ) ;
- if ( sProtocol )
- {
- sProtocol = sProtocol[0].toLowerCase() ;
- GetE('cmbLinkProtocol').value = sProtocol ;
-
- // Remove the protocol and get the remainig URL.
- var sUrl = sHRef.replace( oRegex.UriProtocol, '' ) ;
+ // Search for a protected email link.
+ var oEMailInfo = oParser.ParseEMailUri( sHRef );
- if ( sProtocol == 'mailto:' ) // It is an e-mail link.
+ if ( oEMailInfo )
{
sType = 'email' ;
- var oEMailInfo = oParser.ParseEMailUrl( sUrl ) ;
GetE('txtEMailAddress').value = oEMailInfo.Address ;
GetE('txtEMailSubject').value = oEMailInfo.Subject ;
GetE('txtEMailBody').value = oEMailInfo.Body ;
}
- else // It is a normal link.
+ else if ( sProtocol )
{
+ sProtocol = sProtocol[0].toLowerCase() ;
+ GetE('cmbLinkProtocol').value = sProtocol ;
+
+ // Remove the protocol and get the remaining URL.
+ var sUrl = sHRef.replace( oRegex.UriProtocol, '' ) ;
sType = 'url' ;
GetE('txtUrl').value = sUrl ;
}
- }
else if ( sHRef.substr(0,1) == '#' && sHRef.length > 1 ) // It is an anchor link.
{
sType = 'anchor' ;
@@ -330,16 +505,16 @@
ShowE('divLinkTypeEMail' , (linkType == 'email') ) ;
if ( !FCKConfig.LinkDlgHideTarget )
- window.parent.SetTabVisibility( 'Target' , (linkType == 'url') ) ;
+ dialog.SetTabVisibility( 'Target' , (linkType == 'url') ) ;
if ( FCKConfig.LinkUpload )
- window.parent.SetTabVisibility( 'Upload' , (linkType == 'url') ) ;
+ dialog.SetTabVisibility( 'Upload' , (linkType == 'url') ) ;
if ( !FCKConfig.LinkDlgHideAdvanced )
- window.parent.SetTabVisibility( 'Advanced' , (linkType != 'anchor' || bHasAnchors) ) ;
+ dialog.SetTabVisibility( 'Advanced' , (linkType != 'anchor' || bHasAnchors) ) ;
if ( linkType == 'email' )
- window.parent.SetAutoSize( true ) ;
+ dialog.SetAutoSize( true ) ;
}
//#### Target type selection.
@@ -363,7 +538,7 @@
}
if ( targetType == 'popup' )
- window.parent.SetAutoSize( true ) ;
+ dialog.SetAutoSize( true ) ;
}
//#### Called while the user types the URL.
@@ -397,7 +572,7 @@
GetE('cmbTarget').value = 'frame' ;
}
-// Accesible popups
+// Accessible popups
function BuildOnClickPopup()
{
var sWindowName = "'" + GetE('txtPopupName').value.replace(/\W/gi, "") + "'" ;
@@ -457,6 +632,7 @@
function Ok()
{
var sUri, sInnerHtml ;
+ oEditor.FCKUndo.SaveUndoStep() ;
switch ( GetE('cmbLinkType').value )
{
@@ -503,7 +679,7 @@
}
// If no link is selected, create a new one (it may result in more than one link creation - #220).
- var aLinks = oLink ? [ oLink ] : oEditor.FCK.CreateLink( sUri ) ;
+ var aLinks = oLink ? [ oLink ] : oEditor.FCK.CreateLink( sUri, true ) ;
// If no selection, no links are created, so use the uri as the link text (by dom, 2006-05-26)
var aHasSelection = ( aLinks.length > 0 ) ;
@@ -534,11 +710,9 @@
}
// Create a new (empty) anchor.
- aLinks = [ oEditor.FCK.CreateElement( 'a' ) ] ;
+ aLinks = [ oEditor.FCK.InsertElement( 'a' ) ] ;
}
- oEditor.FCKUndo.SaveUndoStep() ;
-
for ( var i = 0 ; i < aLinks.length ; i++ )
{
oLink = aLinks[i] ;
@@ -549,19 +723,29 @@
oLink.href = sUri ;
SetAttribute( oLink, '_fcksavedurl', sUri ) ;
- // Accesible popups
+ var onclick;
+ // Accessible popups
if( GetE('cmbTarget').value == 'popup' )
{
- SetAttribute( oLink, 'onclick_fckprotectedatt', " onclick=\"" + BuildOnClickPopup() + "\"") ;
+ onclick = BuildOnClickPopup() ;
+ // Encode the attribute
+ onclick = encodeURIComponent( " onclick=\"" + onclick + "\"" ) ;
+ SetAttribute( oLink, 'onclick_fckprotectedatt', onclick ) ;
}
else
{
// Check if the previous onclick was for a popup:
// In that case remove the onclick handler.
- var onclick = oLink.getAttribute( 'onclick_fckprotectedatt' ) ;
+ onclick = oLink.getAttribute( 'onclick_fckprotectedatt' ) ;
+ if ( onclick )
+ {
+ // Decode the protected string
+ onclick = decodeURIComponent( onclick ) ;
+
if( oRegex.OnClickPopup.test( onclick ) )
SetAttribute( oLink, 'onclick_fckprotectedatt', '' ) ;
}
+ }
oLink.innerHTML = sInnerHtml ; // Set (or restore) the innerHTML
@@ -615,13 +799,17 @@
function SetUrl( url )
{
- document.getElementById('txtUrl').value = url ;
+ GetE('txtUrl').value = url ;
OnUrlChange() ;
- window.parent.SetSelectedTab( 'Info' ) ;
+ dialog.SetSelectedTab( 'Info' ) ;
}
function OnUploadCompleted( errorNumber, fileUrl, fileName, customMsg )
{
+ // Remove animation
+ window.parent.Throbber.Hide() ;
+ GetE( 'divUpload' ).style.display = '' ;
+
switch ( errorNumber )
{
case 0 : // No errors
@@ -642,6 +830,9 @@
case 203 :
alert( "Security error. You probably don't have enough permissions to upload. Please check your server." ) ;
return ;
+ case 500 :
+ alert( 'The connector is disabled' ) ;
+ break ;
default :
alert( 'Error on file upload. Error number: ' + errorNumber ) ;
return ;
@@ -671,12 +862,16 @@
return false ;
}
+ // Show animation
+ window.parent.Throbber.Show( 100 ) ;
+ GetE( 'divUpload' ).style.display = 'none' ;
+
return true ;
}
function SetDefaultTarget()
{
- var target = FCKConfig.DefaultLinkTarget + '' ;
+ var target = FCKConfig.DefaultLinkTarget || '' ;
if ( oLink || target.length == 0 )
return ;
More information about the freeside-commits
mailing list