[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] news_admin/js/fckeditor/editor/dialog/fck_link fck_li
From: |
skwashd |
Subject: |
[Phpgroupware-cvs] news_admin/js/fckeditor/editor/dialog/fck_link fck_link.js, 1.2 |
Date: |
Thu, 4 Aug 2005 05:54:00 +0200 |
Update of news_admin/js/fckeditor/editor/dialog/fck_link
Modified Files:
Branch: MAIN
fck_link.js lines: +83 -15
Log Message:
new newsletter builder, updated FCK and a few other things
====================================================
Index: news_admin/js/fckeditor/editor/dialog/fck_link/fck_link.js
diff -u news_admin/js/fckeditor/editor/dialog/fck_link/fck_link.js:1.1
news_admin/js/fckeditor/editor/dialog/fck_link/fck_link.js:1.2
--- news_admin/js/fckeditor/editor/dialog/fck_link/fck_link.js:1.1 Tue May
24 14:32:53 2005
+++ news_admin/js/fckeditor/editor/dialog/fck_link/fck_link.js Thu Aug 4
03:54:31 2005
@@ -1,6 +1,6 @@
/*
* FCKeditor - The text editor for internet
- * Copyright (C) 2003-2004 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2005 Frederico Caldeira Knabben
*
* Licensed under the terms of the GNU Lesser General Public License:
* http://www.opensource.org/licenses/lgpl-license.php
@@ -11,9 +11,6 @@
* File Name: fck_link.js
* Scripts related to the Link dialog window (see fck_link.html).
*
- * Version: 2.0 RC3
- * Modified: 2005-02-09 13:53:13
- *
* File Authors:
* Frederico Caldeira Knabben (address@hidden)
*/
@@ -21,14 +18,20 @@
var oEditor = window.parent.InnerDialogLoaded() ;
var FCK = oEditor.FCK ;
var FCKLang = oEditor.FCKLang ;
+var FCKConfig = oEditor.FCKConfig ;
//#### Dialog Tabs
// Set the dialog tabs.
window.parent.AddTab( 'Info', FCKLang.DlgLnkInfoTab ) ;
+
+if ( !FCKConfig.LinkDlgHideTarget )
window.parent.AddTab( 'Target', FCKLang.DlgLnkTargetTab, true ) ;
-// TODO : Enable File Upload (1/3).
-//window.parent.AddTab( 'Upload', 'Upload', true ) ;
+
+if ( FCKConfig.LinkUpload )
+ window.parent.AddTab( 'Upload', FCKLang.DlgLnkUpload, true ) ;
+
+if ( !FCKConfig.LinkDlgHideAdvanced )
window.parent.AddTab( 'Advanced', FCKLang.DlgAdvancedTag ) ;
// Function called when a dialog tag is selected.
@@ -36,8 +39,7 @@
{
ShowE('divInfo' , ( tabCode == 'Info' ) ) ;
ShowE('divTarget' , ( tabCode == 'Target' ) ) ;
-// TODO : Enable File Upload (2/3).
-// ShowE('divUpload' , ( tabCode == 'Upload' ) ) ;
+ ShowE('divUpload' , ( tabCode == 'Upload' ) ) ;
ShowE('divAttribs' , ( tabCode == 'Advanced' ) ) ;
}
@@ -117,7 +119,7 @@
// oLink: The actual selected link in the editor.
var oLink = FCK.Selection.MoveToAncestorNode( 'A' ) ;
if ( oLink )
- FCK.Selection.MoveToNode( oLink ) ;
+ FCK.Selection.SelectNode( oLink ) ;
window.onload = function()
{
@@ -134,11 +136,15 @@
SetLinkType( GetE('cmbLinkType').value ) ;
// Show/Hide the "Browse Server" button.
- GetE('divBrowseServer').style.display = oEditor.FCKConfig.LinkBrowser ?
'' : 'none' ;
+ GetE('divBrowseServer').style.display = FCKConfig.LinkBrowser ? '' :
'none' ;
// Show the initial dialog content.
GetE('divInfo').style.display = '' ;
+ // Set the actual uploader URL.
+ if ( FCKConfig.LinkUpload )
+ GetE('frmUpload').action = FCKConfig.LinkUploadURL ;
+
// Activate the "OK" button.
window.parent.SetOkButton( true ) ;
}
@@ -281,9 +287,13 @@
ShowE('divLinkTypeAnchor' , (linkType == 'anchor') ) ;
ShowE('divLinkTypeEMail' , (linkType == 'email') ) ;
+ if ( !FCKConfig.LinkDlgHideTarget )
window.parent.SetTabVisibility( 'Target' , (linkType == 'url') )
;
-// TODO : Enable File Upload (3/3).
-// window.parent.SetTabVisibility( 'Upload' , (linkType == 'url') )
;
+
+ if ( FCKConfig.LinkUpload )
+ window.parent.SetTabVisibility( 'Upload' , (linkType ==
'url') ) ;
+
+ if ( !FCKConfig.LinkDlgHideAdvanced )
window.parent.SetTabVisibility( 'Advanced' , (linkType != 'anchor'
|| bHasAnchors) ) ;
if ( linkType == 'email' )
@@ -452,7 +462,10 @@
}
if ( oLink ) // Modifying an existent link.
+ {
+ oEditor.FCKUndo.SaveUndoStep() ;
oLink.href = sUri ;
+ }
else // Creating a new link.
{
oLink = oEditor.FCK.CreateLink( sUri ) ;
@@ -489,8 +502,8 @@
function BrowseServer()
{
// Set the browser window feature.
- var iWidth = oEditor.FCKConfig.LinkBrowserWindowWidth ;
- var iHeight = oEditor.FCKConfig.LinkBrowserWindowHeight ;
+ var iWidth = FCKConfig.LinkBrowserWindowWidth ;
+ var iHeight = FCKConfig.LinkBrowserWindowHeight ;
var iLeft = (screen.width - iWidth) / 2 ;
var iTop = (screen.height - iHeight) / 2 ;
@@ -502,11 +515,66 @@
sOptions += ",top=" + iTop ;
// Open the browser window.
- var oWindow = window.open( oEditor.FCKConfig.LinkBrowserURL,
"FCKBrowseWindow", sOptions ) ;
+ var oWindow = window.open( FCKConfig.LinkBrowserURL, "FCKBrowseWindow",
sOptions ) ;
}
function SetUrl( url )
{
document.getElementById('txtUrl').value = url ;
OnUrlChange() ;
+ window.parent.SetSelectedTab( 'Info' ) ;
+}
+
+function OnUploadCompleted( errorNumber, fileUrl, fileName, customMsg )
+{
+ switch ( errorNumber )
+ {
+ case 0 : // No errors
+ alert( 'Your file has been successfully uploaded' ) ;
+ break ;
+ case 1 : // Custom error
+ alert( customMsg ) ;
+ return ;
+ case 101 : // Custom warning
+ alert( customMsg ) ;
+ break ;
+ case 201 :
+ alert( 'A file with the same name is already available.
The uploaded file has been renamed to "' + fileName + '"' ) ;
+ break ;
+ case 202 :
+ alert( 'Invalid file type' ) ;
+ return ;
+ case 203 :
+ alert( "Security error. You probably don't have enough
permissions to upload. Please check your server." ) ;
+ return ;
+ default :
+ alert( 'Error on file upload. Error number: ' +
errorNumber ) ;
+ return ;
+ }
+
+ SetUrl( fileUrl ) ;
+ GetE('frmUpload').reset() ;
+}
+
+var oUploadAllowedExtRegex = new RegExp(
FCKConfig.LinkUploadAllowedExtensions, 'i' ) ;
+var oUploadDeniedExtRegex = new RegExp(
FCKConfig.LinkUploadDeniedExtensions, 'i' ) ;
+
+function CheckUpload()
+{
+ var sFile = GetE('txtUploadFile').value ;
+
+ if ( sFile.length == 0 )
+ {
+ alert( 'Please select a file to upload' ) ;
+ return false ;
+ }
+
+ if ( ( FCKConfig.LinkUploadAllowedExtensions.length > 0 &&
!oUploadAllowedExtRegex.test( sFile ) ) ||
+ ( FCKConfig.LinkUploadDeniedExtensions.length > 0 &&
oUploadDeniedExtRegex.test( sFile ) ) )
+ {
+ OnUploadCompleted( 202 ) ;
+ return false ;
+ }
+
+ return true ;
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] news_admin/js/fckeditor/editor/dialog/fck_link fck_link.js, 1.2,
skwashd <=
- Prev by Date:
[Phpgroupware-cvs] news_admin/js/fckeditor/editor/lang ar.js, 1.2 bg.js, 1.2 bs.js, 1.2 ca.js, 1.2 cs.js, 1.2 da.js, 1.2 th.js, 1.2 sv.js, 1.2 tr.js, 1.2 zh-cn.js, 1.2 zh.js, 1.2 sr.js, 1.2 sr-latn.js, 1.2 fr.js, 1.2 fi.js, 1.2 gl.js, 1.2 he.js, 1.2 hr.js, 1.2 fcklanguagemanager.js, 1.2 fa.js, 1.2 en.js, 1.2 de.js, 1.2 eo.js, 1.2 es.js, 1.2 et.js, 1.2 hu.js, 1.2 it.js, 1.2 ro.js, 1.2 pt.js, 1.2 ru.js, 1.2 sk.js, 1.2 sl.js, 1.2 pt-br.js, 1.2 pl.js, 1.2 ko.js, 1.2 ja.js, 1.2 lt.js, 1.2 nl.js, 1.2 no.js, 1.2
- Next by Date:
[Phpgroupware-cvs] news_admin/js/fckeditor/editor/css fck_internal.css, 1.2 fck_editorarea.css, 1.2
- Previous by thread:
[Phpgroupware-cvs] news_admin/js/fckeditor/editor/lang ar.js, 1.2 bg.js, 1.2 bs.js, 1.2 ca.js, 1.2 cs.js, 1.2 da.js, 1.2 th.js, 1.2 sv.js, 1.2 tr.js, 1.2 zh-cn.js, 1.2 zh.js, 1.2 sr.js, 1.2 sr-latn.js, 1.2 fr.js, 1.2 fi.js, 1.2 gl.js, 1.2 he.js, 1.2 hr.js, 1.2 fcklanguagemanager.js, 1.2 fa.js, 1.2 en.js, 1.2 de.js, 1.2 eo.js, 1.2 es.js, 1.2 et.js, 1.2 hu.js, 1.2 it.js, 1.2 ro.js, 1.2 pt.js, 1.2 ru.js, 1.2 sk.js, 1.2 sl.js, 1.2 pt-br.js, 1.2 pl.js, 1.2 ko.js, 1.2 ja.js, 1.2 lt.js, 1.2 nl.js, 1.2 no.js, 1.2
- Next by thread:
[Phpgroupware-cvs] news_admin/js/fckeditor/editor/css fck_internal.css, 1.2 fck_editorarea.css, 1.2
- Index(es):