Index: lams_central/web/fckeditor/fckconfig.js
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/fckeditor/Attic/fckconfig.js,v
diff -u -r1.1 -r1.2
--- lams_central/web/fckeditor/fckconfig.js 11 Aug 2005 06:26:06 -0000 1.1
+++ lams_central/web/fckeditor/fckconfig.js 15 Aug 2005 06:33:30 -0000 1.2
@@ -38,8 +38,8 @@
FCKConfig.DefaultLanguage = 'en' ;
FCKConfig.ContentLangDirection = 'ltr' ;
-FCKConfig.EnableXHTML = true ;
-FCKConfig.EnableSourceXHTML = true ;
+FCKConfig.EnableXHTML = true ; // Unsupported: Do not change.
+FCKConfig.EnableSourceXHTML = true ; // Unsupported: Do not change.
FCKConfig.ProcessHTMLEntities = true ;
FCKConfig.IncludeLatinEntities = true ;
@@ -60,16 +60,18 @@
FCKConfig.UseBROnCarriageReturn = false ;
FCKConfig.ToolbarStartExpanded = false ;
FCKConfig.ToolbarCanCollapse = true ;
+FCKConfig.IEForceVScroll = false ;
+FCKConfig.IgnoreEmptyParagraphValue = true ;
-FCKConfig.ToolbarSets["Default_original"] = [
+FCKConfig.ToolbarSets["Default"] = [
['Source','DocProps','-','Save','NewPage','Preview','-','Templates'],
['Cut','Copy','Paste','PasteText','PasteWord','-','Print','SpellCheck'],
['Undo','Redo','-','Find','Replace','-','SelectAll','RemoveFormat'],
['Bold','Italic','Underline','StrikeThrough','-','Subscript','Superscript'],
['OrderedList','UnorderedList','-','Outdent','Indent'],
['JustifyLeft','JustifyCenter','JustifyRight','JustifyFull'],
['Link','Unlink','Anchor'],
- ['Image','Table','Rule','Smiley','SpecialChar','UniversalKey'],
+ ['Image','Flash','Table','Rule','Smiley','SpecialChar','UniversalKey'],
['Form','Checkbox','Radio','TextField','Textarea','Select','Button','ImageButton','HiddenField'],
'/',
['Style','FontFormat','FontName','FontSize'],
@@ -81,7 +83,7 @@
['Bold','Italic','-','OrderedList','UnorderedList','-','Link','Unlink','-','About']
] ;
-FCKConfig.ToolbarSets["Default"] = [
+FCKConfig.ToolbarSets["Default_lams"] = [
['Source','-','NewPage','Preview','-','Templates'],
['Cut','Copy','Paste','PasteText','PasteWord','-','Print','SpellCheck'],
['Undo','Redo','-','Find','Replace','-','SelectAll','RemoveFormat'],
@@ -92,7 +94,7 @@
['Style','FontFormat','FontName','FontSize']
] ;
-FCKConfig.ContextMenu = ['Generic','Link','Anchor','Image','Select','Textarea','Checkbox','Radio','TextField','HiddenField','ImageButton','Button','BulletedList','NumberedList','TableCell','Table','Form'] ;
+FCKConfig.ContextMenu = ['Generic','Link','Anchor','Image','Flash','Select','Textarea','Checkbox','Radio','TextField','HiddenField','ImageButton','Button','BulletedList','NumberedList','TableCell','Table','Form'] ;
FCKConfig.FontColors = '000000,993300,333300,003300,003366,000080,333399,333333,800000,FF6600,808000,808080,008080,0000FF,666699,808080,FF0000,FF9900,99CC00,339966,33CCCC,3366FF,800080,999999,FF00FF,FFCC00,FFFF00,00FF00,00FFFF,00CCFF,993366,C0C0C0,FF99CC,FFCC99,FFFF99,CCFFCC,CCFFFF,99CCFF,CC99FF,FFFFFF' ;
@@ -108,15 +110,19 @@
FCKConfig.MaxUndoLevels = 15 ;
+FCKConfig.DisableImageHandles = false ;
+FCKConfig.DisableTableHandles = false ;
+
FCKConfig.LinkDlgHideTarget = false ;
FCKConfig.LinkDlgHideAdvanced = false ;
FCKConfig.ImageDlgHideLink = false ;
FCKConfig.ImageDlgHideAdvanced = false ;
+FCKConfig.FlashDlgHideAdvanced = false ;
+
FCKConfig.LinkBrowser = true ;
FCKConfig.LinkBrowserURL = FCKConfig.BasePath + "filemanager/browser/default/browser.html?Connector=connectors/jsp/connector" ;
-
//FCKConfig.LinkBrowserURL = FCKConfig.BasePath + 'filemanager/browser/default/browser.html?Connector=connectors/asp/connector.asp' ;
//FCKConfig.LinkBrowserURL = FCKConfig.BasePath + 'filemanager/browser/default/browser.html?Connector=connectors/asp/connector.asp&ServerPath=/CustomFiles/' ;
// ASP.Net // FCKConfig.LinkBrowserURL = FCKConfig.BasePath + 'filemanager/browser/default/browser.html?Connector=connectors/aspx/connector.aspx' ;
@@ -128,11 +134,8 @@
FCKConfig.LinkBrowserWindowHeight = screen.height * 0.7 ; // 70%
FCKConfig.ImageBrowser = true ;
+FCKConfig.ImageBrowserURL = FCKConfig.BasePath + "filemanager/browser/default/browser.html?Type=Image&Connector=connectors/jsp/connector" ;
//FCKConfig.ImageBrowserURL = FCKConfig.BasePath + 'filemanager/browser/default/browser.html?Type=Image&Connector=connectors/asp/connector.asp' ;
-//JSP
-FCKConfig.imageBrowserURL= FCKConfig.BasePath + 'filemanager/browser/default/browser.html?Type=Image&Connector=connectors/jsp/connector';
-
-
// ASP.Net // FCKConfig.ImageBrowserURL = FCKConfig.BasePath + 'filemanager/browser/default/browser.html?Type=Image&Connector=connectors/aspx/connector.aspx' ;
// ColdFusion // FCKConfig.ImageBrowserURL = FCKConfig.BasePath + 'filemanager/browser/default/browser.html?Type=Image&Connector=connectors/cfm/connector.cfm' ;
// Perl // FCKConfig.ImageBrowserURL = FCKConfig.BasePath + 'filemanager/browser/default/browser.html?Type=Image&Connector=connectors/perl/connector.cgi' ;
@@ -141,8 +144,43 @@
FCKConfig.ImageBrowserWindowWidth = screen.width * 0.7 ; // 70% ;
FCKConfig.ImageBrowserWindowHeight = screen.height * 0.7 ; // 70% ;
+
+FCKConfig.FlashBrowser = true ;
+FCKConfig.FlashBrowserURL = FCKConfig.BasePath + "filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/jsp/connector" ;
+//FCKConfig.FlashBrowserURL = FCKConfig.BasePath + 'filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/asp/connector.asp' ;
+// ASP.Net // FCKConfig.FlashBrowserURL = FCKConfig.BasePath + 'filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/aspx/connector.aspx' ;
+// ColdFusion // FCKConfig.FlashBrowserURL = FCKConfig.BasePath + 'filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/cfm/connector.cfm' ;
+// Perl // FCKConfig.FlashBrowserURL = FCKConfig.BasePath + 'filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/perl/connector.cgi' ;
+// PHP // FCKConfig.FlashBrowserURL = FCKConfig.BasePath + 'filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/php/connector.php' ;
+// PHP - mcpuk // FCKConfig.FlashBrowserURL = FCKConfig.BasePath + 'filemanager/browser/mcpuk/browser.html?Type=Flash&Connector=connectors/php/connector.php' ;
+FCKConfig.FlashBrowserWindowWidth = screen.width * 0.7 ; //70% ;
+FCKConfig.FlashBrowserWindowHeight = screen.height * 0.7 ; //70% ;
+
+FCKConfig.LinkUpload = true ;
+FCKConfig.LinkUploadURL = FCKConfig.BasePath + 'filemanager/upload/simpleuploader?Type=File' ;
+//FCKConfig.LinkUploadURL = FCKConfig.BasePath + 'filemanager/upload/asp/upload.asp' ;
+// PHP // FCKConfig.LinkUploadURL = FCKConfig.BasePath + 'filemanager/upload/php/upload.php' ;
+FCKConfig.LinkUploadAllowedExtensions = "" ; // empty for all
+FCKConfig.LinkUploadDeniedExtensions = ".(php|php3|php5|phtml|asp|aspx|ascx|jsp|cfm|cfc|pl|bat|exe|dll|reg|cgi)$" ; // empty for no one
+
+FCKConfig.ImageUpload = true ;
+FCKConfig.ImageUploadURL = FCKConfig.BasePath + 'filemanager/upload/simpleuploader?Type=Image' ;
+//FCKConfig.ImageUploadURL = FCKConfig.BasePath + 'filemanager/upload/asp/upload.asp?Type=Image' ;
+// PHP // FCKConfig.ImageUploadURL = FCKConfig.BasePath + 'filemanager/upload/php/upload.php?Type=Image' ;
+FCKConfig.ImageUploadAllowedExtensions = ".(jpg|gif|jpeg|png)$" ; // empty for all
+FCKConfig.ImageUploadDeniedExtensions = "" ; // empty for no one
+
+FCKConfig.FlashUpload = true ;
+FCKConfig.FlashUploadURL = FCKConfig.BasePath + 'filemanager/upload/simpleuploader?Type=Flash' ;
+//FCKConfig.FlashUploadURL = FCKConfig.BasePath + 'filemanager/upload/asp/upload.asp?Type=Flash' ;
+// PHP // FCKConfig.FlashUploadURL = FCKConfig.BasePath + 'filemanager/upload/php/upload.php?Type=Flash' ;
+FCKConfig.FlashUploadAllowedExtensions = ".(swf|fla)$" ; // empty for all
+FCKConfig.FlashUploadDeniedExtensions = "" ; // empty for no one
+
FCKConfig.SmileyPath = FCKConfig.BasePath + 'images/smiley/msn/' ;
FCKConfig.SmileyImages = ['regular_smile.gif','sad_smile.gif','wink_smile.gif','teeth_smile.gif','confused_smile.gif','tounge_smile.gif','embaressed_smile.gif','omg_smile.gif','whatchutalkingabout_smile.gif','angry_smile.gif','angel_smile.gif','shades_smile.gif','devil_smile.gif','cry_smile.gif','lightbulb.gif','thumbs_down.gif','thumbs_up.gif','heart.gif','broken_heart.gif','kiss.gif','envelope.gif'] ;
FCKConfig.SmileyColumns = 8 ;
FCKConfig.SmileyWindowWidth = 320 ;
-FCKConfig.SmileyWindowHeight = 240 ;
\ No newline at end of file
+FCKConfig.SmileyWindowHeight = 240 ;
+
+if( window.console ) window.console.log( 'Config is loaded!' ) ; // @Packager.Compactor.RemoveLine
\ No newline at end of file
Index: lams_central/web/fckeditor/fckeditor.js
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/fckeditor/Attic/fckeditor.js,v
diff -u -r1.1 -r1.2
--- lams_central/web/fckeditor/fckeditor.js 11 Aug 2005 06:26:06 -0000 1.1
+++ lams_central/web/fckeditor/fckeditor.js 15 Aug 2005 06:33:30 -0000 1.2
@@ -1,4 +1,4 @@
-/*
+/*
* FCKeditor - The text editor for internet
* Copyright (C) 2003-2005 Frederico Caldeira Knabben
*
@@ -31,6 +31,7 @@
this.BasePath = '/fckeditor/' ;
this.CheckBrowser = true ;
this.DisplayErrors = true ;
+ this.EnableSafari = false ; // This is a temporary property, while Safari support is under development.
this.Config = new Object() ;
@@ -132,6 +133,9 @@
// Gecko
else if ( navigator.product == "Gecko" && navigator.productSub >= 20030210 )
return true ;
+ // Safari
+ else if ( this.EnableSafari && sAgent.indexOf( 'safari' ) != -1 )
+ return ( sAgent.match( /safari\/(\d+)/ )[1] >= 312 ) ; // Build must be at least 312 (1.3)
else
return false ;
}
Index: lams_central/web/fckeditor/fcktemplates.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/fckeditor/Attic/fcktemplates.xml,v
diff -u -r1.1 -r1.2
--- lams_central/web/fckeditor/fcktemplates.xml 11 Aug 2005 06:26:06 -0000 1.1
+++ lams_central/web/fckeditor/fcktemplates.xml 15 Aug 2005 06:33:30 -0000 1.2
@@ -40,38 +40,38 @@
-
Table title | -||
- | - | - |
- | - | - |
- | - | - |
- | - | - |
+ Title goes here++
|
' ) + var sXHTML = '' ; + else + var sXHTML = FCKXHtml.GetXHTML( this.EditorDocument.body, false, format ) ; + } if ( bSource ) this.SwitchEditMode() ; @@ -211,3 +216,109 @@ { FCK.RegisteredDoubleClickHandlers[ tag.toUpperCase() ] = handlerFunction ; } + +FCK.OnAfterSetHTML = function() +{ + var oProcessor, i = 0 ; + while( oProcessor = FCKDocumentProcessors[i++] ) + oProcessor.ProcessDocument( FCK.EditorDocument ) ; + + this.Events.FireEvent( 'OnAfterSetHTML' ) ; +} + +// Advanced document processors. + +var FCKDocumentProcessors = new Array() ; + +var FCKDocumentProcessors_CreateFakeImage = function( fakeClass, realElement ) +{ + var oImg = FCK.EditorDocument.createElement( 'IMG' ) ; + oImg.className = fakeClass ; + oImg.src = FCKConfig.FullBasePath + 'images/spacer.gif' ; + oImg.setAttribute( '_fckfakelement', 'true', 0 ) ; + oImg.setAttribute( '_fckrealelement', FCKTempBin.AddElement( realElement ), 0 ) ; + return oImg ; +} + +// Link Anchors +var FCKAnchorsProcessor = new Object() ; +FCKAnchorsProcessor.ProcessDocument = function( document ) +{ + var aLinks = document.getElementsByTagName( 'A' ) ; + + var oLink ; + var i = aLinks.length - 1 ; + while ( i >= 0 && ( oLink = aLinks[i--] ) ) + { + // If it is anchor. + if ( oLink.name.length > 0 && ( !oLink.getAttribute('href') || oLink.getAttribute('href').length == 0 ) ) + { + var oImg = FCKDocumentProcessors_CreateFakeImage( 'FCK__Anchor', oLink.cloneNode(true) ) ; + oImg.setAttribute( '_fckanchor', 'true', 0 ) ; + + oLink.parentNode.insertBefore( oImg, oLink ) ; + oLink.parentNode.removeChild( oLink ) ; + } + } +} + +FCKDocumentProcessors.addItem( FCKAnchorsProcessor ) ; + +// Flash Embeds. +var FCKFlashProcessor = new Object() ; +FCKFlashProcessor.ProcessDocument = function( document ) +{ + /* + Sample code: + This is some sample text. You are using FCKeditor. + */ + + var aEmbeds = document.getElementsByTagName( 'EMBED' ) ; + + var oEmbed ; + var i = aEmbeds.length - 1 ; + while ( i >= 0 && ( oEmbed = aEmbeds[i--] ) ) + { + if ( oEmbed.src.endsWith( '.swf', true ) ) + { + var oImg = FCKDocumentProcessors_CreateFakeImage( 'FCK__Flash', oEmbed.cloneNode(true) ) ; + oImg.setAttribute( '_fckflash', 'true', 0 ) ; + + FCKFlashProcessor.RefreshView( oImg, oEmbed ) ; + + oEmbed.parentNode.insertBefore( oImg, oEmbed ) ; + oEmbed.parentNode.removeChild( oEmbed ) ; + +// oEmbed.setAttribute( '_fckdelete', 'true', 0) ; +// oEmbed.style.display = 'none' ; +// oEmbed.hidden = true ; + } + } +} + +FCKFlashProcessor.RefreshView = function( placholderImage, originalEmbed ) +{ + if ( originalEmbed.width > 0 ) + placholderImage.style.width = FCKTools.ConvertHtmlSizeToStyle( originalEmbed.width ) ; + + if ( originalEmbed.height > 0 ) + placholderImage.style.height = FCKTools.ConvertHtmlSizeToStyle( originalEmbed.height ) ; +} + +FCKDocumentProcessors.addItem( FCKFlashProcessor ) ; + +FCK.GetRealElement = function( fakeElement ) +{ + var e = FCKTempBin.Elements[ fakeElement.getAttribute('_fckrealelement') ] ; + + if ( fakeElement.getAttribute('_fckflash') ) + { + if ( fakeElement.style.width.length > 0 ) + e.width = FCKTools.ConvertStyleSizeToHtml( fakeElement.style.width ) ; + + if ( fakeElement.style.height.length > 0 ) + e.height = FCKTools.ConvertStyleSizeToHtml( fakeElement.style.height ) ; + } + + return e ; +} \ No newline at end of file Index: lams_central/web/fckeditor/editor/_source/internals/fck_1_gecko.js =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/fckeditor/editor/_source/internals/Attic/fck_1_gecko.js,v diff -u -r1.1 -r1.2 --- lams_central/web/fckeditor/editor/_source/internals/fck_1_gecko.js 11 Aug 2005 06:26:03 -0000 1.1 +++ lams_central/web/fckeditor/editor/_source/internals/fck_1_gecko.js 15 Aug 2005 06:33:28 -0000 1.2 @@ -21,6 +21,13 @@ FCK.InitializeBehaviors = function() { + // Enable table borders visibility. + if ( FCKConfig.ShowBorders ) + { + var oStyle = FCKTools.AppendStyleSheet( this.EditorDocument, FCKConfig.FullBasePath + 'css/fck_showtableborders_gecko.css' ) ; + oStyle.setAttribute( '_fcktemp', 'true' ) ; + } + // Disable Right-Click var oOnContextMenu = function( e ) { @@ -29,32 +36,23 @@ } this.EditorDocument.addEventListener( 'contextmenu', oOnContextMenu, true ) ; - /* - TODO: - This is not working... on Gecko there is no "OnPaste" event that - can prevent the user to paste. - I've tried with the OnKeyDown event for the "CTRL-V" key "down", but the - paste still occours (preventDefault does nothing in this case). - + // Handle pasting operations. var oOnKeyDown = function( e ) { if ( e.ctrlKey && !e.shiftKey && !e.altKey ) { // Char 86/118 = V/v if ( e.which == 86 || e.which == 118 ) { - if ( FCK.Status == FCK_STATUS_COMPLETE ) + if ( FCK.Status != FCK_STATUS_COMPLETE || !FCK.Events.FireEvent( "OnPaste" ) ) { - if ( !FCK.Events.FireEvent( "OnPaste" ) ) - e.preventDefault() ; - } - else e.preventDefault() ; + e.stopPropagation() ; + } } } } - this.EditorDocument.addEventListener( 'keydown', oOnKeyDown, true ) ; - */ + this.EditorDocument.addEventListener( 'keypress', oOnKeyDown, true ) ; this.ExecOnSelectionChange = function() { @@ -161,7 +159,7 @@ this._Initialized = true ; } - + this.EditorDocument.open() ; this.EditorDocument.write( sHtml ) ; this.EditorDocument.close() ; @@ -187,38 +185,43 @@ sHtml += '