system to clip the image correctly. eIcon = document.createElement( 'DIV' ) ; - - var eIconImage = eIcon.appendChild( document.createElement( 'IMG' ) ) ; + + eIconImage = eIcon.appendChild( document.createElement( 'IMG' ) ) ; eIconImage.src = this.Path ? this.Path : FCK_SPACER_PATH ; } - + eIcon.className = 'TB_Button_Image' ; Index: /FCKeditor/branches/developers/alfonsoml/editor/_source/classes/fckiecleanup.js =================================================================== --- /FCKeditor/branches/developers/alfonsoml/editor/_source/classes/fckiecleanup.js (revision 140) +++ /FCKeditor/branches/developers/alfonsoml/editor/_source/classes/fckiecleanup.js (revision 141) @@ -1,10 +1,24 @@ -/* @Packager.Header - - FCKIECleanup Class: a generic class used as a tool to remove IE leaks. - - -*/ - -// V3 // @Packager.RemoveLine +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * FCKIECleanup Class: a generic class used as a tool to remove IE leaks. + */ var FCKIECleanup = function( attachWindow ) @@ -22,10 +36,10 @@ } } - + FCKIECleanup.prototype.AddItem = function( dirtyItem, cleanupFunction ) { this.Items.push( [ dirtyItem, cleanupFunction ] ) ; } - + function FCKIECleanup_Cleanup() { @@ -34,11 +48,11 @@ var aItems = this._FCKCleanupObj.Items ; - + while ( aItems.length > 0 ) { - + // It is important to remove from the end to the beginning (pop()), // because of the order things get created in the editor. In the code, - // elements in deeper position in the DOm are placed in the end of the + // elements in deeper position in the DOM are placed at the end of the // cleanup function, so we must cleanup then first, otherwise IE could // throw some crazy memory errors (IE bug). @@ -47,7 +61,7 @@ oItem[1].call( oItem[0] ) ; } - + this._FCKCleanupObj = null ; - + if ( CollectGarbage ) CollectGarbage() ; Index: /FCKeditor/branches/developers/alfonsoml/editor/_source/classes/fckimagepreloader.js =================================================================== --- /FCKeditor/branches/developers/alfonsoml/editor/_source/classes/fckimagepreloader.js (revision 140) +++ /FCKeditor/branches/developers/alfonsoml/editor/_source/classes/fckimagepreloader.js (revision 141) @@ -1,8 +1,31 @@ -var FCKImagePreloader = function() +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * Preload a list of images, firing an event when complete. + */ + +var FCKImagePreloader = function() { this._Images = new Array() ; } -FCKImagePreloader.prototype = +FCKImagePreloader.prototype = { AddImages : function( images ) @@ -10,13 +33,13 @@ if ( typeof( images ) == 'string' ) images = images.split( ';' ) ; - + this._Images = this._Images.concat( images ) ; }, - + Start : function() { var aImages = this._Images ; this._PreloadCount = aImages.length ; - + for ( var i = 0 ; i < aImages.length ; i++ ) { @@ -25,5 +48,5 @@ eImg._FCKImagePreloader = this ; eImg.src = aImages[i] ; - + _FCKImagePreloader_ImageCache.push( eImg ) ; } @@ -38,5 +61,5 @@ { var oImagePreloader = this._FCKImagePreloader ; - + if ( (--oImagePreloader._PreloadCount) == 0 && oImagePreloader.OnComplete ) oImagePreloader.OnComplete() ; Index: /FCKeditor/branches/developers/alfonsoml/editor/_source/classes/fckkeystrokehandler.js =================================================================== --- /FCKeditor/branches/developers/alfonsoml/editor/_source/classes/fckkeystrokehandler.js (revision 140) +++ /FCKeditor/branches/developers/alfonsoml/editor/_source/classes/fckkeystrokehandler.js (revision 141) @@ -1,8 +1,24 @@ -/* @Packager.Header - - Control keyboard keystroke combinations. - - -*/ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * Control keyboard keystroke combinations. + */ var FCKKeystrokeHandler = function( cancelCtrlDefaults ) @@ -18,5 +34,5 @@ FCKKeystrokeHandler.prototype.AttachToElement = function( target ) { - // For newer browsers, it is enough to listen to the keydown event only. + // For newer browsers, it is enough to listen to the keydown event only. // Some browsers instead, don't cancel key events in the keydown, but in the // keypress. So we must do a longer trip in those cases. @@ -38,5 +54,5 @@ { var keyDef = arguments[i] ; - + if ( typeof( keyDef[0] ) == 'object' ) // It is an array with arrays defining the keystrokes. this.SetKeystrokes.apply( this, keyDef ) ; @@ -58,23 +74,23 @@ // Combine it with the CTRL, SHIFT and ALT states. var keyModifiers = 0 ; - + if ( ev.ctrlKey || ev.metaKey ) keyModifiers += CTRL ; - + if ( ev.shiftKey ) keyModifiers += SHIFT ; - + if ( ev.altKey ) keyModifiers += ALT ; var keyCombination = keystroke + keyModifiers ; - + var cancelIt = keystrokeHandler._CancelIt = false ; - + // Look for its definition availability. var keystrokeValue = keystrokeHandler.Keystrokes[ keyCombination ] ; - + // FCKDebug.Output( 'KeyDown: ' + keyCombination + ' - Value: ' + keystrokeValue ) ; - + // If the keystroke is defined if ( keystrokeValue ) @@ -96,5 +112,5 @@ if ( ev.preventDefault ) return ev.preventDefault() ; - + ev.returnValue = false ; ev.cancelBubble = true ; Index: /FCKeditor/branches/developers/alfonsoml/editor/_source/classes/fckmenublock.js =================================================================== --- /FCKeditor/branches/developers/alfonsoml/editor/_source/classes/fckmenublock.js (revision 140) +++ /FCKeditor/branches/developers/alfonsoml/editor/_source/classes/fckmenublock.js (revision 141) @@ -1,10 +1,24 @@ -/* @Packager.Header - - Renders a list of menu items. - - -*/ - -// V3 // @Packager.RemoveLine +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * Renders a list of menu items. + */ var FCKMenuBlock = function() @@ -23,8 +37,8 @@ { var oItem = new FCKMenuItem( this, name, label, iconPathOrStripInfoArrayOrIndex, isDisabled ) ; - + oItem.OnClick = FCKTools.CreateEventListener( FCKMenuBlock_Item_OnClick, this ) ; oItem.OnActivate = FCKTools.CreateEventListener( FCKMenuBlock_Item_OnActivate, this ) ; - + this._Items.push( oItem ) ; @@ -40,5 +54,5 @@ { this._Items = new Array() ; - + var eItemsTable = this._ItemsTable ; if ( eItemsTable ) @@ -65,13 +79,13 @@ FCKTools.DisableSelection( eTable ) ; - + var oMainElement = eTable.insertRow(-1).insertCell(-1) ; oMainElement.className = 'MN_Menu' ; - + var eItemsTable = this._ItemsTable = oMainElement.appendChild( oDoc.createElement( 'table' ) ) ; eItemsTable.cellPadding = 0 ; - eItemsTable.cellSpacing = 0 ; + eItemsTable.cellSpacing = 0 ; } - + for ( var i = 0 ; i < this._Items.length ; i++ ) this._Items[i].Create( this._ItemsTable ) ; @@ -88,5 +102,5 @@ { var oActiveItem = menuBlock._ActiveItem ; - + if ( oActiveItem && oActiveItem != this ) { @@ -95,5 +109,5 @@ menuBlock._Window.focus() ; - oActiveItem.Deactivate() ; + oActiveItem.Deactivate() ; } @@ -117,5 +131,5 @@ var r = parentTable.insertRow(-1) ; - + var eCell = r.insertCell(-1) ; eCell.className = 'MN_Separator MN_Icon' ; Index: /FCKeditor/branches/developers/alfonsoml/editor/_source/classes/fckmenublockpanel.js =================================================================== --- /FCKeditor/branches/developers/alfonsoml/editor/_source/classes/fckmenublockpanel.js (revision 140) +++ /FCKeditor/branches/developers/alfonsoml/editor/_source/classes/fckmenublockpanel.js (revision 141) @@ -1,11 +1,25 @@ -/* @Packager.Header - - This class is a menu block that behaves like a panel. It's a mix of the - FCKMenuBlock and FCKPanel classes. - - -*/ - -// V3 // @Packager.RemoveLine +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * This class is a menu block that behaves like a panel. It's a mix of the + * FCKMenuBlock and FCKPanel classes. + */ var FCKMenuBlockPanel = function() Index: /FCKeditor/branches/developers/alfonsoml/editor/_source/classes/fckmenuitem.js =================================================================== --- /FCKeditor/branches/developers/alfonsoml/editor/_source/classes/fckmenuitem.js (revision 140) +++ /FCKeditor/branches/developers/alfonsoml/editor/_source/classes/fckmenuitem.js (revision 141) @@ -1,10 +1,24 @@ -/* @Packager.Header - - Defines and renders a menu items in a menu block. - - -*/ - -// V3 // @Packager.RemoveLine +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * Defines and renders a menu items in a menu block. + */ var FCKMenuItem = function( parentMenuBlock, name, label, iconPathOrStripInfoArray, isDisabled ) @@ -13,7 +27,7 @@ this.Label = label || name ; this.IsDisabled = isDisabled ; - + this.Icon = new FCKIcon( iconPathOrStripInfoArray ) ; - + this.SubMenu = new FCKMenuBlockPanel() ; this.SubMenu.Parent = parentMenuBlock ; @@ -40,5 +54,5 @@ { var bHasSubMenu = this.HasSubMenu ; - + var oDoc = FCKTools.GetElementDocument( parentTable ) ; @@ -56,5 +70,5 @@ FCKTools.AddEventListenerEx( r, 'mouseout', FCKMenuItem_OnMouseOut, [ this ] ) ; } - + // Create the icon cell. var eCell = r.insertCell(-1) ; @@ -67,5 +81,5 @@ eCell.noWrap = true ; eCell.appendChild( oDoc.createTextNode( this.Label ) ) ; - + // Create the arrow cell and setup the sub menu panel (if needed). eCell = r.insertCell(-1) ; @@ -79,5 +93,5 @@ eArrowImg.width = 4 ; eArrowImg.height = 7 ; - + this.SubMenu.Create() ; this.SubMenu.Panel.OnHide = FCKTools.CreateEventListener( FCKMenuItem_SubMenu_OnHide, this ) ; Index: /FCKeditor/branches/developers/alfonsoml/editor/_source/classes/fckpanel.js =================================================================== --- /FCKeditor/branches/developers/alfonsoml/editor/_source/classes/fckpanel.js (revision 140) +++ /FCKeditor/branches/developers/alfonsoml/editor/_source/classes/fckpanel.js (revision 141) @@ -1,11 +1,25 @@ -/* @Packager.Header - - Component that creates floating panels. It is used by many - other components, like the toolbar items, context menu, etc... - - -*/ - -// V3 // @Packager.RemoveLine +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * Component that creates floating panels. It is used by many + * other components, like the toolbar items, context menu, etc... + */ var FCKPanel = function( parentWindow ) @@ -14,9 +28,9 @@ this.IsContextMenu = false ; this._LockCounter = 0 ; - + this._Window = parentWindow || window ; - + var oDocument ; - + if ( FCKBrowserInfo.IsIE ) { @@ -29,5 +43,5 @@ else { - var oIFrame = this._IFrame = this._Window.document.createElement('iframe') ; + var oIFrame = this._IFrame = this._Window.document.createElement('iframe') ; oIFrame.src = 'javascript:void(0)' ; oIFrame.allowTransparency = true ; @@ -42,7 +56,7 @@ else this._Window.document.body.appendChild( oIFrame ) ; - - var oIFrameWindow = oIFrame.contentWindow ; - + + var oIFrameWindow = oIFrame.contentWindow ; + oDocument = this.Document = oIFrameWindow.document ; @@ -57,5 +71,5 @@ oDocument.dir = FCKLang.Dir ; - + oDocument.oncontextmenu = FCKTools.CancelEvent ; @@ -78,5 +92,5 @@ FCKPanel.prototype.Preload = function( x, y, relElement ) { - // The offsetWidth and offsetHeight properties are not available if the + // The offsetWidth and offsetHeight properties are not available if the // element is not visible. So we must "show" the popup with no size to // be able to use that values in the second call (IE only). @@ -87,17 +101,19 @@ FCKPanel.prototype.Show = function( x, y, relElement, width, height ) { + var iMainWidth ; + if ( this._Popup ) { - // The offsetWidth and offsetHeight properties are not available if the + // The offsetWidth and offsetHeight properties are not available if the // element is not visible. So we must "show" the popup with no size to // be able to use that values in the second call. this._Popup.show( x, y, 0, 0, relElement ) ; - // The following lines must be place after the above "show", otherwise it + // The following lines must be place after the above "show", otherwise it // doesn't has the desired effect. this.MainNode.style.width = width ? width + 'px' : '' ; this.MainNode.style.height = height ? height + 'px' : '' ; - - var iMainWidth = this.MainNode.offsetWidth ; + + iMainWidth = this.MainNode.offsetWidth ; if ( this.IsRTL ) @@ -108,8 +124,8 @@ x = ( x * -1 ) + relElement.offsetWidth - iMainWidth ; } - + // Second call: Show the Popup at the specified location, with the correct size. this._Popup.show( x, y, iMainWidth, this.MainNode.offsetHeight, relElement ) ; - + if ( this.OnHide ) { @@ -132,5 +148,5 @@ this.MainNode.style.height = height ? height + 'px' : '' ; - var iMainWidth = this.MainNode.offsetWidth ; + iMainWidth = this.MainNode.offsetWidth ; if ( !width ) this._IFrame.width = 1 ; @@ -143,7 +159,7 @@ iMainWidth = this.MainNode.offsetWidth ; - var oPos = FCKTools.GetElementPosition( - relElement.nodeType == 9 ? - ( FCKTools.IsStrictMode( relElement ) ? relElement.documentElement : relElement.body ) : + var oPos = FCKTools.GetElementPosition( + relElement.nodeType == 9 ? + ( FCKTools.IsStrictMode( relElement ) ? relElement.documentElement : relElement.body ) : relElement, this._Window ) ; @@ -166,5 +182,5 @@ var oViewPaneSize = FCKTools.GetViewPaneSize( this._Window ) ; var oScrollPosition = FCKTools.GetScrollPosition( this._Window ) ; - + var iViewPaneHeight = oViewPaneSize.Height + oScrollPosition.Y ; var iViewPaneWidth = oViewPaneSize.Width + oScrollPosition.X ; @@ -176,5 +192,5 @@ y -= y + this.MainNode.offsetHeight - iViewPaneHeight ; } - + if ( x < 0 ) x = 0 ; @@ -183,8 +199,8 @@ this._IFrame.style.left = x + 'px' ; this._IFrame.style.top = y + 'px' ; - + var iWidth = iMainWidth ; var iHeight = this.MainNode.offsetHeight ; - + this._IFrame.width = iWidth ; this._IFrame.height = iHeight ; @@ -207,15 +223,15 @@ if ( !this._IsOpened ) return ; - + // Enable the editor to fire the "OnBlur". if ( typeof( FCKFocusManager ) != 'undefined' ) FCKFocusManager.Unlock() ; - // It is better to set the sizes to 0, otherwise Firefox would have + // It is better to set the sizes to 0, otherwise Firefox would have // rendering problems. this._IFrame.width = this._IFrame.height = 0 ; this._IsOpened = false ; - + if ( this.ParentPanel ) this.ParentPanel.Unlock() ; @@ -240,5 +256,5 @@ var oChildPanel = new FCKPanel( oWindow, true ) ; oChildPanel.ParentPanel = this ; - + return oChildPanel ; } @@ -265,5 +281,5 @@ { panel.HasFocus = false ; - + if ( panel._LockCounter == 0 ) FCKTools.RunFunction( panel.Hide, panel ) ; @@ -276,5 +292,5 @@ window.clearInterval( this._Timer ) ; this._Timer = null ; - + FCKTools.RunFunction( this.OnHide, this ) ; } Index: /FCKeditor/branches/developers/alfonsoml/editor/_source/classes/fckplugin.js =================================================================== --- /FCKeditor/branches/developers/alfonsoml/editor/_source/classes/fckplugin.js (revision 140) +++ /FCKeditor/branches/developers/alfonsoml/editor/_source/classes/fckplugin.js (revision 141) @@ -1,8 +1,24 @@ -/* @Packager.Header - - FCKPlugin Class: Represents a single plugin. - - -*/ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * FCKPlugin Class: Represents a single plugin. + */ var FCKPlugin = function( name, availableLangs, basePath ) @@ -11,5 +27,5 @@ this.BasePath = basePath ? basePath : FCKConfig.PluginsPath ; this.Path = this.BasePath + name + '/' ; - + if ( !availableLangs || availableLangs.length == 0 ) this.AvailableLangs = new Array() ; @@ -24,5 +40,5 @@ { var sLang ; - + // Check if the plugin has the language file for the active language. if ( this.AvailableLangs.IndexOf( FCKLanguageManager.ActiveLanguage.Code ) >= 0 ) @@ -31,9 +47,9 @@ // Load the default language file (first one) if the current one is not available. sLang = this.AvailableLangs[0] ; - + // Add the main plugin script. - LoadScript( this.Path + 'lang/' + sLang + '.js' ) ; + LoadScript( this.Path + 'lang/' + sLang + '.js' ) ; } - + // Add the main plugin script. LoadScript( this.Path + 'fckplugin.js' ) ; Index: /FCKeditor/branches/developers/alfonsoml/editor/_source/classes/fckspecialcombo.js =================================================================== --- /FCKeditor/branches/developers/alfonsoml/editor/_source/classes/fckspecialcombo.js (revision 140) +++ /FCKeditor/branches/developers/alfonsoml/editor/_source/classes/fckspecialcombo.js (revision 141) @@ -1,8 +1,24 @@ -/* @Packager.Header - - FCKSpecialCombo Class: represents a special combo. - - -*/ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * FCKSpecialCombo Class: represents a special combo. + */ var FCKSpecialCombo = function( caption, fieldWidth, panelWidth, panelMaxHeight, parentWindow ) @@ -18,7 +34,7 @@ this.Enabled = true ; - + this.Items = new Object() ; - + this._Panel = new FCKPanel( parentWindow || window, true ) ; this._Panel.AppendStyleSheet( FCKConfig.SkinPath + 'fck_editor.css' ) ; @@ -28,5 +44,5 @@ this._PanelBox.innerHTML = '

' ; - + this._ItemsHolderEl = this._PanelBox.getElementsByTagName('TD')[0] ; @@ -77,5 +93,5 @@ if ( FCKBrowserInfo.IsIE ) oDiv.style.width = '100%' ; - + if ( bgColor ) oDiv.style.backgroundColor = bgColor ; @@ -84,7 +100,7 @@ oDiv.onmouseout = FCKSpecialCombo_ItemOnMouseOut ; oDiv.onclick = FCKSpecialCombo_ItemOnClick ; - + this.Items[ id.toString().toLowerCase() ] = oDiv ; - + return oDiv ; } @@ -93,5 +109,5 @@ { itemId = itemId ? itemId.toString().toLowerCase() : '' ; - + var oDiv = this.Items[ itemId ] ; if ( oDiv ) @@ -112,5 +128,5 @@ oDiv.className = oDiv.originalClass = 'SC_ItemSelected' ; oDiv.Selected = true ; - + if ( setLabel ) this.SetLabel( itemLabel ) ; @@ -126,5 +142,5 @@ this.Items[i].Selected = false ; } - + if ( clearLabel ) this.SetLabel( '' ) ; @@ -134,5 +150,5 @@ { id = id ? id.toString().toLowerCase() : '' ; - + var oDiv = this.Items[ id ] ; this.SetLabel( oDiv ? oDiv.FCKItemLabel : '' ) ; @@ -146,5 +162,5 @@ { this._LabelEl.innerHTML = this.Label ; - + // It may happen that the label is some HTML, including tags. This // would be a problem because when the user click on those tags, the @@ -158,5 +174,5 @@ { this.Enabled = isEnabled ; - + this._OuterTable.className = isEnabled ? '' : 'SC_FieldDisabled' ; } @@ -168,10 +184,10 @@ eOuterTable.cellPadding = 0 ; eOuterTable.cellSpacing = 0 ; - + eOuterTable.insertRow(-1) ; - + var sClass ; var bShowLabel ; - + switch ( this.Style ) { @@ -195,5 +211,5 @@ oCaptionCell.className = 'SC_FieldCaption' ; } - + // Create the main DIV element. var oField = FCKTools.AppendElement( eOuterTable.rows[0].insertCell(-1), 'div' ) ; @@ -212,5 +228,5 @@ //oField.innerHTML = '' + this.Caption + '

' ; //oField.innerHTML = '

' ; - + // Gets the correct CSS class to use for the specified style (param). oField.innerHTML = '' + @@ -230,5 +246,5 @@ oField.SpecialCombo = this ; - + oField.onmouseover = FCKSpecialCombo_OnMouseOver ; oField.onmouseout = FCKSpecialCombo_OnMouseOut ; @@ -244,5 +260,5 @@ this._ItemsHolderEl = null ; this._PanelBox = null ; - + if ( this.Items ) { @@ -250,5 +266,5 @@ this.Items[key] = null ; } -} +} function FCKSpecialCombo_OnMouseOver() @@ -270,5 +286,5 @@ } } - + function FCKSpecialCombo_OnMouseOut() { @@ -286,8 +302,8 @@ } } - + function FCKSpecialCombo_OnClick( e ) { - // For Mozilla we must stop the event propagation to avoid it hiding + // For Mozilla we must stop the event propagation to avoid it hiding // the panel because of a click outside of it. // if ( e ) @@ -296,5 +312,5 @@ // FCKPanelEventHandlers.OnDocumentClick( e ) ; // } - + var oSpecialCombo = this.SpecialCombo ; @@ -305,5 +321,5 @@ var oItemsHolder = oSpecialCombo._ItemsHolderEl ; var iMaxHeight = oSpecialCombo.PanelMaxHeight ; - + if ( oSpecialCombo.OnBeforeClick ) oSpecialCombo.OnBeforeClick( oSpecialCombo ) ; @@ -323,5 +339,5 @@ else oPanelBox.style.height = '' ; - + // oPanel.PanelDiv.style.width = oSpecialCombo.PanelWidth + 'px' ; @@ -332,5 +348,5 @@ } -/* +/* Sample Combo Field HTML output: Index: /FCKeditor/branches/developers/alfonsoml/editor/_source/classes/fckstyledef.js =================================================================== --- /FCKeditor/branches/developers/alfonsoml/editor/_source/classes/fckstyledef.js (revision 140) +++ /FCKeditor/branches/developers/alfonsoml/editor/_source/classes/fckstyledef.js (revision 141) @@ -1,8 +1,24 @@ -/* @Packager.Header - - FCKStyleDef Class: represents a single style definition. - - -*/ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * FCKStyleDef Class: represents a single style definition. + */ var FCKStyleDef = function( name, element ) @@ -22,8 +38,8 @@ { var s = '<' + this.Element ; - + for ( var a in this.Attributes ) s += ' ' + a + '="' + this.Attributes[a] + '"' ; - + return s + '>' ; } Index: /FCKeditor/branches/developers/alfonsoml/editor/_source/classes/fckstyledef_gecko.js =================================================================== --- /FCKeditor/branches/developers/alfonsoml/editor/_source/classes/fckstyledef_gecko.js (revision 140) +++ /FCKeditor/branches/developers/alfonsoml/editor/_source/classes/fckstyledef_gecko.js (revision 141) @@ -1,8 +1,24 @@ -/* @Packager.Header - - FCKStyleDef Class: represents a single stylke definition. (Gecko specific) - - -*/ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * FCKStyleDef Class: represents a single stylke definition. (Gecko specific) + */ FCKStyleDef.prototype.ApplyToSelection = function() @@ -11,20 +27,20 @@ { var oSelection = FCK.ToolbarSet.CurrentInstance.EditorWindow.getSelection() ; - + // Create the main element. var e = FCK.ToolbarSet.CurrentInstance.EditorDocument.createElement( this.Element ) ; - + for ( var i = 0 ; i < oSelection.rangeCount ; i++ ) { e.appendChild( oSelection.getRangeAt(i).extractContents() ) ; } - + // Set the attributes. this._AddAttributes( e ) ; - + // Remove the duplicated elements. this._RemoveDuplicates( e ) ; - var oRange = oSelection.getRangeAt(0) ; + var oRange = oSelection.getRangeAt(0) ; oRange.insertNode( e ) ; } @@ -57,10 +73,10 @@ { var oChild = parent.childNodes[i] ; - + if ( oChild.nodeType != 1 ) continue ; - + this._RemoveDuplicates( oChild ) ; - + if ( this.IsEqual( oChild ) ) FCKTools.RemoveOuterTags( oChild ) ; @@ -72,5 +88,5 @@ if ( e.tagName != this.Element ) return false ; - + for ( var a in this.Attributes ) { @@ -78,5 +94,5 @@ return false ; } - + return true ; } @@ -100,5 +116,5 @@ FCKTools.RemoveOuterTags( elementToCheck ) ; } - + this._RemoveMe( oParent ) ; } Index: /FCKeditor/branches/developers/alfonsoml/editor/_source/classes/fckstyledef_ie.js =================================================================== --- /FCKeditor/branches/developers/alfonsoml/editor/_source/classes/fckstyledef_ie.js (revision 140) +++ /FCKeditor/branches/developers/alfonsoml/editor/_source/classes/fckstyledef_ie.js (revision 141) @@ -1,27 +1,43 @@ -/* @Packager.Header - - FCKStyleDef Class: represents a single stylke definition. (IE specific) - - -*/ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * FCKStyleDef Class: represents a single stylke definition. (IE specific) + */ FCKStyleDef.prototype.ApplyToSelection = function() { var oSelection = FCK.ToolbarSet.CurrentInstance.EditorDocument.selection ; - + if ( oSelection.type == 'Text' ) { var oRange = oSelection.createRange() ; - + // Create the main element. var e = document.createElement( this.Element ) ; e.innerHTML = oRange.htmlText ; - + // Set the attributes. this._AddAttributes( e ) ; - + // Remove the duplicated elements. this._RemoveDuplicates( e ) ; - + // Replace the selection with the resulting HTML. oRange.pasteHTML( e.outerHTML ) ; @@ -64,5 +80,5 @@ var oChild = parent.children[i] ; this._RemoveDuplicates( oChild ) ; - + if ( this.IsEqual( oChild ) ) FCKTools.RemoveOuterTags( oChild ) ; @@ -74,5 +90,5 @@ if ( e.tagName != this.Element ) return false ; - + for ( var a in this.Attributes ) { @@ -92,5 +108,5 @@ } } - + return true ; } @@ -123,5 +139,5 @@ FCKTools.RemoveOuterTags( elementToCheck ) ; } - + this._RemoveMe( oParent ) ; } Index: /FCKeditor/branches/developers/alfonsoml/editor/_source/classes/fckstylesloader.js =================================================================== --- /FCKeditor/branches/developers/alfonsoml/editor/_source/classes/fckstylesloader.js (revision 140) +++ /FCKeditor/branches/developers/alfonsoml/editor/_source/classes/fckstylesloader.js (revision 141) @@ -1,9 +1,25 @@ -/* @Packager.Header - - FCKStylesLoader Class: this class define objects that are responsible - for loading the styles defined in the XML file. - - -*/ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * FCKStylesLoader Class: this class define objects that are responsible + * for loading the styles defined in the XML file. + */ var FCKStylesLoader = function() @@ -20,22 +36,22 @@ var oXml = new FCKXml() ; oXml.LoadUrl( stylesXmlUrl ) ; - + // Get the "Style" nodes defined in the XML file. var aStyleNodes = oXml.SelectNodes( 'Styles/Style' ) ; - + // Add each style to our "Styles" collection. for ( var i = 0 ; i < aStyleNodes.length ; i++ ) { var sElement = aStyleNodes[i].attributes.getNamedItem('element').value.toUpperCase() ; - + // Create the style definition object. var oStyleDef = new FCKStyleDef( aStyleNodes[i].attributes.getNamedItem('name').value, sElement ) ; - + if ( oStyleDef.IsObjectElement ) this.HasObjectElements = true ; - + // Get the attributes defined for the style (if any). var aAttNodes = oXml.SelectNodes( 'Attribute', aStyleNodes[i] ) ; - + // Add the attributes to the style definition object. for ( var j = 0 ; j < aAttNodes.length ; j++ ) @@ -52,5 +68,5 @@ sAttValue = oTempE.style.cssText ; } - + oStyleDef.AddAttribute( sAttName, sAttValue ) ; } @@ -58,5 +74,5 @@ // Add the style to the "Styles" collection using it's name as the key. this.Styles[ oStyleDef.Name ] = oStyleDef ; - + // Add the style to the "StyleGroups" collection. var aGroup = this.StyleGroups[sElement] ; @@ -68,5 +84,5 @@ aGroup[aGroup.length] = oStyleDef ; } - + this.Loaded = true ; } Index: /FCKeditor/branches/developers/alfonsoml/editor/_source/classes/fcktoolbar.js =================================================================== --- /FCKeditor/branches/developers/alfonsoml/editor/_source/classes/fcktoolbar.js (revision 140) +++ /FCKeditor/branches/developers/alfonsoml/editor/_source/classes/fcktoolbar.js (revision 141) @@ -1,9 +1,25 @@ -/* @Packager.Header - - FCKToolbar Class: represents a toolbar in the toolbarset. It is a group of - toolbar items. - - -*/ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * FCKToolbar Class: represents a toolbar in the toolbarset. It is a group of + * toolbar items. + */ var FCKToolbar = function() @@ -28,5 +44,5 @@ oButton._FCKToolbar = this ; oButton.OnClick = FCKToolbar_OnItemClick ; - + return this.AddItem( oButton ) ; } @@ -35,5 +51,5 @@ { var oToolbar = item._FCKToolbar ; - + if ( oToolbar.OnItemClick ) oToolbar.OnItemClick( oToolbar, item ) ; @@ -63,10 +79,10 @@ e.cellPadding = 0 ; e.cellSpacing = 0 ; - + this.RowElement = e.insertRow(-1) ; - + // Insert the start cell. var eCell ; - + if ( !this.HideStart ) { @@ -74,10 +90,10 @@ eCell.appendChild( oDoc.createElement( 'div' ) ).className = 'TB_Start' ; } - + for ( var i = 0 ; i < this.Items.length ; i++ ) { this.Items[i].Create( this.RowElement.insertCell(-1) ) ; } - + // Insert the ending cell. if ( !this.HideEnd ) Index: /FCKeditor/branches/developers/alfonsoml/editor/_source/classes/fcktoolbarbreak_gecko.js =================================================================== --- /FCKeditor/branches/developers/alfonsoml/editor/_source/classes/fcktoolbarbreak_gecko.js (revision 140) +++ /FCKeditor/branches/developers/alfonsoml/editor/_source/classes/fcktoolbarbreak_gecko.js (revision 141) @@ -1,10 +1,26 @@ -/* @Packager.Header - - FCKToolbarBreak Class: breaks the toolbars. - It makes it possible to force the toolbar to break to a new line. - This is the Gecko specific implementation. - - -*/ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * FCKToolbarBreak Class: breaks the toolbars. + * It makes it possible to force the toolbar to break to a new line. + * This is the Gecko specific implementation. + */ var FCKToolbarBreak = function() @@ -14,7 +30,7 @@ { var oBreakDiv = targetElement.ownerDocument.createElement( 'div' ) ; - + oBreakDiv.style.clear = oBreakDiv.style.cssFloat = FCKLang.Dir == 'rtl' ? 'right' : 'left' ; - + targetElement.appendChild( oBreakDiv ) ; } Index: /FCKeditor/branches/developers/alfonsoml/editor/_source/classes/fcktoolbarbreak_ie.js =================================================================== --- /FCKeditor/branches/developers/alfonsoml/editor/_source/classes/fcktoolbarbreak_ie.js (revision 140) +++ /FCKeditor/branches/developers/alfonsoml/editor/_source/classes/fcktoolbarbreak_ie.js (revision 141) @@ -1,10 +1,26 @@ -/* @Packager.Header - - FCKToolbarBreak Class: breaks the toolbars. - It makes it possible to force the toolbar to brak to a new line. - This is the IE specific implementation. - - -*/ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * FCKToolbarBreak Class: breaks the toolbars. + * It makes it possible to force the toolbar to brak to a new line. + * This is the IE specific implementation. + */ var FCKToolbarBreak = function() @@ -14,9 +30,9 @@ { var oBreakDiv = FCKTools.GetElementDocument( targetElement ).createElement( 'div' ) ; - + oBreakDiv.className = 'TB_Break' ; - + oBreakDiv.style.clear = FCKLang.Dir == 'rtl' ? 'left' : 'right' ; - + targetElement.appendChild( oBreakDiv ) ; } Index: /FCKeditor/branches/developers/alfonsoml/editor/_source/classes/fcktoolbarbutton.js =================================================================== --- /FCKeditor/branches/developers/alfonsoml/editor/_source/classes/fcktoolbarbutton.js (revision 140) +++ /FCKeditor/branches/developers/alfonsoml/editor/_source/classes/fcktoolbarbutton.js (revision 141) @@ -1,8 +1,24 @@ -/* @Packager.Header - - FCKToolbarButton Class: represents a button in the toolbar. - - -*/ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * FCKToolbarButton Class: represents a button in the toolbar. + */ var FCKToolbarButton = function( commandName, label, tooltip, style, sourceView, contextSensitive, icon ) @@ -13,5 +29,5 @@ this.Style = style ; this.SourceView = sourceView ? true : false ; - this.ContextSensitive = contextSensitive ? true : false ; + this.ContextSensitive = contextSensitive ? true : false ; if ( icon == null ) @@ -25,5 +41,5 @@ this._UIButton = new FCKToolbarButtonUI( this.CommandName, this.Label, this.Tooltip, this.IconPath, this.Style ) ; this._UIButton.OnClick = this.Click ; - this._UIButton._ToolbarButton = this ; + this._UIButton._ToolbarButton = this ; this._UIButton.Create( targetElement ) ; } @@ -33,8 +49,8 @@ // Gets the actual state. var eState = FCK.ToolbarSet.CurrentInstance.Commands.GetCommand( this.CommandName ).GetState() ; - + // If there are no state changes than do nothing and return. if ( eState == this._UIButton.State ) return ; - + // Sets the actual state. this._UIButton.ChangeState( eState ) ; Index: /FCKeditor/branches/developers/alfonsoml/editor/_source/classes/fcktoolbarbuttonui.js =================================================================== --- /FCKeditor/branches/developers/alfonsoml/editor/_source/classes/fcktoolbarbuttonui.js (revision 140) +++ /FCKeditor/branches/developers/alfonsoml/editor/_source/classes/fcktoolbarbuttonui.js (revision 141) @@ -1,8 +1,24 @@ -/* @Packager.Header - - FCKToolbarButtonUI Class: interface representation of a toolbar button. - - -*/ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * FCKToolbarButtonUI Class: interface representation of a toolbar button. + */ var FCKToolbarButtonUI = function( name, label, tooltip, iconPathOrStripInfoArray, style, state ) @@ -13,5 +29,5 @@ this.Style = style || FCK_TOOLBARITEM_ONLYICON ; this.State = state || FCK_TRISTATE_OFF ; - + this.Icon = new FCKIcon( iconPathOrStripInfoArray ) ; @@ -33,9 +49,9 @@ { var oMainElement = this.MainElement ; - + if ( oMainElement ) { FCKToolbarButtonUI_Cleanup.call(this) ; - + if ( oMainElement.parentNode ) oMainElement.parentNode.removeChild( oMainElement ) ; @@ -44,5 +60,5 @@ var oDoc = FCKTools.GetElementDocument( parentElement ) ; - + // Create the Main Element. oMainElement = this.MainElement = oDoc.createElement( 'DIV' ) ; @@ -59,5 +75,5 @@ { // - + oMainElement.appendChild( this.Icon.CreateIconElement( oDoc ) ) ; } @@ -66,5 +82,5 @@ // // - + var oTable = oMainElement.appendChild( oDoc.createElement( 'TABLE' ) ) ; oTable.cellPadding = 0 ; @@ -72,13 +88,13 @@ var oRow = oTable.insertRow(-1) ; - + // The Image cell (icon or padding). var oCell = oRow.insertCell(-1) ; - + if ( this.Style == FCK_TOOLBARITEM_ONLYICON || this.Style == FCK_TOOLBARITEM_ICONTEXT ) oCell.appendChild( this.Icon.CreateIconElement( oDoc ) ) ; else oCell.appendChild( this._CreatePaddingElement( oDoc ) ) ; - + if ( this.Style == FCK_TOOLBARITEM_ONLYTEXT || this.Style == FCK_TOOLBARITEM_ICONTEXT ) { @@ -89,13 +105,13 @@ oCell.appendChild( oDoc.createTextNode( this.Label ) ) ; } - + if ( this.ShowArrow ) { if ( this.Style != FCK_TOOLBARITEM_ONLYICON ) - { + { // A padding cell. oRow.insertCell(-1).appendChild( this._CreatePaddingElement( oDoc ) ) ; } - + oCell = oRow.insertCell(-1) ; var eImg = oCell.appendChild( oDoc.createElement( 'IMG' ) ) ; @@ -109,5 +125,5 @@ oCell.appendChild( this._CreatePaddingElement( oDoc ) ) ; } - + parentElement.appendChild( oMainElement ) ; } @@ -120,5 +136,5 @@ var e = this.MainElement ; - switch ( parseInt( newState ) ) + switch ( parseInt( newState, 10 ) ) { case FCK_TRISTATE_OFF : @@ -127,7 +143,7 @@ e.onmouseout = FCKToolbarButton_OnMouseOutOff ; e.onclick = FCKToolbarButton_OnClick ; - + break ; - + case FCK_TRISTATE_ON : e.className = 'TB_Button_On' ; @@ -135,5 +151,5 @@ e.onmouseout = FCKToolbarButton_OnMouseOutOn ; e.onclick = FCKToolbarButton_OnClick ; - + break ; @@ -157,5 +173,5 @@ this.MainElement = null ; } -} +} // Event Handlers. @@ -187,5 +203,5 @@ } -/* +/* Sample outputs: @@ -196,11 +212,11 @@ These are samples of possible {Image} values: - + Strip - IE version:

- + Strip : Firefox, Safari and Opera version - + No-Strip : Browser independent:

Index: /FCKeditor/branches/developers/alfonsoml/editor/_source/classes/fcktoolbarfontformatcombo.js =================================================================== --- /FCKeditor/branches/developers/alfonsoml/editor/_source/classes/fcktoolbarfontformatcombo.js (revision 140) +++ /FCKeditor/branches/developers/alfonsoml/editor/_source/classes/fcktoolbarfontformatcombo.js (revision 141) @@ -1,8 +1,24 @@ -/* @Packager.Header - - FCKToolbarPanelButton Class: Handles the Fonts combo selector. - - -*/ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * FCKToolbarPanelButton Class: Handles the Fonts combo selector. + */ var FCKToolbarFontFormatCombo = function( tooltip, style ) @@ -12,7 +28,7 @@ this.Tooltip = tooltip ? tooltip : this.Label ; this.Style = style ? style : FCK_TOOLBARITEM_ICONTEXT ; - + this.NormalLabel = 'Normal' ; - + this.PanelWidth = 190 ; } @@ -21,5 +37,5 @@ FCKToolbarFontFormatCombo.prototype = new FCKToolbarSpecialCombo ; -FCKToolbarFontFormatCombo.prototype.TypeOf = 'FCKToolbarFontFormatCombo' ; // @Packager.RemoveLine +FCKToolbarFontFormatCombo.prototype.TypeOf = 'FCKToolbarFontFormatCombo' ; // @Packager.RemoveLine FCKToolbarFontFormatCombo.prototype.GetLabel = function() @@ -58,5 +74,5 @@ // Get the available formats from the configuration file. var aTags = FCKConfig.FontFormats.split(';') ; - + for ( var i = 0 ; i < aTags.length ; i++ ) { @@ -64,11 +80,11 @@ // if ( aTags[i] == 'div' && FCKBrowserInfo.IsGecko ) // continue ; - + var sTag = aTags[i] ; var sLabel = oNames[sTag] ; - + if ( sTag == 'p' ) this.NormalLabel = sLabel ; - + this._Combo.AddItem( sTag, '

<' + sTag + '>' + sLabel + '

', sLabel ) ; } Index: /FCKeditor/branches/developers/alfonsoml/editor/_source/classes/fcktoolbarfontscombo.js =================================================================== --- /FCKeditor/branches/developers/alfonsoml/editor/_source/classes/fcktoolbarfontscombo.js (revision 140) +++ /FCKeditor/branches/developers/alfonsoml/editor/_source/classes/fcktoolbarfontscombo.js (revision 141) @@ -1,8 +1,24 @@ -/* @Packager.Header - - FCKToolbarPanelButton Class: Handles the Fonts combo selector. - - -*/ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * FCKToolbarPanelButton Class: Handles the Fonts combo selector. + */ var FCKToolbarFontsCombo = function( tooltip, style ) @@ -17,5 +33,5 @@ FCKToolbarFontsCombo.prototype = new FCKToolbarSpecialCombo ; -FCKToolbarFontsCombo.prototype.TypeOf = 'FCKToolbarFontsCombo' ; // @Packager.RemoveLine +FCKToolbarFontsCombo.prototype.TypeOf = 'FCKToolbarFontsCombo' ; // @Packager.RemoveLine FCKToolbarFontsCombo.prototype.GetLabel = function() @@ -27,5 +43,5 @@ { var aFonts = FCKConfig.FontNames.split(';') ; - + for ( var i = 0 ; i < aFonts.length ; i++ ) this._Combo.AddItem( aFonts[i], '' + aFonts[i] + '' ) ; Index: /FCKeditor/branches/developers/alfonsoml/editor/_source/classes/fcktoolbarfontsizecombo.js =================================================================== --- /FCKeditor/branches/developers/alfonsoml/editor/_source/classes/fcktoolbarfontsizecombo.js (revision 140) +++ /FCKeditor/branches/developers/alfonsoml/editor/_source/classes/fcktoolbarfontsizecombo.js (revision 141) @@ -1,8 +1,24 @@ -/* @Packager.Header - - FCKToolbarPanelButton Class: Handles the Fonts combo selector. - - -*/ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * FCKToolbarPanelButton Class: Handles the Fonts combo selector. + */ var FCKToolbarFontSizeCombo = function( tooltip, style ) @@ -17,5 +33,5 @@ FCKToolbarFontSizeCombo.prototype = new FCKToolbarSpecialCombo ; -FCKToolbarFontSizeCombo.prototype.TypeOf = 'FCKToolbarFontSizeCombo' ; // @Packager.RemoveLine +FCKToolbarFontSizeCombo.prototype.TypeOf = 'FCKToolbarFontSizeCombo' ; // @Packager.RemoveLine FCKToolbarFontSizeCombo.prototype.GetLabel = function() @@ -27,7 +43,7 @@ { targetSpecialCombo.FieldWidth = 70 ; - + var aSizes = FCKConfig.FontSizes.split(';') ; - + for ( var i = 0 ; i < aSizes.length ; i++ ) { Index: /FCKeditor/branches/developers/alfonsoml/editor/_source/classes/fcktoolbarpanelbutton.js =================================================================== --- /FCKeditor/branches/developers/alfonsoml/editor/_source/classes/fcktoolbarpanelbutton.js (revision 140) +++ /FCKeditor/branches/developers/alfonsoml/editor/_source/classes/fcktoolbarpanelbutton.js (revision 141) @@ -1,9 +1,25 @@ -/* @Packager.Header - - FCKToolbarPanelButton Class: represents a special button in the toolbar - that shows a panel when pressed. - - -*/ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * FCKToolbarPanelButton Class: represents a special button in the toolbar + * that shows a panel when pressed. + */ var FCKToolbarPanelButton = function( commandName, label, tooltip, style, icon ) @@ -12,10 +28,10 @@ var oIcon ; - + if ( icon == null ) oIcon = FCKConfig.SkinPath + 'toolbar/' + commandName.toLowerCase() + '.gif' ; else if ( typeof( icon ) == 'number' ) oIcon = [ FCKConfig.SkinPath + 'fck_strip.gif', 16, icon ] ; - + var oUIButton = this._UIButton = new FCKToolbarButtonUI( commandName, label, tooltip, oIcon, style ) ; oUIButton._FCKToolbarPanelButton = this ; @@ -31,12 +47,12 @@ this._UIButton.Create( parentElement ) ; - + var oPanel = FCK.ToolbarSet.CurrentInstance.Commands.GetCommand( this.CommandName )._Panel ; oPanel._FCKToolbarPanelButton = this ; - + var eLineDiv = oPanel.Document.body.appendChild( oPanel.Document.createElement( 'div' ) ) ; eLineDiv.style.position = 'absolute' ; eLineDiv.style.top = '0px' ; - + var eLine = this.LineImg = eLineDiv.appendChild( oPanel.Document.createElement( 'IMG' ) ) ; eLine.className = 'TB_ConnectionLine' ; @@ -55,7 +71,7 @@ var oButton = this._FCKToolbarPanelButton ; var e = oButton._UIButton.MainElement ; - + oButton._UIButton.ChangeState( FCK_TRISTATE_ON ) ; - + oButton.LineImg.style.width = ( e.offsetWidth - 2 ) + 'px' ; Index: /FCKeditor/branches/developers/alfonsoml/editor/_source/classes/fcktoolbarspecialcombo.js =================================================================== --- /FCKeditor/branches/developers/alfonsoml/editor/_source/classes/fcktoolbarspecialcombo.js (revision 140) +++ /FCKeditor/branches/developers/alfonsoml/editor/_source/classes/fcktoolbarspecialcombo.js (revision 141) @@ -1,15 +1,31 @@ -/* @Packager.Header - - FCKToolbarSpecialCombo Class: This is a "abstract" base class to be used - by the special combo toolbar elements like font name, font size, paragraph format, etc... - - The following properties and methods must be implemented when inheriting from - this class: - - Property: CommandName [ The command name to be executed ] - - Method: GetLabel() [ Returns the label ] - - CreateItems( targetSpecialCombo ) [ Add all items in the special combo ] - - -*/ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * FCKToolbarSpecialCombo Class: This is a "abstract" base class to be used + * by the special combo toolbar elements like font name, font size, paragraph format, etc... + * + * The following properties and methods must be implemented when inheriting from + * this class: + * - Property: CommandName [ The command name to be executed ] + * - Method: GetLabel() [ Returns the label ] + * - CreateItems( targetSpecialCombo ) [ Add all items in the special combo ] + */ var FCKToolbarSpecialCombo = function() @@ -20,5 +36,5 @@ } -FCKToolbarSpecialCombo.prototype.TypeOf = 'FCKToolbarSpecialCombo' ; // @Packager.RemoveLine +FCKToolbarSpecialCombo.prototype.TypeOf = 'FCKToolbarSpecialCombo' ; // @Packager.RemoveLine function FCKToolbarSpecialCombo_OnSelect( itemId, item ) @@ -30,5 +46,5 @@ { this._Combo = new FCKSpecialCombo( this.GetLabel(), this.FieldWidth, this.PanelWidth, this.PanelMaxHeight, FCKBrowserInfo.IsIE ? window : FCKTools.GetElementWindow( targetElement ).parent ) ; - + /* this._Combo.FieldWidth = this.FieldWidth != null ? this.FieldWidth : 100 ; @@ -36,10 +52,10 @@ this._Combo.PanelMaxHeight = this.PanelMaxHeight != null ? this.PanelMaxHeight : 150 ; */ - + //this._Combo.Command.Name = this.Command.Name; // this._Combo.Label = this.Label ; this._Combo.Tooltip = this.Tooltip ; this._Combo.Style = this.Style ; - + this.CreateItems( this._Combo ) ; @@ -47,5 +63,5 @@ this._Combo.CommandName = this.CommandName ; - + this._Combo.OnSelect = FCKToolbarSpecialCombo_OnSelect ; } @@ -62,5 +78,5 @@ // Gets the actual state. var eState ; - + // if ( FCK.EditMode == FCK_EDITMODE_SOURCE && ! this.SourceView ) // eState = FCK_TRISTATE_DISABLED ; @@ -74,5 +90,5 @@ { eState = FCK_TRISTATE_ON ; - + if ( this.RefreshActiveItems ) this.RefreshActiveItems( this._Combo, sValue ) ; @@ -89,8 +105,8 @@ eState = FCK_TRISTATE_DISABLED ; // } - + // If there are no state changes then do nothing and return. if ( eState == this.State ) return ; - + if ( eState == FCK_TRISTATE_DISABLED ) { Index: /FCKeditor/branches/developers/alfonsoml/editor/_source/classes/fcktoolbarstylecombo.js =================================================================== --- /FCKeditor/branches/developers/alfonsoml/editor/_source/classes/fcktoolbarstylecombo.js (revision 140) +++ /FCKeditor/branches/developers/alfonsoml/editor/_source/classes/fcktoolbarstylecombo.js (revision 141) @@ -1,8 +1,24 @@ -/* @Packager.Header - - FCKToolbarPanelButton Class: Handles the Fonts combo selector. - - -*/ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * FCKToolbarPanelButton Class: Handles the Fonts combo selector. + */ var FCKToolbarStyleCombo = function( tooltip, style ) @@ -17,5 +33,5 @@ FCKToolbarStyleCombo.prototype = new FCKToolbarSpecialCombo ; -FCKToolbarStyleCombo.prototype.TypeOf = 'FCKToolbarStyleCombo' ; // @Packager.RemoveLine +FCKToolbarStyleCombo.prototype.TypeOf = 'FCKToolbarStyleCombo' ; // @Packager.RemoveLine FCKToolbarStyleCombo.prototype.GetLabel = function() @@ -27,5 +43,5 @@ { var oTargetDoc = targetSpecialCombo._Panel.Document ; - + // Add the Editor Area CSS to the panel so the style classes are previewed correctly. FCKTools.AppendStyleSheet( oTargetDoc, FCKConfig.ToolbarComboPreviewCSS ) ; @@ -50,10 +66,10 @@ var oStyle = aCommandStyles[s] ; var oItem ; - + if ( oStyle.IsObjectElement ) oItem = targetSpecialCombo.AddItem( s, s ) ; else oItem = targetSpecialCombo.AddItem( s, oStyle.GetOpenerTag() + s + oStyle.GetCloserTag() ) ; - + oItem.Style = oStyle ; } @@ -64,8 +80,8 @@ // Clear the actual selection. targetSpecialCombo.DeselectAll() ; - + // Get the active styles. var aStyles = FCK.ToolbarSet.CurrentInstance.Commands.GetCommand( this.CommandName ).GetActiveStyles() ; - + if ( aStyles.length > 0 ) { Index: /FCKeditor/branches/developers/alfonsoml/editor/_source/classes/fckw3crange.js =================================================================== --- /FCKeditor/branches/developers/alfonsoml/editor/_source/classes/fckw3crange.js (revision 140) +++ /FCKeditor/branches/developers/alfonsoml/editor/_source/classes/fckw3crange.js (revision 141) @@ -1,10 +1,26 @@ -/* @Packager.Header - - This class partially implements the W3C DOM Range for browser that don't - support the standards (like IE): - http://www.w3.org/TR/DOM-Level-2-Traversal-Range/ranges.html - - -*/ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * This class partially implements the W3C DOM Range for browser that don't + * support the standards (like IE): + * http://www.w3.org/TR/DOM-Level-2-Traversal-Range/ranges.html + */ var FCKW3CRange = function( parentDocument ) @@ -46,5 +62,5 @@ } -FCKW3CRange.prototype = +FCKW3CRange.prototype = { TypeName : 'FCKW3CRange', // @Packager.RemoveLine @@ -62,5 +78,5 @@ this.startContainer = refNode ; this.startOffset = offset ; - + if ( !this.endContainer ) { @@ -71,5 +87,5 @@ this._UpdateCollapsed() ; }, - + // W3C requires a check for the new position. If it is before the start // boundary, the range should be collapsed to the new end. It seams we @@ -79,5 +95,5 @@ this.endContainer = refNode ; this.endOffset = offset ; - + if ( !this.startContainer ) { @@ -108,5 +124,5 @@ this.setEnd( refNode.parentNode, FCKDomTools.GetIndexOf( refNode ) ) ; }, - + collapse : function( toStart ) { @@ -121,5 +137,5 @@ this.startOffset = this.endOffset ; } - + this.collapsed = true ; }, @@ -135,5 +151,5 @@ var startContainer = this.startContainer ; var startOffset = this.startOffset ; - + // If we are in a text node. if ( startContainer.nodeType == 3 ) @@ -144,8 +160,8 @@ if ( startContainer == this.endContainer ) this.setEnd( startContainer.nextSibling, this.endOffset - this.startOffset ) ; - + // Insert the new node it after the text node. FCKDomTools.InsertAfterNode( startContainer, newNode ) ; - + return ; } @@ -168,5 +184,5 @@ if ( this.collapsed ) return ; - + this._ExecContentsAction( 0 ) ; }, @@ -194,16 +210,16 @@ _ExecContentsAction : function( action, docFrag ) - { + { var startNode = this.startContainer ; var endNode = this.endContainer ; - + var startOffset = this.startOffset ; var endOffset = this.endOffset ; - + var removeStartNode = false ; var removeEndNode = false ; - + // Check the start and end nodes and make the necessary removals or changes. - + // Start from the end, otherwise DOM mutations (splitText) made in the // start boundary may interfere on the results here. @@ -219,9 +235,9 @@ if ( endNode.childNodes.length > 0 ) { - // If the offset points after the last node, let's use - // the last one, but mark it for removal. + // If the offset points after the last node. if ( endOffset > endNode.childNodes.length - 1 ) { - endNode = endNode.lastChild ; + // Let's create a temporary node and mark it for removal. + endNode = FCKDomTools.InsertAfterNode( endNode.lastChild, this._Document.createTextNode('') ) ; removeEndNode = true ; } @@ -234,5 +250,13 @@ // be handled by the rest of the code . if ( startNode.nodeType == 3 ) + { startNode.splitText( startOffset ) ; + + // In cases the end node is the same as the start node, the above + // splitting will also split the end, so me must move the end to + // the second part of the split. + if ( startNode == endNode ) + endNode = startNode.nextSibling ; + } else { @@ -245,5 +269,6 @@ if ( startOffset == 0 ) { - startNode = startNode.firstChild ; + // Let's create a temporary node and mark it for removal. + startNode = startNode.insertBefore( this._Document.createTextNode(''), startNode.firstChild ) ; removeStartNode = true ; } @@ -253,37 +278,19 @@ } - // There is a special case where a node contents with just one child is in the range: - // selectNodeContents( node ) -> node.childNodes.lenght == 1 - if ( startNode == endNode && removeStartNode && removeEndNode ) - { - if ( action == 2 ) - docFrag.RootNode.appendChild( startNode.cloneNode( true ) ) ; - else - { - startNode.parentNode.removeChild( startNode ) ; - - if ( action == 1 ) - docFrag.RootNode.appendChild( startNode ) ; - - this.collapse( true ) ; - } - return ; - } - // Get the parent nodes tree for the start and end boundaries. var startParents = FCKDomTools.GetParents( startNode ) ; var endParents = FCKDomTools.GetParents( endNode ) ; - + // Compare them, to find the top most siblings. var i, topStart, topEnd ; - + for ( i = 0 ; i < startParents.length ; i++ ) { topStart = startParents[i] ; topEnd = endParents[i] ; - + // The compared nodes will match until we find the top most // siblings (different nodes that have the same parent). - // "i" will hold the index in the parants array for the top + // "i" will hold the index in the parants array for the top // most element. if ( topStart != topEnd ) @@ -291,6 +298,6 @@ } - var clone ; - + var clone, levelStartNode, levelClone, currentNode, currentSibling ; + if ( docFrag ) clone = docFrag.RootNode ; @@ -300,12 +307,12 @@ for ( var j = i ; j < startParents.length ; j++ ) { - var levelStartNode = startParents[j] ; - + levelStartNode = startParents[j] ; + // For Extract and Clone, we must clone this level. - if ( clone && ( removeStartNode || levelStartNode != startNode ) ) // action = 0 = Delete - var levelClone = clone.appendChild( levelStartNode.cloneNode( removeStartNode && levelStartNode == startNode ) ) ; - - var currentNode = levelStartNode.nextSibling ; - + if ( clone && levelStartNode != startNode ) // action = 0 = Delete + levelClone = clone.appendChild( levelStartNode.cloneNode( levelStartNode == startNode ) ) ; + + currentNode = levelStartNode.nextSibling ; + while( currentNode ) { @@ -314,7 +321,7 @@ if ( currentNode == endParents[j] || currentNode == endNode ) break ; - + // Cache the next sibling. - var currentSibling = currentNode.nextSibling ; + currentSibling = currentNode.nextSibling ; // If clonning, just clone it. @@ -325,17 +332,17 @@ // Both Delete and Extract will remove the node. currentNode.parentNode.removeChild( currentNode ) ; - + // When Extracting, move the removed node to the docFrag. if ( action == 1 ) // 1 = Extract clone.appendChild( currentNode ) ; } - + currentNode = currentSibling ; } - + if ( clone ) clone = levelClone ; } - + if ( docFrag ) clone = docFrag.RootNode ; @@ -343,16 +350,16 @@ // Remove all previous sibling nodes for every node in the // endParents tree. - for ( var j = i ; j < endParents.length ; j++ ) - { - var levelStartNode = endParents[j] ; - + for ( var k = i ; k < endParents.length ; k++ ) + { + levelStartNode = endParents[k] ; + // For Extract and Clone, we must clone this level. - if ( action > 0 && ( removeEndNode || levelStartNode != endNode ) ) // action = 0 = Delete - var levelClone = clone.appendChild( levelStartNode.cloneNode( removeEndNode && levelStartNode == endNode ) ) ; + if ( action > 0 && levelStartNode != endNode ) // action = 0 = Delete + levelClone = clone.appendChild( levelStartNode.cloneNode( levelStartNode == endNode ) ) ; // The processing of siblings may have already been done by the parent. - if ( !startParents[j] || levelStartNode.parentNode != startParents[j].parentNode ) - { - var currentNode = levelStartNode.previousSibling ; + if ( !startParents[k] || levelStartNode.parentNode != startParents[k].parentNode ) + { + currentNode = levelStartNode.previousSibling ; while( currentNode ) @@ -360,9 +367,9 @@ // Stop processing when the current node matches a node in the // startParents tree or if it is the startNode. - if ( currentNode == startParents[j] || currentNode == startNode ) + if ( currentNode == startParents[k] || currentNode == startNode ) break ; // Cache the next sibling. - var currentSibling = currentNode.previousSibling ; + currentSibling = currentNode.previousSibling ; // If clonning, just clone it. @@ -373,5 +380,5 @@ // Both Delete and Extract will remove the node. currentNode.parentNode.removeChild( currentNode ) ; - + // When Extracting, mode the removed node to the docFrag. if ( action == 1 ) // 1 = Extract @@ -382,25 +389,25 @@ } } - + if ( clone ) clone = levelClone ; } - + if ( action == 2 ) // 2 = Clone. { // No changes in the DOM should be done, so fix the split text (if any). - startNode = this.startContainer ; - if ( startNode.nodeType == 3 ) - { - startNode.data += startNode.nextSibling.data ; - startNode.parentNode.removeChild( startNode.nextSibling ) ; - } - - endNode = this.endContainer ; - if ( endNode.nodeType == 3 ) - { - endNode.data += endNode.nextSibling.data ; - endNode.parentNode.removeChild( endNode.nextSibling ) ; + var startTextNode = this.startContainer ; + if ( startTextNode.nodeType == 3 ) + { + startTextNode.data += startTextNode.nextSibling.data ; + startTextNode.parentNode.removeChild( startTextNode.nextSibling ) ; + } + + var endTextNode = this.endContainer ; + if ( endTextNode.nodeType == 3 && endTextNode.nextSibling ) + { + endTextNode.data += endTextNode.nextSibling.data ; + endTextNode.parentNode.removeChild( endTextNode.nextSibling ) ; } } @@ -408,20 +415,20 @@ { // Collapse the range. - + // If a node has been partially selected, collapse the range between // topStart and topEnd. Otherwise, simply collapse it to the start. (W3C specs). if ( topStart && topEnd && ( startNode.parentNode != topStart.parentNode || endNode.parentNode != topEnd.parentNode ) ) this.setStart( topEnd.parentNode, FCKDomTools.GetIndexOf( topEnd ) ) ; - + // Collapse it to the start. this.collapse( true ) ; - - // Cleanup any marked node. - if( removeStartNode ) - startNode.parentNode.removeChild( startNode ) ; - - if( removeEndNode && endNode.parentNode ) - endNode.parentNode.removeChild( endNode ) ; - } + } + + // Cleanup any marked node. + if( removeStartNode ) + startNode.parentNode.removeChild( startNode ) ; + + if( removeEndNode && endNode.parentNode ) + endNode.parentNode.removeChild( endNode ) ; }, @@ -434,8 +441,8 @@ { var docFrag = this.cloneContents() ; - + var tmpDiv = this._Document.createElement( 'div' ) ; docFrag.AppendTo( tmpDiv ) ; - + return tmpDiv.textContent || tmpDiv.innerText ; } Index: /FCKeditor/branches/developers/alfonsoml/editor/_source/classes/fckxml_gecko.js =================================================================== --- /FCKeditor/branches/developers/alfonsoml/editor/_source/classes/fckxml_gecko.js (revision 140) +++ /FCKeditor/branches/developers/alfonsoml/editor/_source/classes/fckxml_gecko.js (revision 141) @@ -1,8 +1,24 @@ -/* @Packager.Header - - FCKXml Class: class to load and manipulate XML files. - - -*/ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * FCKXml Class: class to load and manipulate XML files. + */ var FCKXml = function() @@ -17,5 +33,5 @@ oXmlHttp.open( "GET", urlToCall, false ) ; oXmlHttp.send( null ) ; - + if ( oXmlHttp.status == 200 || oXmlHttp.status == 304 ) this.DOMDocument = oXmlHttp.responseXML ; @@ -43,7 +59,7 @@ var aNodeArray = new Array(); - var xPathResult = this.DOMDocument.evaluate( xpath, contextNode ? contextNode : this.DOMDocument, + var xPathResult = this.DOMDocument.evaluate( xpath, contextNode ? contextNode : this.DOMDocument, this.DOMDocument.createNSResolver(this.DOMDocument.documentElement), XPathResult.ORDERED_NODE_ITERATOR_TYPE, null) ; - if ( xPathResult ) + if ( xPathResult ) { var oNode = xPathResult.iterateNext() ; @@ -53,9 +69,9 @@ oNode = xPathResult.iterateNext(); } - } + } return aNodeArray ; } -FCKXml.prototype.SelectSingleNode = function( xpath, contextNode ) +FCKXml.prototype.SelectSingleNode = function( xpath, contextNode ) { if ( this.Error ) @@ -67,5 +83,5 @@ if ( xPathResult && xPathResult.singleNodeValue ) return xPathResult.singleNodeValue ; - else + else return null ; } Index: /FCKeditor/branches/developers/alfonsoml/editor/_source/classes/fckxml_ie.js =================================================================== --- /FCKeditor/branches/developers/alfonsoml/editor/_source/classes/fckxml_ie.js (revision 140) +++ /FCKeditor/branches/developers/alfonsoml/editor/_source/classes/fckxml_ie.js (revision 141) @@ -1,9 +1,25 @@ -/* @Packager.Header - - FCKXml Class: class to load and manipulate XML files. - (IE specific implementation) - - -*/ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * FCKXml Class: class to load and manipulate XML files. + * (IE specific implementation) + */ var FCKXml = function() @@ -25,5 +41,5 @@ oXmlHttp.open( "GET", urlToCall, false ) ; - + oXmlHttp.send( null ) ; @@ -63,9 +79,9 @@ } -FCKXml.prototype.SelectSingleNode = function( xpath, contextNode ) +FCKXml.prototype.SelectSingleNode = function( xpath, contextNode ) { if ( this.Error ) return null ; - + if ( contextNode ) return contextNode.selectSingleNode( xpath ) ; Index: /FCKeditor/branches/developers/alfonsoml/editor/_source/commandclasses/fck_othercommands.js =================================================================== --- /FCKeditor/branches/developers/alfonsoml/editor/_source/commandclasses/fck_othercommands.js (revision 140) +++ /FCKeditor/branches/developers/alfonsoml/editor/_source/commandclasses/fck_othercommands.js (revision 141) @@ -1,10 +1,25 @@ -/* @Packager.Header - - Definition of other commands that are not available internaly in the - browser (see FCKNamedCommand). - - - -*/ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * Definition of other commands that are not available internaly in the + * browser (see FCKNamedCommand). + */ // ### General Dialog Box Commands. @@ -19,5 +34,5 @@ this.GetStateFunction = getStateFunction ; this.GetStateParam = getStateParam ; - + this.Resizable = false ; } @@ -82,5 +97,5 @@ FCKFontSizeCommand.prototype.Execute = function( fontSize ) { - if ( typeof( fontSize ) == 'string' ) fontSize = parseInt(fontSize) ; + if ( typeof( fontSize ) == 'string' ) fontSize = parseInt(fontSize, 10) ; if ( fontSize == null || fontSize == '' ) @@ -258,10 +273,10 @@ // e.style.pageBreakAfter = 'always' ; - // Tidy was removing the empty CENTER tags, so the following solution has + // Tidy was removing the empty CENTER tags, so the following solution has // been found. It also validates correctly as XHTML 1.0 Strict. var e = FCK.EditorDocument.createElement( 'DIV' ) ; e.style.pageBreakAfter = 'always' ; e.innerHTML = '' ; - + var oFakeImage = FCKDocumentProcessor_CreateFakeImage( 'FCK__PageBreak', e ) ; oFakeImage = FCK.InsertElement( oFakeImage ) ; @@ -284,8 +299,8 @@ { var oLink = FCK.Selection.MoveToAncestorNode( 'A' ) ; - if ( oLink ) + if ( oLink ) FCK.Selection.SelectNode( oLink ) ; } - + FCK.ExecuteNamedCommand( this.Name ) ; @@ -301,5 +316,5 @@ if ( state == FCK_TRISTATE_OFF && FCK.EditMode == FCK_EDITMODE_WYSIWYG ) { - var oLink = FCKSelection.MoveToAncestorNode( 'A' ) ; + var oLink = FCKSelection.MoveToAncestorNode( 'A' ) ; var bIsAnchor = ( oLink && oLink.name.length > 0 && oLink.href.length == 0 ) ; if ( bIsAnchor ) Index: /FCKeditor/branches/developers/alfonsoml/editor/_source/commandclasses/fckfitwindow.js =================================================================== --- /FCKeditor/branches/developers/alfonsoml/editor/_source/commandclasses/fckfitwindow.js (revision 140) +++ /FCKeditor/branches/developers/alfonsoml/editor/_source/commandclasses/fckfitwindow.js (revision 141) @@ -1,10 +1,24 @@ -/* @Packager.Header - - Stretch the editor to full window size and back. - - - - -*/ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * Stretch the editor to full window size and back. + */ var FCKFitWindow = function() @@ -22,4 +36,5 @@ var eBody = eMainWindow.document.body ; var eBodyStyle = eBody.style ; + var eParent ; // No original style properties known? Go fullscreen. @@ -34,7 +49,7 @@ // Save the scrollbars position. this._ScrollPos = FCKTools.GetScrollPosition( eMainWindow ) ; - + // Save and reset the styles for the entire node tree. They could interfere in the result. - var eParent = eEditorFrame ; + eParent = eEditorFrame ; // The extra () is to avoid a warning with strict error checking. This is ok. while( (eParent = eParent.parentNode) ) @@ -42,5 +57,5 @@ if ( eParent.nodeType == 1 ) eParent._fckSavedStyles = FCKTools.SaveStyles( eParent ) ; - } + } // Hide IE scrollbars (in strict mode). @@ -58,8 +73,8 @@ eBodyStyle.height = '0px' ; } - + // Save the IFRAME styles. this._EditorFrameStyles = FCKTools.SaveStyles( eEditorFrame ) ; - + // Resize. var oViewPaneSize = FCKTools.GetViewPaneSize( eMainWindow ) ; @@ -71,9 +86,9 @@ eEditorFrameStyle.width = oViewPaneSize.Width + "px"; eEditorFrameStyle.height = oViewPaneSize.Height + "px"; - + // Giving the frame some (huge) borders on his right and bottom // side to hide the background that would otherwise show when the // editor is in fullsize mode and the window is increased in size - // not for IE, because IE immediately adapts the editor on resize, + // not for IE, because IE immediately adapts the editor on resize, // without showing any of the background oddly in firefox, the // editor seems not to fill the whole frame, so just setting the @@ -99,5 +114,5 @@ // Restore the CSS position for the entire node tree. - var eParent = eEditorFrame ; + eParent = eEditorFrame ; // The extra () is to avoid a warning with strict error checking. This is ok. while( (eParent = eParent.parentNode) ) @@ -109,5 +124,5 @@ } } - + // Restore IE scrollbars if ( FCKBrowserInfo.IsIE ) @@ -116,5 +131,5 @@ // Restore original size FCKTools.RestoreStyles( eEditorFrame, this._EditorFrameStyles ) ; - + // Restore the window scroll position. eMainWindow.scrollTo( this._ScrollPos.X, this._ScrollPos.Y ) ; @@ -122,15 +137,15 @@ this.IsMaximized = false ; } - + FCKToolbarItems.GetItem('FitWindow').RefreshState() ; // It seams that Firefox restarts the editing area when making this changes. - // On FF 1.0.x, the area is not anymore editable. On FF 1.5+, the special - //configuration, like DisableFFTableHandles and DisableObjectResizing get - //lost, so we must reset it. Also, the cursor position and selection are + // On FF 1.0.x, the area is not anymore editable. On FF 1.5+, the special + //configuration, like DisableFFTableHandles and DisableObjectResizing get + //lost, so we must reset it. Also, the cursor position and selection are //also lost, even if you comment the following line (MakeEditable). // if ( FCKBrowserInfo.IsGecko10 ) // Initially I thought it was a FF 1.0 only problem. FCK.EditingArea.MakeEditable() ; - + FCK.Focus() ; } Index: /FCKeditor/branches/developers/alfonsoml/editor/_source/commandclasses/fcknamedcommand.js =================================================================== --- /FCKeditor/branches/developers/alfonsoml/editor/_source/commandclasses/fcknamedcommand.js (revision 140) +++ /FCKeditor/branches/developers/alfonsoml/editor/_source/commandclasses/fcknamedcommand.js (revision 141) @@ -1,8 +1,24 @@ -/* @Packager.Header - - FCKNamedCommand Class: represents an internal browser command. - - -*/ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * FCKNamedCommand Class: represents an internal browser command. + */ var FCKNamedCommand = function( commandName ) Index: /FCKeditor/branches/developers/alfonsoml/editor/_source/commandclasses/fckpasteplaintextcommand.js =================================================================== --- /FCKeditor/branches/developers/alfonsoml/editor/_source/commandclasses/fckpasteplaintextcommand.js (revision 140) +++ /FCKeditor/branches/developers/alfonsoml/editor/_source/commandclasses/fckpasteplaintextcommand.js (revision 141) @@ -1,11 +1,27 @@ -/* @Packager.Header - - FCKPastePlainTextCommand Class: represents the - "Paste as Plain Text" command. - - -*/ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * FCKPastePlainTextCommand Class: represents the + * "Paste as Plain Text" command. + */ -var FCKPastePlainTextCommand = function() +var FCKPastePlainTextCommand = function() { this.Name = 'PasteText' ; Index: /FCKeditor/branches/developers/alfonsoml/editor/_source/commandclasses/fckpastewordcommand.js =================================================================== --- /FCKeditor/branches/developers/alfonsoml/editor/_source/commandclasses/fckpastewordcommand.js (revision 140) +++ /FCKeditor/branches/developers/alfonsoml/editor/_source/commandclasses/fckpastewordcommand.js (revision 141) @@ -1,10 +1,26 @@ -/* @Packager.Header - - FCKPasteWordCommand Class: represents the "Paste from Word" command. - - -*/ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * FCKPasteWordCommand Class: represents the "Paste from Word" command. + */ -var FCKPasteWordCommand = function() +var FCKPasteWordCommand = function() { this.Name = 'PasteWord' ; Index: /FCKeditor/branches/developers/alfonsoml/editor/_source/commandclasses/fckspellcheckcommand_gecko.js =================================================================== --- /FCKeditor/branches/developers/alfonsoml/editor/_source/commandclasses/fckspellcheckcommand_gecko.js (revision 140) +++ /FCKeditor/branches/developers/alfonsoml/editor/_source/commandclasses/fckspellcheckcommand_gecko.js (revision 141) @@ -1,9 +1,25 @@ -/* @Packager.Header - - FCKStyleCommand Class: represents the "Spell Check" command. - (Gecko specific implementation) - - -*/ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * FCKStyleCommand Class: represents the "Spell Check" command. + * (Gecko specific implementation) + */ var FCKSpellCheckCommand = function() Index: /FCKeditor/branches/developers/alfonsoml/editor/_source/commandclasses/fckspellcheckcommand_ie.js =================================================================== --- /FCKeditor/branches/developers/alfonsoml/editor/_source/commandclasses/fckspellcheckcommand_ie.js (revision 140) +++ /FCKeditor/branches/developers/alfonsoml/editor/_source/commandclasses/fckspellcheckcommand_ie.js (revision 141) @@ -1,9 +1,25 @@ -/* @Packager.Header - - FCKStyleCommand Class: represents the "Spell Check" command. - (IE specific implementation) - - -*/ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * FCKStyleCommand Class: represents the "Spell Check" command. + * (IE specific implementation) + */ var FCKSpellCheckCommand = function() @@ -20,5 +36,5 @@ this._RunIeSpell() ; break ; - + case 'SpellerPages' : FCKDialog.OpenDialog( 'FCKDialog_SpellCheck', 'Spell Check', 'dialog/fck_spellerpages.html', 440, 480 ) ; Index: /FCKeditor/branches/developers/alfonsoml/editor/_source/commandclasses/fckstylecommand.js =================================================================== --- /FCKeditor/branches/developers/alfonsoml/editor/_source/commandclasses/fckstylecommand.js (revision 140) +++ /FCKeditor/branches/developers/alfonsoml/editor/_source/commandclasses/fckstylecommand.js (revision 141) @@ -1,8 +1,24 @@ -/* @Packager.Header - - FCKStyleCommand Class: represents the "Style" command. - - -*/ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * FCKStyleCommand Class: represents the "Style" command. + */ var FCKStyleCommand = function() @@ -28,5 +44,5 @@ FCK.Focus() ; - + FCK.Events.FireEvent( "OnSelectionChange" ) ; } @@ -38,5 +54,5 @@ var oSelection = FCK.EditorDocument.selection ; - + if ( FCKSelection.GetType() == 'Control' ) { @@ -52,10 +68,10 @@ { var aActiveStyles = new Array() ; - + if ( FCKSelection.GetType() == 'Control' ) this._CheckStyle( FCKSelection.GetSelectedElement(), aActiveStyles, false ) ; else this._CheckStyle( FCKSelection.GetParentElement(), aActiveStyles, true ) ; - + return aActiveStyles ; } @@ -75,8 +91,8 @@ if ( aStyleGroup[i].IsEqual( element ) ) targetArray[ targetArray.length ] = aStyleGroup[i] ; - } + } } } - + if ( checkParent ) this._CheckStyle( element.parentNode, targetArray, checkParent ) ; Index: /FCKeditor/branches/developers/alfonsoml/editor/_source/commandclasses/fcktablecommand.js =================================================================== --- /FCKeditor/branches/developers/alfonsoml/editor/_source/commandclasses/fcktablecommand.js (revision 140) +++ /FCKeditor/branches/developers/alfonsoml/editor/_source/commandclasses/fcktablecommand.js (revision 141) @@ -1,9 +1,25 @@ -/* @Packager.Header - - FCKPastePlainTextCommand Class: represents the - "Paste as Plain Text" command. - - -*/ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * FCKPastePlainTextCommand Class: represents the + * "Paste as Plain Text" command. + */ var FCKTableCommand = function( command ) @@ -15,5 +31,5 @@ { FCKUndo.SaveUndoStep() ; - + switch ( this.Name ) { Index: /FCKeditor/branches/developers/alfonsoml/editor/_source/commandclasses/fcktextcolorcommand.js =================================================================== --- /FCKeditor/branches/developers/alfonsoml/editor/_source/commandclasses/fcktextcolorcommand.js (revision 140) +++ /FCKeditor/branches/developers/alfonsoml/editor/_source/commandclasses/fcktextcolorcommand.js (revision 141) @@ -1,9 +1,25 @@ -/* @Packager.Header - - FCKTextColorCommand Class: represents the text color comand. It shows the - color selection panel. - - -*/ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * FCKTextColorCommand Class: represents the text color comand. It shows the + * color selection panel. + */ // FCKTextColorCommand Contructor @@ -15,5 +31,5 @@ var oWindow ; - + if ( FCKBrowserInfo.IsIE ) oWindow = window ; @@ -27,5 +43,5 @@ this._Panel.MainNode.className = 'FCK_Panel' ; this._CreatePanelBody( this._Panel.Document, this._Panel.MainNode ) ; - + FCKTools.DisableSelection( this._Panel.Document.body ) ; } @@ -48,5 +64,5 @@ if ( FCKBrowserInfo.IsGecko && !FCKConfig.GeckoUseSPAN ) FCK.EditorDocument.execCommand( 'useCSS', false, false ) ; - + FCK.ExecuteNamedCommand( 'hilitecolor', color ) ; @@ -56,5 +72,5 @@ else FCK.ExecuteNamedCommand( 'BackColor', color ) ; - + // Delete the "cached" active panel type. delete FCK._ActiveColorPanelType ; @@ -99,5 +115,5 @@ oDiv.onmouseover = FCKTextColorCommand_OnMouseOver ; oDiv.onmouseout = FCKTextColorCommand_OnMouseOut ; - + return oDiv ; } @@ -117,5 +133,5 @@ // Create the Button for the "Automatic" color selection. var oDiv = oCell.appendChild( CreateSelectionDiv() ) ; - oDiv.innerHTML = + oDiv.innerHTML = '

{Image}

Toolbar Button

\ \ @@ -136,5 +152,5 @@ { var oRow = oTable.insertRow(-1) ; - + for ( var i = 0 ; i < 8 && iCounter < aColors.length ; i++, iCounter++ ) { Index: /FCKeditor/branches/developers/alfonsoml/editor/_source/fckconstants.js =================================================================== --- /FCKeditor/branches/developers/alfonsoml/editor/_source/fckconstants.js (revision 140) +++ /FCKeditor/branches/developers/alfonsoml/editor/_source/fckconstants.js (revision 141) @@ -1,9 +1,25 @@ -/* @Packager.Header - - Defines some constants used by the editor. These constants are also - globally available in the page where the editor is placed. - - -*/ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * Defines some constants used by the editor. These constants are also + * globally available in the page where the editor is placed. + */ // Editor Instance Status. Index: /FCKeditor/branches/developers/alfonsoml/editor/_source/fckeditorapi.js =================================================================== --- /FCKeditor/branches/developers/alfonsoml/editor/_source/fckeditorapi.js (revision 140) +++ /FCKeditor/branches/developers/alfonsoml/editor/_source/fckeditorapi.js (revision 141) @@ -1,9 +1,25 @@ -/* @Packager.Header - - Create the FCKeditorAPI object that is available as a global object in - the page where the editor is placed in. - - -*/ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * Create the FCKeditorAPI object that is available as a global object in + * the page where the editor is placed in. + */ var FCKeditorAPI ; @@ -15,19 +31,19 @@ if ( !( FCKeditorAPI = oParentWindow.FCKeditorAPI ) ) { - // Make the FCKeditorAPI object available in the parent window. Use - // eval so this core runs in the parent's scope and so it will still be + // Make the FCKeditorAPI object available in the parent window. Use + // eval so this core runs in the parent's scope and so it will still be // available if the editor instance is removed ("Can't execute code // from a freed script" error). - var sScript = + var sScript = 'var FCKeditorAPI = {' + - 'Version : "[[@Packager.Version]]",' + - 'VersionBuild : "[[@Packager.Build]]",' + + 'Version : "2.4.1 (SVN)",' + + 'VersionBuild : "1156",' + '__Instances : new Object(),' + - + 'GetInstance : function( name )' + '{' + 'return this.__Instances[ name ];' + '},' + - + '_FormSubmit : function()' + '{' + @@ -40,9 +56,9 @@ 'this._FCKOriginalSubmit() ;' + '},' + - + '_FunctionQueue : {' + 'Functions : new Array(),' + 'IsRunning : false,' + - + 'Add : function( f )' + '{' + @@ -51,5 +67,5 @@ 'this.StartNext();' + '},' + - + 'StartNext : function()' + '{' + @@ -63,5 +79,5 @@ 'this.IsRunning = false;' + '},' + - + 'Remove : function( f )' + '{' + @@ -78,5 +94,5 @@ '}' + '}' ; - + // In IE, the "eval" function is not always available (it works with // the JavaScript samples, but not with the ASP ones, for example). @@ -104,5 +120,5 @@ oParentWindow.eval( sScript ) ; } - + FCKeditorAPI = oParentWindow.FCKeditorAPI ; } @@ -117,10 +133,10 @@ // Get the linked field form. var oForm = FCK.GetParentForm() ; - + if ( oForm ) { // Attach to the onsubmit event. FCKTools.AddEventListener( oForm, 'submit', FCK.UpdateLinkedField ) ; - + // IE sees oForm.submit function as an 'object'. if ( !oForm._FCKOriginalSubmit && ( typeof( oForm.submit ) == 'function' || ( !oForm.submit.tagName && !oForm.submit.length ) ) ) @@ -128,9 +144,9 @@ // Save the original submit. oForm._FCKOriginalSubmit = oForm.submit ; - + // Create our replacement for the submit. oForm.submit = FCKeditorAPI._FormSubmit ; } - } + } } Index: /FCKeditor/branches/developers/alfonsoml/editor/_source/fckjscoreextensions.js =================================================================== --- /FCKeditor/branches/developers/alfonsoml/editor/_source/fckjscoreextensions.js (revision 140) +++ /FCKeditor/branches/developers/alfonsoml/editor/_source/fckjscoreextensions.js (revision 141) @@ -1,11 +1,27 @@ -/* @Packager.Header - - Extensions to the JavaScript Core. - - All custom extentions functions are PascalCased to differ from the standard - camelCased ones. - - -*/ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * Extensions to the JavaScript Core. + * + * All custom extentions functions are PascalCased to differ from the standard + * camelCased ones. + */ String.prototype.Contains = function( textToCheck ) @@ -17,7 +33,7 @@ { var aArgs = arguments ; - + // The arguments could also be a single array. - if ( aArgs.length == 1 && aArgs[0].pop ) + if ( aArgs.length == 1 && aArgs[0].pop ) aArgs = aArgs[0] ; @@ -33,11 +49,11 @@ { var thisUpper = this.toUpperCase() ; - + var aArgs = arguments ; - + // The arguments could also be a single array. - if ( aArgs.length == 1 && aArgs[0].pop ) + if ( aArgs.length == 1 && aArgs[0].pop ) aArgs = aArgs[0] ; - + for ( var i = 0 ; i < aArgs.length ; i++ ) { @@ -51,10 +67,10 @@ { var replaced = this ; - + for ( var i = 0 ; i < searchArray.length ; i++ ) { replaced = replaced.replace( searchArray[i], replaceArray[i] ) ; } - + return replaced ; } @@ -87,5 +103,5 @@ var L1 = this.length ; var L2 = value.length ; - + if ( L2 > L1 ) return false ; @@ -103,11 +119,11 @@ { var s = '' ; - + if ( start > 0 ) s = this.substring( 0, start ) ; - + if ( start + length < this.length ) s += this.substring( start + length , this.length ) ; - + return s ; } @@ -115,15 +131,18 @@ String.prototype.Trim = function() { - return this.replace( /(^\s*)|(\s*$)/g, '' ) ; + // We are not using \s because we don't want "non-breaking spaces to be caught". + return this.replace( /(^[ \t\n\r]*)|([ \t\n\r]*$)/g, '' ) ; } String.prototype.LTrim = function() { - return this.replace( /^\s*/g, '' ) ; + // We are not using \s because we don't want "non-breaking spaces to be caught". + return this.replace( /^[ \t\n\r]*/g, '' ) ; } String.prototype.RTrim = function() { - return this.replace( /\s*$/g, '' ) ; + // We are not using \s because we don't want "non-breaking spaces to be caught". + return this.replace( /[ \t\n\r]*$/g, '' ) ; } Index: /FCKeditor/branches/developers/alfonsoml/editor/_source/fckscriptloader.js =================================================================== --- /FCKeditor/branches/developers/alfonsoml/editor/_source/fckscriptloader.js (revision 140) +++ /FCKeditor/branches/developers/alfonsoml/editor/_source/fckscriptloader.js (revision 141) @@ -1,9 +1,25 @@ -/* @Packager.Header - - This is a utility object which can be used to load specific components of - FCKeditor, including all dependencies. - - -*/ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * This is a utility object which can be used to load specific components of + * FCKeditor, including all dependencies. + */ var FCK_GENERIC = 1 ; @@ -12,6 +28,5 @@ var FCKScriptLoader = new Object() ; -FCKScriptLoader._FCKeditorPath = '/fckeditor/' ; -FCKScriptLoader._FCKeditorPath = '/V2/' ; // @Packager.RemoveLine +FCKScriptLoader.FCKeditorPath = '/fckeditor/' ; FCKScriptLoader._Scripts = new Object() ; @@ -27,5 +42,5 @@ var oScriptInfo = this._Scripts[ scriptName ] ; - + if ( !oScriptInfo ) { @@ -33,15 +48,15 @@ return ; } - + for ( var i = 0 ; i < oScriptInfo.Dependency.length ; i++ ) { this.Load( oScriptInfo.Dependency[i] ) ; } - + var sBaseScriptName = oScriptInfo.BasePath + scriptName.toLowerCase() ; - + if ( oScriptInfo.Compatibility == FCK_GENERIC || oScriptInfo.Compatibility == FCK_GENERIC_SPECIFIC ) this._LoadScript( sBaseScriptName + '.js' ) ; - + if ( oScriptInfo.Compatibility == FCK_SPECIFIC || oScriptInfo.Compatibility == FCK_GENERIC_SPECIFIC ) { @@ -51,5 +66,5 @@ this._LoadScript( sBaseScriptName + '_gecko.js' ) ; } - + FCKScriptLoader._LoadedScripts[ scriptName ] = true ; } @@ -57,10 +72,10 @@ FCKScriptLoader._LoadScript = function( scriptPathFromSource ) { - document.write( '' + document.getElementById( 'xToolbarSpace' ).innerHTML + '' ) ; eTargetDocument.close() ; - + eTargetDocument.oncontextmenu = FCKTools.CancelEvent ; @@ -72,5 +88,5 @@ // have the document DOM ready to be used right away. FCKTools.AppendStyleSheet( eTargetDocument, FCKConfig.SkinPath + 'fck_editor.css' ) ; - + oToolbarSet = eToolbarTarget.__FCKToolbarSet = new FCKToolbarSet( eTargetDocument ) ; oToolbarSet._IFrame = eToolbarIFrame ; @@ -79,5 +95,5 @@ FCK.IECleanup.AddItem( eToolbarTarget, FCKToolbarSet_Target_Cleanup ) ; } - + oToolbarSet.CurrentInstance = FCK ; @@ -90,5 +106,5 @@ { var eToolbarSet = editorInstance.ToolbarSet ; - + if ( eToolbarSet.CurrentInstance == editorInstance ) eToolbarSet.Disable() ; @@ -99,11 +115,11 @@ var oToolbarset = editorInstance.ToolbarSet ; var oInstance = editorInstance || FCK ; - + // Unregister the toolbar window from the current instance. oToolbarset.CurrentInstance.FocusManager.RemoveWindow( oToolbarset._IFrame.contentWindow ) ; - + // Set the new current instance. oToolbarset.CurrentInstance = oInstance ; - + // Register the toolbar window in the current instance. oInstance.FocusManager.AddWindow( oToolbarset._IFrame.contentWindow, true ) ; @@ -125,9 +141,9 @@ var FCKToolbarSet = function( targetDocument ) { - this._Document = targetDocument ; + this._Document = targetDocument ; // Get the element that will hold the elements structure. this._TargetElement = targetDocument.getElementById( 'xToolbar' ) ; - + // Setup the expand and collapse handlers. var eExpandHandle = targetDocument.getElementById( 'xExpandHandle' ) ; @@ -136,5 +152,5 @@ eExpandHandle.title = FCKLang.ToolbarExpand ; eExpandHandle.onclick = FCKToolbarSet_Expand_OnClick ; - + eCollapseHandle.title = FCKLang.ToolbarCollapse ; eCollapseHandle.onclick = FCKToolbarSet_Collapse_OnClick ; @@ -153,5 +169,5 @@ else targetDocument.getElementById( 'xTBLeftBorder' ).style.display = '' ; - + // Set the default properties. this.Toolbars = new Array() ; @@ -186,5 +202,5 @@ this._Document.getElementById( 'xCollapsed' ).style.display = collapse ? '' : 'none' ; this._Document.getElementById( 'xExpanded' ).style.display = collapse ? 'none' : '' ; - + if ( FCKBrowserInfo.IsGecko ) { @@ -200,5 +216,5 @@ this.Items = new Array() ; - + // Reset the array of toolbat items that are active only on WYSIWYG mode. this.ItemsWysiwygOnly = new Array() ; @@ -206,10 +222,10 @@ // Reset the array of toolbar items that are sensitive to the cursor position. this.ItemsContextSensitive = new Array() ; - + // Cleanup the target element. this._TargetElement.innerHTML = '' ; - + var ToolbarSet = FCKConfig.ToolbarSets[toolbarSetName] ; - + if ( !ToolbarSet ) { @@ -217,13 +233,13 @@ return ; } - + this.Toolbars = new Array() ; - - for ( var x = 0 ; x < ToolbarSet.length ; x++ ) + + for ( var x = 0 ; x < ToolbarSet.length ; x++ ) { var oToolbarItems = ToolbarSet[x] ; - + var oToolbar ; - + if ( typeof( oToolbarItems ) == 'string' ) { @@ -234,9 +250,9 @@ { oToolbar = new FCKToolbar() ; - - for ( var j = 0 ; j < oToolbarItems.length ; j++ ) + + for ( var j = 0 ; j < oToolbarItems.length ; j++ ) { var sItem = oToolbarItems[j] ; - + if ( sItem == '-') oToolbar.AddSeparator() ; @@ -252,5 +268,5 @@ if ( !oItem.SourceView ) this.ItemsWysiwygOnly.push( oItem ) ; - + if ( oItem.ContextSensitive ) this.ItemsContextSensitive.push( oItem ) ; @@ -258,13 +274,13 @@ } } - + // oToolbar.AddTerminator() ; } - + oToolbar.Create( this._TargetElement ) ; this.Toolbars[ this.Toolbars.length ] = oToolbar ; } - + FCKTools.DisableSelection( this._Document.getElementById( 'xCollapseHandle' ).parentNode ) ; @@ -311,5 +327,5 @@ var oToolbarSet = editorInstance ? editorInstance.ToolbarSet : this ; var aItems = oToolbarSet.ItemsWysiwygOnly ; - + if ( FCK.EditMode == FCK_EDITMODE_WYSIWYG ) { @@ -327,7 +343,7 @@ // Disable all buttons that are available on WYSIWYG mode only. - for ( var i = 0 ; i < aItems.length ; i++ ) - aItems[i].Disable() ; - } + for ( var j = 0 ; j < aItems.length ; j++ ) + aItems[j].Disable() ; + } } @@ -335,7 +351,7 @@ { // FCKDebug.Output( 'Refreshing Commands...' ) ; // @Packager.RemoveLine - + var aItems = ( editorInstance ? editorInstance.ToolbarSet : this ).ItemsContextSensitive ; - + for ( var i = 0 ; i < aItems.length ; i++ ) aItems[i].RefreshState() ; Index: /FCKeditor/branches/developers/alfonsoml/editor/_source/internals/fcktools.js =================================================================== --- /FCKeditor/branches/developers/alfonsoml/editor/_source/internals/fcktools.js (revision 140) +++ /FCKeditor/branches/developers/alfonsoml/editor/_source/internals/fcktools.js (revision 141) @@ -1,8 +1,24 @@ -/* @Packager.Header - - Utility functions. - - -*/ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * Utility functions. + */ // Constant for the Gecko Bogus Node. @@ -52,16 +68,16 @@ if ( FCKBrowserInfo.IsSafari && !document.parentWindow ) this.FixDocumentParentWindow( window.top ) ; - + return document.parentWindow || document.defaultView ; } /* - This is a Safari specific function that fix the reference to the parent + This is a Safari specific function that fix the reference to the parent window from the document object. */ FCKTools.FixDocumentParentWindow = function( targetWindow ) { - targetWindow.document.parentWindow = targetWindow ; - + targetWindow.document.parentWindow = targetWindow ; + for ( var i = 0 ; i < targetWindow.frames.length ; i++ ) FCKTools.FixDocumentParentWindow( targetWindow.frames[i] ) ; @@ -88,5 +104,5 @@ oOption.text = optionText ; - oOption.value = optionValue ; + oOption.value = optionValue ; selectElement.options.add(oOption) ; @@ -103,5 +119,5 @@ FCKTools.SetTimeout = function( func, milliseconds, thisObject, paramsArray, timerWindow ) { - return ( timerWindow || window ).setTimeout( + return ( timerWindow || window ).setTimeout( function() { @@ -116,5 +132,5 @@ FCKTools.SetInterval = function( func, milliseconds, thisObject, paramsArray, timerWindow ) { - return ( timerWindow || window ).setInterval( + return ( timerWindow || window ).setInterval( function() { @@ -126,5 +142,5 @@ FCKTools.ConvertStyleSizeToHtml = function( size ) { - return size.EndsWith( '%' ) ? size : parseInt( size ) ; + return size.EndsWith( '%' ) ? size : parseInt( size, 10 ) ; } @@ -159,10 +175,10 @@ { var aAllParams = [] ; - + for ( var i = 0 ; i < arguments.length ; i++ ) aAllParams.push( arguments[i] ) ; func.apply( this, aAllParams.concat( params ) ) ; - } + } return f ; @@ -181,7 +197,7 @@ startIndex = startIndex || 0 ; maxLength = maxLength || args.length ; - + var argsArray = new Array() ; - + for ( var i = startIndex ; i < startIndex + maxLength && i < args.length ; i++ ) argsArray.push( args[i] ) ; Index: /FCKeditor/branches/developers/alfonsoml/editor/_source/internals/fcktools_gecko.js =================================================================== --- /FCKeditor/branches/developers/alfonsoml/editor/_source/internals/fcktools_gecko.js (revision 140) +++ /FCKeditor/branches/developers/alfonsoml/editor/_source/internals/fcktools_gecko.js (revision 141) @@ -1,8 +1,24 @@ -/* @Packager.Header - - Utility functions. (Gecko version). - - -*/ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * Utility functions. (Gecko version). + */ FCKTools.CancelEvent = function( e ) @@ -15,5 +31,5 @@ { if ( FCKBrowserInfo.IsGecko ) - element.style.MozUserSelect = 'none' ; // Gecko only. + element.style.MozUserSelect = 'none' ; // Gecko only. else element.style.userSelect = 'none' ; // CSS3 (not supported yet). @@ -47,5 +63,5 @@ // Create the array that will hold all Ids. var aIds = new Array() ; - + // Define a recursive function that search for the Ids. var fGetIds = function( parent ) @@ -54,13 +70,13 @@ { var sId = parent.childNodes[i].id ; - + // Check if the Id is defined for the element. if ( sId && sId.length > 0 ) aIds[ aIds.length ] = sId ; - + // Recursive call. fGetIds( parent.childNodes[i] ) ; } } - + // Start the recursive calls. fGetIds( parentElement ) ; @@ -74,8 +90,8 @@ { var oFragment = e.ownerDocument.createDocumentFragment() ; - + for ( var i = 0 ; i < e.childNodes.length ; i++ ) oFragment.appendChild( e.childNodes[i].cloneNode(true) ) ; - + e.parentNode.replaceChild( oFragment, e ) ; } @@ -111,11 +127,11 @@ FCKTools.AddEventListenerEx = function( sourceObject, eventName, listener, paramsArray ) { - sourceObject.addEventListener( - eventName, + sourceObject.addEventListener( + eventName, function( e ) { listener.apply( sourceObject, [ e ].concat( paramsArray || [] ) ) ; }, - false + false ) ; } @@ -130,5 +146,5 @@ { var oSavedStyles = new Object() ; - + if ( element.className.length > 0 ) { @@ -160,6 +176,6 @@ FCKTools.RegisterDollarFunction = function( targetWindow ) { - targetWindow.$ = function( id ) - { + targetWindow.$ = function( id ) + { return this.document.getElementById( id ) ; } ; @@ -178,5 +194,5 @@ // Initializes the Coordinates object that will be returned by the function. var c = { X:0, Y:0 } ; - + var oWindow = relativeWindow || window ; @@ -190,5 +206,5 @@ // Check for non "static" elements. // 'FCKConfig.FloatingPanelsZIndex' -- Submenus are under a positioned IFRAME. - if ( sPosition && sPosition != 'static' && el.style.zIndex != FCKConfig.FloatingPanelsZIndex ) + if ( sPosition && sPosition != 'static' && el.style.zIndex != FCKConfig.FloatingPanelsZIndex ) break ; Index: /FCKeditor/branches/developers/alfonsoml/editor/_source/internals/fcktools_ie.js =================================================================== --- /FCKeditor/branches/developers/alfonsoml/editor/_source/internals/fcktools_ie.js (revision 140) +++ /FCKeditor/branches/developers/alfonsoml/editor/_source/internals/fcktools_ie.js (revision 141) @@ -1,8 +1,24 @@ -/* @Packager.Header - - Utility functions. (IE version). - - -*/ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * Utility functions. (IE version). + */ FCKTools.CancelEvent = function( e ) @@ -44,5 +60,5 @@ { var aObjs ; - + switch ( object ) { @@ -50,5 +66,5 @@ aObjs = [ 'MSXML2.XmlHttp', 'Microsoft.XmlHttp' ] ; break ; - + case 'DOMDocument' : aObjs = [ 'MSXML2.DOMDocument', 'Microsoft.XmlDom' ] ; @@ -59,8 +75,8 @@ { try { return new ActiveXObject( aObjs[i] ) ; } - catch (e) + catch (e) {} } - + if ( FCKLang.NoActiveX ) { @@ -99,5 +115,5 @@ // Try with the doc element. var oPos = { X : oDoc.documentElement.scrollLeft, Y : oDoc.documentElement.scrollTop } ; - + if ( oPos.X > 0 || oPos.Y > 0 ) return oPos ; @@ -130,8 +146,8 @@ return listener.apply( o.Source, [ ev ].concat( o.Params ) ) ; } - + if ( FCK.IECleanup ) FCK.IECleanup.AddItem( null, function() { o.Source = null ; o.Params = null ; } ) ; - + sourceObject.attachEvent( 'on' + eventName, o.Listener ) ; @@ -144,5 +160,5 @@ { var oSizeSource ; - + var oDoc = win.document.documentElement ; if ( oDoc && oDoc.clientWidth ) // IE6 Strict Mode @@ -150,5 +166,5 @@ else oSizeSource = top.document.body ; // Other IEs - + if ( oSizeSource ) return { Width : oSizeSource.clientWidth, Height : oSizeSource.clientHeight } ; @@ -160,5 +176,5 @@ { var oSavedStyles = new Object() ; - + if ( element.className.length > 0 ) { @@ -174,5 +190,5 @@ element.style.cssText = '' ; } - + return oSavedStyles ; } @@ -193,2 +209,8 @@ return target.appendChild( this.GetElementDocument( target ).createElement( elementName ) ) ; } + +// This function may be used by Regex replacements. +FCKTools.ToLowerCase = function( strValue ) +{ + return strValue.toLowerCase() ; +} Index: /FCKeditor/branches/developers/alfonsoml/editor/_source/internals/fckundo_gecko.js =================================================================== --- /FCKeditor/branches/developers/alfonsoml/editor/_source/internals/fckundo_gecko.js (revision 140) +++ /FCKeditor/branches/developers/alfonsoml/editor/_source/internals/fckundo_gecko.js (revision 141) @@ -1,8 +1,24 @@ -/* @Packager.Header - - Fake implementation to ignore calls on Gecko. - - -*/ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * Fake implementation to ignore calls on Gecko. + */ var FCKUndo = new Object() ; Index: /FCKeditor/branches/developers/alfonsoml/editor/_source/internals/fckundo_ie.js =================================================================== --- /FCKeditor/branches/developers/alfonsoml/editor/_source/internals/fckundo_ie.js (revision 140) +++ /FCKeditor/branches/developers/alfonsoml/editor/_source/internals/fckundo_ie.js (revision 141) @@ -1,8 +1,24 @@ -/* @Packager.Header - - IE specific implementation for the Undo/Redo system. - - -*/ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * IE specific implementation for the Undo/Redo system. + */ var FCKUndo = new Object() ; @@ -88,5 +104,5 @@ { var oData = FCKUndo.SavedData[ level ] ; - + if ( !oData ) return ; @@ -96,5 +112,5 @@ // FCK.EditorDocument.body.innerHTML = oData[0] ; - if ( oData[1] ) + if ( oData[1] ) { var oRange = FCK.EditorDocument.selection.createRange() ; @@ -102,6 +118,6 @@ oRange.select() ; } - - FCKUndo.TypesCount = 0 ; + + FCKUndo.TypesCount = 0 ; FCKUndo.Typing = false ; } Index: /FCKeditor/branches/developers/alfonsoml/editor/_source/internals/fckurlparams.js =================================================================== --- /FCKeditor/branches/developers/alfonsoml/editor/_source/internals/fckurlparams.js (revision 140) +++ /FCKeditor/branches/developers/alfonsoml/editor/_source/internals/fckurlparams.js (revision 141) @@ -1,9 +1,25 @@ -/* @Packager.Header - - Defines the FCKURLParams object that is used to get all parameters - passed by the URL QueryString (after the "?"). - - -*/ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * Defines the FCKURLParams object that is used to get all parameters + * passed by the URL QueryString (after the "?"). + */ // #### URLParams: holds all URL passed parameters (like ?Param1=Value1&Param2=Value2) Index: /FCKeditor/branches/developers/alfonsoml/editor/_source/internals/fckxhtml.js =================================================================== --- /FCKeditor/branches/developers/alfonsoml/editor/_source/internals/fckxhtml.js (revision 140) +++ /FCKeditor/branches/developers/alfonsoml/editor/_source/internals/fckxhtml.js (revision 141) @@ -1,9 +1,24 @@ -/* @Packager.Header - - Defines the FCKXHtml object, responsible for the XHTML operations. - - - -*/ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * Defines the FCKXHtml object, responsible for the XHTML operations. + */ var FCKXHtml = new Object() ; @@ -14,9 +29,9 @@ { FCKXHtmlEntities.Initialize() ; - + // Save the current IsDirty state. The XHTML processor may change the // original HTML, dirtying it. var bIsDirty = FCK.IsDirty() ; - + this._CreateNode = FCKConfig.ForceStrongEm ? FCKXHtml_CreateNode_StrongEm : FCKXHtml_CreateNode_Normal ; @@ -42,9 +57,11 @@ this.XML = null ; - + // Strip the "XHTML" root node. sXHTML = sXHTML.substr( 7, sXHTML.length - 15 ).Trim() ; - + // Remove the trailing
added by Gecko. + // REMOVE: Maybe the following is not anymore necessary because a similar + // check is made on _AppendNode if ( FCKBrowserInfo.IsGecko ) sXHTML = sXHTML.replace( /$/, '' ) ; @@ -65,5 +82,5 @@ sXHTML = sXHTML.replace( oRegex, FCKXHtml.SpecialBlocks[i] ) ; } - + // Replace entities marker with the ampersand. sXHTML = sXHTML.replace( FCKRegexLib.GeckoEntitiesMarker, '&' ) ; @@ -73,5 +90,5 @@ FCK.ResetIsDirty() ; - return sXHTML + return sXHTML ; } @@ -80,5 +97,5 @@ try { - if ( !attributeValue ) + if ( attributeValue == undefined || attributeValue == null ) attributeValue = '' ; else if ( attributeValue.replace ) @@ -86,9 +103,9 @@ if ( FCKConfig.ForceSimpleAmpersand ) attributeValue = attributeValue.replace( /&/g, '___FCKAmp___' ) ; - + // Entities must be replaced in the attribute values. attributeValue = attributeValue.replace( FCKXHtmlEntities.EntitiesRegex, FCKXHtml_GetEntity ) ; } - + // Create the attribute. var oXmlAtt = this.XML.createAttribute( attributeName ) ; @@ -104,6 +121,11 @@ FCKXHtml._AppendChildNodes = function( xmlNode, htmlNode, isBlockElement ) { + // Trim block elements. This is also needed to avoid Firefox leaving extra + // BRs at the end of them (check made inside _AppendNode). + if ( isBlockElement ) + FCKDomTools.TrimNode( htmlNode ) ; + var iCount = 0 ; - + var oNode = htmlNode.firstChild ; @@ -115,5 +137,5 @@ oNode = oNode.nextSibling ; } - + if ( iCount == 0 ) { @@ -121,12 +143,20 @@ { this._AppendEntity( xmlNode, 'nbsp' ) ; - return ; + return xmlNode ; } + + var sNodeName = xmlNode.nodeName ; + + // Some inline elements are required to have something inside (span, strong, etc...). + if ( FCKListsLib.InlineChildReqElements[ sNodeName ] ) + return null ; // We can't use short representation of empty elements that are not marked // as empty in th XHTML DTD. - if ( !FCKRegexLib.EmptyElements.test( xmlNode.nodeName ) ) + if ( !FCKListsLib.EmptyElements[ sNodeName ] ) xmlNode.appendChild( this.XML.createTextNode('') ) ; } + + return xmlNode ; } @@ -141,14 +171,14 @@ case 1 : - // Here we found an element that is not the real element, but a + // Here we found an element that is not the real element, but a // fake one (like the Flash placeholder image), so we must get the real one. if ( htmlNode.getAttribute('_fckfakelement') ) return FCKXHtml._AppendNode( xmlNode, FCK.GetRealElement( htmlNode ) ) ; - + // Mozilla insert custom nodes in the DOM. if ( FCKBrowserInfo.IsGecko && htmlNode.hasAttribute('_moz_editor_bogus_node') ) return false ; - - // This is for elements that are instrumental to FCKeditor and + + // This is for elements that are instrumental to FCKeditor and // must be removed from the final HTML. if ( htmlNode.getAttribute('_fcktemp') ) @@ -157,5 +187,5 @@ // Get the element name. var sNodeName = htmlNode.tagName.toLowerCase() ; - + if ( FCKBrowserInfo.IsIE ) { @@ -176,5 +206,6 @@ return false ; - if ( sNodeName == 'br' && htmlNode.getAttribute( 'type', 2 ) == '_moz' ) + // Remove the
if it is a bogus node or is the last child. + if ( sNodeName == 'br' && ( htmlNode.getAttribute( 'type', 2 ) == '_moz' || !htmlNode.nextSibling ) ) return false ; @@ -185,8 +216,8 @@ var oNode = this._CreateNode( sNodeName ) ; - + // Add all attributes. FCKXHtml._AppendAttributes( xmlNode, htmlNode, oNode, sNodeName ) ; - + htmlNode._fckxhtmljob = FCKXHtml.CurrentJobNum ; @@ -195,10 +226,10 @@ if ( oTagProcessor ) - { oNode = oTagProcessor( oNode, htmlNode, xmlNode ) ; - if ( !oNode ) break ; - } else - this._AppendChildNodes( oNode, htmlNode, FCKRegexLib.BlockElements.test( sNodeName ) ) ; + oNode = this._AppendChildNodes( oNode, htmlNode, Boolean( FCKListsLib.NonEmptyBlockElements[ sNodeName ] ) ) ; + + if ( !oNode ) + break ; xmlNode.appendChild( oNode ) ; @@ -208,6 +239,5 @@ // Text Node. case 3 : - this._AppendTextNode( xmlNode, htmlNode.nodeValue.ReplaceNewLineChars(' ') ) ; - break ; + return this._AppendTextNode( xmlNode, htmlNode.nodeValue.ReplaceNewLineChars(' ') ) ; // Comment @@ -262,6 +292,8 @@ FCKXHtml._AppendTextNode = function( targetNode, textValue ) { - targetNode.appendChild( this.XML.createTextNode( textValue.replace( FCKXHtmlEntities.EntitiesRegex, FCKXHtml_GetEntity ) ) ) ; - return ; + var bHadText = textValue.length > 0 ; + if ( bHadText ) + targetNode.appendChild( this.XML.createTextNode( textValue.replace( FCKXHtmlEntities.EntitiesRegex, FCKXHtml_GetEntity ) ) ) ; + return bHadText ; } @@ -310,4 +342,8 @@ a : function( node, htmlNode ) { + // Firefox may create empty tags when deleting the selection in some special cases (SF-BUG 1556878). + if ( htmlNode.innerHTML.Trim().length == 0 && !htmlNode.name ) + return false ; + var sSavedUrl = htmlNode.getAttribute( '_fcksavedurl' ) ; if ( sSavedUrl != null ) @@ -327,8 +363,4 @@ FCKXHtml._AppendChildNodes( node, htmlNode, false ) ; - // Firefox may create empty tags when deleting the selection in some special cases (SF-BUG 1556878). - if ( node.childNodes.length == 0 && !node.getAttribute( 'name' ) ) - return false ; - return node ; }, @@ -383,8 +415,8 @@ var ePSibling = targetNode.lastChild ; - + if ( ePSibling && ePSibling.nodeType == 3 ) ePSibling = ePSibling.previousSibling ; - + if ( ePSibling && ePSibling.nodeName.toUpperCase() == 'LI' ) { @@ -404,10 +436,10 @@ if ( htmlNode.innerHTML.length == 0 ) return false ; - + FCKXHtml._AppendChildNodes( node, htmlNode, false ) ; return node ; } -} +} ; FCKXHtml.TagProcessors.ul = FCKXHtml.TagProcessors.ol ; Index: /FCKeditor/branches/developers/alfonsoml/editor/_source/internals/fckxhtml_gecko.js =================================================================== --- /FCKeditor/branches/developers/alfonsoml/editor/_source/internals/fckxhtml_gecko.js (revision 140) +++ /FCKeditor/branches/developers/alfonsoml/editor/_source/internals/fckxhtml_gecko.js (revision 141) @@ -1,9 +1,25 @@ -/* @Packager.Header - - Defines the FCKXHtml object, responsible for the XHTML operations. - Gecko specific. - - -*/ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * Defines the FCKXHtml object, responsible for the XHTML operations. + * Gecko specific. + */ FCKXHtml._GetMainXmlString = function() @@ -19,9 +35,9 @@ { var aAttributes = htmlNode.attributes ; - + for ( var n = 0 ; n < aAttributes.length ; n++ ) { var oAttribute = aAttributes[n] ; - + if ( oAttribute.specified ) { Index: /FCKeditor/branches/developers/alfonsoml/editor/_source/internals/fckxhtml_ie.js =================================================================== --- /FCKeditor/branches/developers/alfonsoml/editor/_source/internals/fckxhtml_ie.js (revision 140) +++ /FCKeditor/branches/developers/alfonsoml/editor/_source/internals/fckxhtml_ie.js (revision 141) @@ -1,9 +1,25 @@ -/* @Packager.Header - - Defines the FCKXHtml object, responsible for the XHTML operations. - IE specific. - - -*/ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * Defines the FCKXHtml object, responsible for the XHTML operations. + * IE specific. + */ FCKXHtml._GetMainXmlString = function() @@ -31,5 +47,5 @@ // attribute. It returns "null" for the nodeValue. else if ( sAttName == 'style' ) - sAttValue = htmlNode.style.cssText ; + sAttValue = htmlNode.style.cssText.replace( FCKRegexLib.StyleProperties, FCKTools.ToLowerCase ) ; // There are two cases when the oAttribute.nodeValue must be used: // - for the "class" attribute @@ -42,9 +58,9 @@ else if ( oAttribute.nodeValue === true ) sAttValue = sAttName ; - else + else { // We must use getAttribute to get it exactly as it is defined. // There are some rare cases that IE throws an error here, so we must try/catch. - try + try { sAttValue = htmlNode.getAttribute( sAttName, 2 ) ; @@ -125,7 +141,7 @@ if ( ! node.attributes.getNamedItem( 'shape' ) ) { - var sCoords = htmlNode.getAttribute( 'shape', 2 ) ; - if ( sCoords && sCoords.length > 0 ) - FCKXHtml._AppendAttribute( node, 'shape', sCoords ) ; + var sShape = htmlNode.getAttribute( 'shape', 2 ) ; + if ( sShape && sShape.length > 0 ) + FCKXHtml._AppendAttribute( node, 'shape', sShape ) ; } @@ -148,6 +164,6 @@ FCKXHtml._AppendAttribute( node, 'accept-charset', htmlNode.acceptCharset ) ; - if ( htmlNode.name ) - FCKXHtml._AppendAttribute( node, 'name', htmlNode.name ) ; + if ( htmlNode.name ) + FCKXHtml._AppendAttribute( node, 'name', htmlNode.name ) ; FCKXHtml._AppendChildNodes( node, htmlNode ) ; @@ -158,12 +174,12 @@ // IE doens't hold the name attribute as an attribute for the

and <SELECT> tags.
 FCKXHtml.TagProcessors['textarea'] = FCKXHtml.TagProcessors['select'] = function( node, htmlNode )
-{ 
-	if ( htmlNode.name ) 
-		FCKXHtml._AppendAttribute( node, 'name', htmlNode.name ) ; 
+{
+	if ( htmlNode.name )
+		FCKXHtml._AppendAttribute( node, 'name', htmlNode.name ) ;
 
-	FCKXHtml._AppendChildNodes( node, htmlNode ) ; 
- 
-	return node ; 
-} 
+	FCKXHtml._AppendChildNodes( node, htmlNode ) ;
+
+	return node ;
+}
 
 // On very rare cases, IE is loosing the "align" attribute for DIV. (right align and apply bulleted list)
@@ -173,5 +189,5 @@
 		FCKXHtml._AppendAttribute( node, 'align', htmlNode.align ) ;
 
-	FCKXHtml._AppendChildNodes( node, htmlNode ) ;
+	FCKXHtml._AppendChildNodes( node, htmlNode, true ) ;
 
 	return node ;
Index: /FCKeditor/branches/developers/alfonsoml/editor/_source/internals/fckxhtmlentities.js
===================================================================
--- /FCKeditor/branches/developers/alfonsoml/editor/_source/internals/fckxhtmlentities.js	(revision 140)
+++ /FCKeditor/branches/developers/alfonsoml/editor/_source/internals/fckxhtmlentities.js	(revision 141)
@@ -1,8 +1,24 @@
-/* @Packager.Header
-<FileDescription>
-	This file define the HTML entities handled by the editor.
-</FileDescription>
-<Author name="Frederico Caldeira Knabben" email="www.fckeditor.net" />
-*/
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2007 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * This file define the HTML entities handled by the editor.
+ */
 
 var FCKXHtmlEntities = new Object() ;
@@ -14,4 +30,5 @@
 
 	var sChars = '' ;
+	var oEntities, e ;
 
 	if ( FCKConfig.ProcessHTMLEntities )
@@ -123,5 +140,5 @@
 			'♦':'diams',
 
-			// Other Special Characters 
+			// Other Special Characters
 
 			'"':'quot',
@@ -155,5 +172,5 @@
 
 		// Process Base Entities.
-		for ( var e in FCKXHtmlEntities.Entities )
+		for ( e in FCKXHtmlEntities.Entities )
 			sChars += e ;
 
@@ -161,5 +178,5 @@
 		if ( FCKConfig.IncludeLatinEntities )
 		{
-			var oEntities = {
+			oEntities = {
 				'À':'Agrave',
 				'Á':'Aacute',
@@ -229,12 +246,12 @@
 				'š':'scaron',
 				'Ÿ':'Yuml'
-			} ; 
-			
-			for ( var e in oEntities )
+			} ;
+
+			for ( e in oEntities )
 			{
 				FCKXHtmlEntities.Entities[ e ] = oEntities[ e ] ;
 				sChars += e ;
 			}
-			
+
 			oEntities = null ;
 		}
@@ -243,5 +260,5 @@
 		if ( FCKConfig.IncludeGreekEntities )
 		{
-			var oEntities = {
+			oEntities = {
 				'Α':'Alpha',
 				'Β':'Beta',
@@ -295,5 +312,5 @@
 			} ;
 
-			for ( var e in oEntities )
+			for ( e in oEntities )
 			{
 				FCKXHtmlEntities.Entities[ e ] = oEntities[ e ] ;
@@ -302,5 +319,5 @@
 
 			oEntities = null ;
-		}		
+		}
 	}
 	else
@@ -316,5 +333,5 @@
 	// Create the Regex used to find entities in the text.
 	var sRegexPattern = '[' + sChars + ']' ;
-	
+
 	if ( FCKConfig.ProcessNumericEntities )
 		sRegexPattern = '[^ -~]|' + sRegexPattern ;
Index: /FCKeditor/branches/developers/alfonsoml/editor/css/fck_editorarea.css
===================================================================
--- /FCKeditor/branches/developers/alfonsoml/editor/css/fck_editorarea.css	(revision 140)
+++ /FCKeditor/branches/developers/alfonsoml/editor/css/fck_editorarea.css	(revision 141)
@@ -1,14 +1,29 @@
-/* @Packager.Header
-<FileDescription>
-	This is the default CSS file used by the editor area. It defines the
-	initial font of the editor and background color.
-
-	A user can configure the editor to use another CSS file. Just change
-	the value of the FCKConfig.EditorAreaCSS key in the configuration
-	file.
-</FileDescription>
-<Author name="Frederico Caldeira Knabben" email="www.fckeditor.net" />
-<Author name="Alfonso Martinez de Lizarrondo - Uritec" email="alfonso at uritec dot net" />
-*/
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2007 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * This is the default CSS file used by the editor area. It defines the
+ * initial font of the editor and background color.
+ *
+ * A user can configure the editor to use another CSS file. Just change
+ * the value of the FCKConfig.EditorAreaCSS key in the configuration
+ * file.
+ */
 
 /*
@@ -35,6 +50,6 @@
 }
 
-/* 
-	Just uncomment the following block if you want to avoid spaces between 
+/*
+	Just uncomment the following block if you want to avoid spaces between
 	paragraphs. Remember to apply the same style in your output front end page.
 */
Index: /FCKeditor/branches/developers/alfonsoml/editor/css/fck_internal.css
===================================================================
--- /FCKeditor/branches/developers/alfonsoml/editor/css/fck_internal.css	(revision 140)
+++ /FCKeditor/branches/developers/alfonsoml/editor/css/fck_internal.css	(revision 141)
@@ -1,9 +1,24 @@
-/* @Packager.Header
-<FileDescription>
-	This CSS Style Sheet defines rules used by the editor for its internal use.
-</FileDescription>
-<Author name="Frederico Caldeira Knabben" email="www.fckeditor.net" />
-<Author name="Alfonso Martinez de Lizarrondo - Uritec" email="alfonso at uritec dot net" />
-*/
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2007 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * This CSS Style Sheet defines rules used by the editor for its internal use.
+ */
 
 /* Fix to allow putting the caret at the end of the
@@ -58,5 +73,5 @@
 }
 
-/* Any anchor for non-IE, if we combine it 
+/* Any anchor for non-IE, if we combine it
    with the previous rule IE ignores all. */
 a[name]
Index: /FCKeditor/branches/developers/alfonsoml/editor/css/fck_showtableborders_gecko.css
===================================================================
--- /FCKeditor/branches/developers/alfonsoml/editor/css/fck_showtableborders_gecko.css	(revision 140)
+++ /FCKeditor/branches/developers/alfonsoml/editor/css/fck_showtableborders_gecko.css	(revision 141)
@@ -1,14 +1,30 @@
-/* @Packager.Header
-<FileDescription>
-	This CSS Style Sheet defines the rules to show table borders on Gecko.
-</FileDescription>
-<Author name="Frederico Caldeira Knabben" email="www.fckeditor.net" />
-*/
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2007 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * This CSS Style Sheet defines the rules to show table borders on Gecko.
+ */
 
 /* For tables with the "border" attribute set to "0" */
-table[border="0"], 
-table[border="0"] > tr > td, table[border="0"] > tr > th, 
-table[border="0"] > tbody > tr > td, table[border="0"] > tbody > tr > th, 
-table[border="0"] > thead > tr > td, table[border="0"] > thead > tr > th, 
+table[border="0"],
+table[border="0"] > tr > td, table[border="0"] > tr > th,
+table[border="0"] > tbody > tr > td, table[border="0"] > tbody > tr > th,
+table[border="0"] > thead > tr > td, table[border="0"] > thead > tr > th,
 table[border="0"] > tfoot > tr > td, table[border="0"] > tfoot > tr > th
 {
@@ -17,5 +33,5 @@
 
 /* For tables with no "border" attribute set */
-table:not([border]), 
+table:not([border]),
 table:not([border]) > tr > td, table:not([border]) > tr > th,
 table:not([border]) > tbody > tr > td, table:not([border]) > tbody > tr > th,
Index: /FCKeditor/branches/developers/alfonsoml/editor/dialog/common/fck_dialog_common.css
===================================================================
--- /FCKeditor/branches/developers/alfonsoml/editor/dialog/common/fck_dialog_common.css	(revision 140)
+++ /FCKeditor/branches/developers/alfonsoml/editor/dialog/common/fck_dialog_common.css	(revision 141)
@@ -1,9 +1,25 @@
-/* @Packager.Header
-<FileDescription>
-	This is the CSS file used for interface details in some dialog
-	windows.
-</FileDescription>
-<Author name="Frederico Caldeira Knabben" email="www.fckeditor.net" />
-*/
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2007 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * This is the CSS file used for interface details in some dialog
+ * windows.
+ */
 
 .ImagePreviewArea
Index: /FCKeditor/branches/developers/alfonsoml/editor/dialog/common/fck_dialog_common.js
===================================================================
--- /FCKeditor/branches/developers/alfonsoml/editor/dialog/common/fck_dialog_common.js	(revision 140)
+++ /FCKeditor/branches/developers/alfonsoml/editor/dialog/common/fck_dialog_common.js	(revision 141)
@@ -1,8 +1,26 @@
-/* @Packager.Header
-<FileDescription>
-	Useful functions used by almost all dialog window pages.
-</FileDescription>
-<Author name="Frederico Caldeira Knabben" email="www.fckeditor.net" />
-*/
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2007 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Useful functions used by almost all dialog window pages.
+ */
+
+var GECKO_BOGUS = '<br type="_moz">' ;
 
 // Gets a element by its Id. Used for shorter coding.
@@ -34,7 +52,7 @@
 		return valueIfNull ? valueIfNull : '' ;
 
-	var oValue ;
-	
-	if ( !( oValue = element.getAttribute( attName, 2 ) ) )
+	var oValue = element.getAttribute( attName, 2 ) ;
+
+	if ( oValue == null )
 		oValue = oAtt.nodeValue ;
 
@@ -49,5 +67,5 @@
 
 	var iCode = ( e.keyCode || e.charCode ) ;
-	
+
 	return (
 			( iCode >= 48 && iCode <= 57 )		// Numbers
@@ -84,10 +102,10 @@
 {
 	var replaced = this ;
-	
+
 	for ( var i = 0 ; i < searchArray.length ; i++ )
 	{
 		replaced = replaced.replace( searchArray[i], replaceArray[i] ) ;
 	}
-	
+
 	return replaced ;
 }
@@ -96,5 +114,5 @@
 {
 	// oEditor must be defined.
-	
+
 	var iLeft = ( oEditor.FCKConfig.ScreenWidth  - width ) / 2 ;
 	var iTop  = ( oEditor.FCKConfig.ScreenHeight - height ) / 2 ;
@@ -106,14 +124,14 @@
 	sOptions += ",top=" + iTop ;
 
-	// The "PreserveSessionOnFileBrowser" because the above code could be 
+	// The "PreserveSessionOnFileBrowser" because the above code could be
 	// blocked by popup blockers.
 	if ( oEditor.FCKConfig.PreserveSessionOnFileBrowser && oEditor.FCKBrowserInfo.IsIE )
 	{
-		// The following change has been made otherwise IE will open the file 
+		// The following change has been made otherwise IE will open the file
 		// browser on a different server session (on some cases):
 		// http://support.microsoft.com/default.aspx?scid=kb;en-us;831678
 		// by Simone Chiaretta.
 		var oWindow = oEditor.window.open( url, 'FCKBrowseWindow', sOptions ) ;
-		
+
 		if ( oWindow )
 		{
Index: /FCKeditor/branches/developers/alfonsoml/editor/dialog/common/moz-bindings.xml
===================================================================
--- /FCKeditor/branches/developers/alfonsoml/editor/dialog/common/moz-bindings.xml	(revision 140)
+++ /FCKeditor/branches/developers/alfonsoml/editor/dialog/common/moz-bindings.xml	(revision 141)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <bindings xmlns="http://www.mozilla.org/xbl">
 	<binding id="numericfield">
@@ -15,6 +15,6 @@
 							( iCode >= 48 && iCode <= 57 )		// Numbers
 							|| (iCode >= 37 && iCode <= 40)		// Arrows
-							|| iCode == 8											// Backspace
-							|| iCode == 46										// Delete
+							|| iCode == 8						// Backspace
+							|| iCode == 46						// Delete
 						) ;
 
Index: /FCKeditor/branches/developers/alfonsoml/editor/dialog/fck_about.html
===================================================================
--- /FCKeditor/branches/developers/alfonsoml/editor/dialog/fck_about.html	(revision 140)
+++ /FCKeditor/branches/developers/alfonsoml/editor/dialog/fck_about.html	(revision 141)
@@ -1,8 +1,24 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
 <html xmlns="http://www.w3.org/1999/xhtml">
@@ -63,6 +79,6 @@
 								<span fcklang="DlgAboutVersion">version</span>
 								<br />
-								<b>[[@Packager.Version]]</b><br />
-								Build [[@Packager.Build]]</td>
+								<b>2.4.1 (SVN)</b><br />
+								Build 1156</td>
 						</tr>
 					</table>
@@ -82,5 +98,5 @@
 						target="_blank">http://www.fckeditor.net/</a>.
 					<br />
-					Copyright © 2003-2006 <a href="#" onclick="SendEMail();">Frederico Caldeira Knabben</a>
+					Copyright © 2003-2007 <a href="#" onclick="SendEMail();">Frederico Caldeira Knabben</a>
 				</td>
 			</tr>
@@ -93,20 +109,22 @@
 	</div>
 	<div id="divLicense" style="display: none">
-		<table style="height: 100%" width="100%">
-			<tr>
-				<td>
-					<span fcklang="DlgAboutLicense">Licensed under the terms of the GNU Lesser General Public
-						License</span>
-					<br />
-					<a href="http://www.opensource.org/licenses/lgpl-license.php" target="_blank">http://www.opensource.org/licenses/lgpl-license.php</a>
-					<br />
-				</td>
-			</tr>
-			<tr>
-				<td height="100%">
-					<iframe height="100%" width="100%" src="fck_about/lgpl.html" frameborder="1"></iframe>
-				</td>
-			</tr>
-		</table>
+			<p>
+				Licensed under the terms of any of the following licenses at your
+				choice:
+			</p>
+			<ul>
+				<li style="margin-bottom:15px">
+					<b>GNU General Public License</b> Version 2 or later (the "GPL")<br />
+					<a href="http://www.gnu.org/licenses/gpl.html" target="_blank">http://www.gnu.org/licenses/gpl.html</a>
+				</li>
+				<li style="margin-bottom:15px">
+					<b>GNU Lesser General Public License</b> Version 2.1 or later (the "LGPL")<br />
+					<a href="http://www.gnu.org/licenses/lgpl.html" target="_blank">http://www.gnu.org/licenses/lgpl.html</a>
+				</li>
+				<li>
+					<b>Mozilla Public License</b> Version 1.1 or later (the "MPL")<br />
+					<a href="http://www.mozilla.org/MPL/MPL-1.1.html" target="_blank">http://www.mozilla.org/MPL/MPL-1.1.html</a>
+			   </li>
+			</ul>
 	</div>
 	<div id="divInfo" style="display: none" dir="ltr">
Index: Keditor/branches/developers/alfonsoml/editor/dialog/fck_about/lgpl.html
===================================================================
--- /FCKeditor/branches/developers/alfonsoml/editor/dialog/fck_about/lgpl.html	(revision 140)
+++ 	(revision )
@@ -1,482 +1,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-	<title>GNU Lesser General Public License</title>
-	<style type="text/css">
-			body 
-			{
-				font-family: Monospace;
-				font-size: 12px;
-				background-color: #ffffff;
-			}
-	</style>
-</head>
-<body>
-	<h3>
-		GNU Lesser General Public License</h3>
-	<p>
-		Version 2.1, February 1999</p>
-	<blockquote>
-		<p>
-			Copyright (C) 1991, 1999 Free Software Foundation, Inc. 59 Temple Place, Suite 330,
-			Boston, MA 02111-1307 USA Everyone is permitted to copy and distribute verbatim
-			copies of this license document, but changing it is not allowed.</p>
-		<p>
-			[This is the first released version of the Lesser GPL. It also counts as the successor
-			of the GNU Library Public License, version 2, hence the version number 2.1.]</p>
-	</blockquote>
-	<h4>
-		Preamble</h4>
-	<p>
-		The licenses for most software are designed to take away your freedom to share and
-		change it. By contrast, the GNU General Public Licenses are intended to guarantee
-		your freedom to share and change free software--to make sure the software is free
-		for all its users.
-	</p>
-	<p>
-		This license, the Lesser General Public License, applies to some specially designated
-		software packages--typically libraries--of the Free Software Foundation and other
-		authors who decide to use it. You can use it too, but we suggest you first think
-		carefully about whether this license or the ordinary General Public License is the
-		better strategy to use in any particular case, based on the explanations below.
-	</p>
-	<p>
-		When we speak of free software, we are referring to freedom of use, not price. Our
-		General Public Licenses are designed to make sure that you have the freedom to distribute
-		copies of free software (and charge for this service if you wish); that you receive
-		source code or can get it if you want it; that you can change the software and use
-		pieces of it in new free programs; and that you are informed that you can do these
-		things.</p>
-	<p>
-		To protect your rights, we need to make restrictions that forbid distributors to
-		deny you these rights or to ask you to surrender these rights. These restrictions
-		translate to certain responsibilities for you if you distribute copies of the library
-		or if you modify it.
-	</p>
-	<p>
-		For example, if you distribute copies of the library, whether gratis or for a fee,
-		you must give the recipients all the rights that we gave you. You must make sure
-		that they, too, receive or can get the source code. If you link other code with
-		the library, you must provide complete object files to the recipients, so that they
-		can relink them with the library after making changes to the library and recompiling
-		it. And you must show them these terms so they know their rights.
-	</p>
-	<p>
-		We protect your rights with a two-step method: (1) we copyright the library, and
-		(2) we offer you this license, which gives you legal permission to copy, distribute
-		and/or modify the library.
-	</p>
-	<p>
-		To protect each distributor, we want to make it very clear that there is no warranty
-		for the free library. Also, if the library is modified by someone else and passed
-		on, the recipients should know that what they have is not the original version,
-		so that the original author's reputation will not be affected by problems that might
-		be introduced by others.
-	</p>
-	<p>
-		Finally, software patents pose a constant threat to the existence of any free program.
-		We wish to make sure that a company cannot effectively restrict the users of a free
-		program by obtaining a restrictive license from a patent holder. Therefore, we insist
-		that any patent license obtained for a version of the library must be consistent
-		with the full freedom of use specified in this license.
-	</p>
-	<p>
-		Most GNU software, including some libraries, is covered by the ordinary GNU General
-		Public License. This license, the GNU Lesser General Public License, applies to
-		certain designated libraries, and is quite different from the ordinary General Public
-		License. We use this license for certain libraries in order to permit linking those
-		libraries into non-free programs.
-	</p>
-	<p>
-		When a program is linked with a library, whether statically or using a shared library,
-		the combination of the two is legally speaking a combined work, a derivative of
-		the original library. The ordinary General Public License therefore permits such
-		linking only if the entire combination fits its criteria of freedom. The Lesser
-		General Public License permits more lax criteria for linking other code with the
-		library.
-	</p>
-	<p>
-		We call this license the "Lesser" General Public License because it does Less to
-		protect the user's freedom than the ordinary General Public License. It also provides
-		other free software developers Less of an advantage over competing non-free programs.
-		These disadvantages are the reason we use the ordinary General Public License for
-		many libraries. However, the Lesser license provides advantages in certain special
-		circumstances.
-	</p>
-	<p>
-		For example, on rare occasions, there may be a special need to encourage the widest
-		possible use of a certain library, so that it becomes a de-facto standard. To achieve
-		this, non-free programs must be allowed to use the library. A more frequent case
-		is that a free library does the same job as widely used non-free libraries. In this
-		case, there is little to gain by limiting the free library to free software only,
-		so we use the Lesser General Public License.
-	</p>
-	<p>
-		In other cases, permission to use a particular library in non-free programs enables
-		a greater number of people to use a large body of free software. For example, permission
-		to use the GNU C Library in non-free programs enables many more people to use the
-		whole GNU operating system, as well as its variant, the GNU/Linux operating system.
-	</p>
-	<p>
-		Although the Lesser General Public License is Less protective of the users' freedom,
-		it does ensure that the user of a program that is linked with the Library has the
-		freedom and the wherewithal to run that program using a modified version of the
-		Library.
-	</p>
-	<p>
-		The precise terms and conditions for copying, distribution and modification follow.
-		Pay close attention to the difference between a "work based on the library" and
-		a "work that uses the library". The former contains code derived from the library,
-		whereas the latter must be combined with the library in order to run.
-	</p>
-	<h4>
-		TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION</h4>
-	<p>
-		<strong>0.</strong> This License Agreement applies to any software library or other
-		program which contains a notice placed by the copyright holder or other authorized
-		party saying it may be distributed under the terms of this Lesser General Public
-		License (also called "this License"). Each licensee is addressed as "you".</p>
-	<p>
-		A "library" means a collection of software functions and/or data prepared so as
-		to be conveniently linked with application programs (which use some of those functions
-		and data) to form executables.
-	</p>
-	<p>
-		The "Library", below, refers to any such software library or work which has been
-		distributed under these terms. A "work based on the Library" means either the Library
-		or any derivative work under copyright law: that is to say, a work containing the
-		Library or a portion of it, either verbatim or with modifications and/or translated
-		straightforwardly into another language. (Hereinafter, translation is included without
-		limitation in the term "modification".)
-	</p>
-	<p>
-		"Source code" for a work means the preferred form of the work for making modifications
-		to it. For a library, complete source code means all the source code for all modules
-		it contains, plus any associated interface definition files, plus the scripts used
-		to control compilation and installation of the library.</p>
-	<p>
-		Activities other than copying, distribution and modification are not covered by
-		this License; they are outside its scope. The act of running a program using the
-		Library is not restricted, and output from such a program is covered only if its
-		contents constitute a work based on the Library (independent of the use of the Library
-		in a tool for writing it). Whether that is true depends on what the Library does
-		and what the program that uses the Library does.
-	</p>
-	<p>
-		<strong>1.</strong> You may copy and distribute verbatim copies of the Library's
-		complete source code as you receive it, in any medium, provided that you conspicuously
-		and appropriately publish on each copy an appropriate copyright notice and disclaimer
-		of warranty; keep intact all the notices that refer to this License and to the absence
-		of any warranty; and distribute a copy of this License along with the Library.
-	</p>
-	<p>
-		You may charge a fee for the physical act of transferring a copy, and you may at
-		your option offer warranty protection in exchange for a fee.
-	</p>
-	<p>
-		<strong>2.</strong> You may modify your copy or copies of the Library or any portion
-		of it, thus forming a work based on the Library, and copy and distribute such modifications
-		or work under the terms of Section 1 above, provided that you also meet all of these
-		conditions:
-	</p>
-	<blockquote>
-		<p>
-			a) The modified work must itself be a software library.
-		</p>
-		<p>
-			b) You must cause the files modified to carry prominent notices stating that you
-			changed the files and the date of any change.</p>
-		<p>
-			c) You must cause the whole of the work to be licensed at no charge to all third
-			parties under the terms of this License.
-		</p>
-		<p>
-			d) If a facility in the modified Library refers to a function or a table of data
-			to be supplied by an application program that uses the facility, other than as an
-			argument passed when the facility is invoked, then you must make a good faith effort
-			to ensure that, in the event an application does not supply such function or table,
-			the facility still operates, and performs whatever part of its purpose remains meaningful.
-		</p>
-		<p>
-			(For example, a function in a library to compute square roots has a purpose that
-			is entirely well-defined independent of the application. Therefore, Subsection 2d
-			requires that any application-supplied function or table used by this function must
-			be optional: if the application does not supply it, the square root function must
-			still compute square roots.)
-		</p>
-		<p>
-			These requirements apply to the modified work as a whole. If identifiable sections
-			of that work are not derived from the Library, and can be reasonably considered
-			independent and separate works in themselves, then this License, and its terms,
-			do not apply to those sections when you distribute them as separate works. But when
-			you distribute the same sections as part of a whole which is a work based on the
-			Library, the distribution of the whole must be on the terms of this License, whose
-			permissions for other licensees extend to the entire whole, and thus to each and
-			every part regardless of who wrote it.
-		</p>
-		<p>
-			Thus, it is not the intent of this section to claim rights or contest your rights
-			to work written entirely by you; rather, the intent is to exercise the right to
-			control the distribution of derivative or collective works based on the Library.
-		</p>
-		<p>
-			In addition, mere aggregation of another work not based on the Library with the
-			Library (or with a work based on the Library) on a volume of a storage or distribution
-			medium does not bring the other work under the scope of this License.
-		</p>
-	</blockquote>
-	<p>
-		<strong>3.</strong> You may opt to apply the terms of the ordinary GNU General Public
-		License instead of this License to a given copy of the Library. To do this, you
-		must alter all the notices that refer to this License, so that they refer to the
-		ordinary GNU General Public License, version 2, instead of to this License. (If
-		a newer version than version 2 of the ordinary GNU General Public License has appeared,
-		then you can specify that version instead if you wish.) Do not make any other change
-		in these notices.
-	</p>
-	<p>
-		Once this change is made in a given copy, it is irreversible for that copy, so the
-		ordinary GNU General Public License applies to all subsequent copies and derivative
-		works made from that copy.
-	</p>
-	<p>
-		This option is useful when you wish to copy part of the code of the Library into
-		a program that is not a library.
-	</p>
-	<p>
-		<strong>4.</strong> You may copy and distribute the Library (or a portion or derivative
-		of it, under Section 2) in object code or executable form under the terms of Sections
-		1 and 2 above provided that you accompany it with the complete corresponding machine-readable
-		source code, which must be distributed under the terms of Sections 1 and 2 above
-		on a medium customarily used for software interchange.
-	</p>
-	<p>
-		If distribution of object code is made by offering access to copy from a designated
-		place, then offering equivalent access to copy the source code from the same place
-		satisfies the requirement to distribute the source code, even though third parties
-		are not compelled to copy the source along with the object code.</p>
-	<p>
-		<strong>5.</strong> A program that contains no derivative of any portion of the
-		Library, but is designed to work with the Library by being compiled or linked with
-		it, is called a "work that uses the Library". Such a work, in isolation, is not
-		a derivative work of the Library, and therefore falls outside the scope of this
-		License.
-	</p>
-	<p>
-		However, linking a "work that uses the Library" with the Library creates an executable
-		that is a derivative of the Library (because it contains portions of the Library),
-		rather than a "work that uses the library". The executable is therefore covered
-		by this License. Section 6 states terms for distribution of such executables.
-	</p>
-	<p>
-		When a "work that uses the Library" uses material from a header file that is part
-		of the Library, the object code for the work may be a derivative work of the Library
-		even though the source code is not. Whether this is true is especially significant
-		if the work can be linked without the Library, or if the work is itself a library.
-		The threshold for this to be true is not precisely defined by law.
-	</p>
-	<p>
-		If such an object file uses only numerical parameters, data structure layouts and
-		accessors, and small macros and small inline functions (ten lines or less in length),
-		then the use of the object file is unrestricted, regardless of whether it is legally
-		a derivative work. (Executables containing this object code plus portions of the
-		Library will still fall under Section 6.)
-	</p>
-	<p>
-		Otherwise, if the work is a derivative of the Library, you may distribute the object
-		code for the work under the terms of Section 6. Any executables containing that
-		work also fall under Section 6, whether or not they are linked directly with the
-		Library itself.
-	</p>
-	<p>
-		<strong>6.</strong> As an exception to the Sections above, you may also combine
-		or link a "work that uses the Library" with the Library to produce a work containing
-		portions of the Library, and distribute that work under terms of your choice, provided
-		that the terms permit modification of the work for the customer's own use and reverse
-		engineering for debugging such modifications.
-	</p>
-	<p>
-		You must give prominent notice with each copy of the work that the Library is used
-		in it and that the Library and its use are covered by this License. You must supply
-		a copy of this License. If the work during execution displays copyright notices,
-		you must include the copyright notice for the Library among them, as well as a reference
-		directing the user to the copy of this License. Also, you must do one of these things:
-	</p>
-	<blockquote>
-		<p>
-			a) Accompany the work with the complete corresponding machine-readable source code
-			for the Library including whatever changes were used in the work (which must be
-			distributed under Sections 1 and 2 above); and, if the work is an executable linked
-			with the Library, with the complete machine-readable "work that uses the Library",
-			as object code and/or source code, so that the user can modify the Library and then
-			relink to produce a modified executable containing the modified Library. (It is
-			understood that the user who changes the contents of definitions files in the Library
-			will not necessarily be able to recompile the application to use the modified definitions.)
-		</p>
-		<p>
-			b) Use a suitable shared library mechanism for linking with the Library. A suitable
-			mechanism is one that (1) uses at run time a copy of the library already present
-			on the user's computer system, rather than copying library functions into the executable,
-			and (2) will operate properly with a modified version of the library, if the user
-			installs one, as long as the modified version is interface-compatible with the version
-			that the work was made with.
-		</p>
-		<p>
-			c) Accompany the work with a written offer, valid for at least three years, to give
-			the same user the materials specified in Subsection 6a, above, for a charge no more
-			than the cost of performing this distribution.
-		</p>
-		<p>
-			d) If distribution of the work is made by offering access to copy from a designated
-			place, offer equivalent access to copy the above specified materials from the same
-			place.
-		</p>
-		<p>
-			e) Verify that the user has already received a copy of these materials or that you
-			have already sent this user a copy.</p>
-	</blockquote>
-	<p>
-		For an executable, the required form of the "work that uses the Library" must include
-		any data and utility programs needed for reproducing the executable from it. However,
-		as a special exception, the materials to be distributed need not include anything
-		that is normally distributed (in either source or binary form) with the major components
-		(compiler, kernel, and so on) of the operating system on which the executable runs,
-		unless that component itself accompanies the executable.
-	</p>
-	<p>
-		It may happen that this requirement contradicts the license restrictions of other
-		proprietary libraries that do not normally accompany the operating system. Such
-		a contradiction means you cannot use both them and the Library together in an executable
-		that you distribute.
-	</p>
-	<p>
-		<strong>7.</strong> You may place library facilities that are a work based on the
-		Library side-by-side in a single library together with other library facilities
-		not covered by this License, and distribute such a combined library, provided that
-		the separate distribution of the work based on the Library and of the other library
-		facilities is otherwise permitted, and provided that you do these two things:
-	</p>
-	<blockquote>
-		<p>
-			a) Accompany the combined library with a copy of the same work based on the Library,
-			uncombined with any other library facilities. This must be distributed under the
-			terms of the Sections above.
-		</p>
-		<p>
-			b) Give prominent notice with the combined library of the fact that part of it is
-			a work based on the Library, and explaining where to find the accompanying uncombined
-			form of the same work.</p>
-	</blockquote>
-	<p>
-		<strong>8.</strong> You may not copy, modify, sublicense, link with, or distribute
-		the Library except as expressly provided under this License. Any attempt otherwise
-		to copy, modify, sublicense, link with, or distribute the Library is void, and will
-		automatically terminate your rights under this License. However, parties who have
-		received copies, or rights, from you under this License will not have their licenses
-		terminated so long as such parties remain in full compliance.
-	</p>
-	<p>
-		<strong>9.</strong> You are not required to accept this License, since you have
-		not signed it. However, nothing else grants you permission to modify or distribute
-		the Library or its derivative works. These actions are prohibited by law if you
-		do not accept this License. Therefore, by modifying or distributing the Library
-		(or any work based on the Library), you indicate your acceptance of this License
-		to do so, and all its terms and conditions for copying, distributing or modifying
-		the Library or works based on it.
-	</p>
-	<p>
-		<strong>10.</strong> Each time you redistribute the Library (or any work based on
-		the Library), the recipient automatically receives a license from the original licensor
-		to copy, distribute, link with or modify the Library subject to these terms and
-		conditions. You may not impose any further restrictions on the recipients' exercise
-		of the rights granted herein. You are not responsible for enforcing compliance by
-		third parties with this License.
-	</p>
-	<p>
-		<strong>11.</strong> If, as a consequence of a court judgment or allegation of patent
-		infringement or for any other reason (not limited to patent issues), conditions
-		are imposed on you (whether by court order, agreement or otherwise) that contradict
-		the conditions of this License, they do not excuse you from the conditions of this
-		License. If you cannot distribute so as to satisfy simultaneously your obligations
-		under this License and any other pertinent obligations, then as a consequence you
-		may not distribute the Library at all. For example, if a patent license would not
-		permit royalty-free redistribution of the Library by all those who receive copies
-		directly or indirectly through you, then the only way you could satisfy both it
-		and this License would be to refrain entirely from distribution of the Library.
-	</p>
-	<p>
-		If any portion of this section is held invalid or unenforceable under any particular
-		circumstance, the balance of the section is intended to apply, and the section as
-		a whole is intended to apply in other circumstances.
-	</p>
-	<p>
-		It is not the purpose of this section to induce you to infringe any patents or other
-		property right claims or to contest validity of any such claims; this section has
-		the sole purpose of protecting the integrity of the free software distribution system
-		which is implemented by public license practices. Many people have made generous
-		contributions to the wide range of software distributed through that system in reliance
-		on consistent application of that system; it is up to the author/donor to decide
-		if he or she is willing to distribute software through any other system and a licensee
-		cannot impose that choice.
-	</p>
-	<p>
-		This section is intended to make thoroughly clear what is believed to be a consequence
-		of the rest of this License.
-	</p>
-	<p>
-		<strong>12.</strong> If the distribution and/or use of the Library is restricted
-		in certain countries either by patents or by copyrighted interfaces, the original
-		copyright holder who places the Library under this License may add an explicit geographical
-		distribution limitation excluding those countries, so that distribution is permitted
-		only in or among countries not thus excluded. In such case, this License incorporates
-		the limitation as if written in the body of this License.
-	</p>
-	<p>
-		<strong>13.</strong> The Free Software Foundation may publish revised and/or new
-		versions of the Lesser General Public License from time to time. Such new versions
-		will be similar in spirit to the present version, but may differ in detail to address
-		new problems or concerns.</p>
-	<p>
-		Each version is given a distinguishing version number. If the Library specifies
-		a version number of this License which applies to it and "any later version", you
-		have the option of following the terms and conditions either of that version or
-		of any later version published by the Free Software Foundation. If the Library does
-		not specify a license version number, you may choose any version ever published
-		by the Free Software Foundation.
-	</p>
-	<p>
-		<strong>14.</strong> If you wish to incorporate parts of the Library into other
-		free programs whose distribution conditions are incompatible with these, write to
-		the author to ask for permission. For software which is copyrighted by the Free
-		Software Foundation, write to the Free Software Foundation; we sometimes make exceptions
-		for this. Our decision will be guided by the two goals of preserving the free status
-		of all derivatives of our free software and of promoting the sharing and reuse of
-		software generally.
-	</p>
-	<p>
-		NO WARRANTY
-	</p>
-	<p>
-		<strong>15. </strong>BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-		WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
-		OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE
-		LIBRARY "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-		BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-		PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE LIBRARY
-		IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY
-		SERVICING, REPAIR OR CORRECTION.
-	</p>
-	<p>
-		<strong>16.</strong> IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO
-		IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE
-		THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL,
-		SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY
-		TO USE THE LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED
-		INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE LIBRARY
-		TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN
-		ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-	</p>
-	<h4>
-		<strong>END OF TERMS AND CONDITIONS</strong></h4>
-</body>
-</html>
Index: /FCKeditor/branches/developers/alfonsoml/editor/dialog/fck_anchor.html
===================================================================
--- /FCKeditor/branches/developers/alfonsoml/editor/dialog/fck_anchor.html	(revision 140)
+++ /FCKeditor/branches/developers/alfonsoml/editor/dialog/fck_anchor.html	(revision 141)
@@ -1,9 +1,24 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
-
 <html>
@@ -12,5 +27,4 @@
 		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 		<meta content="noindex, nofollow" name="robots">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema"> 
 		<script src="common/fck_dialog_common.js" type="text/javascript"></script>
 		<script type="text/javascript">
@@ -68,5 +82,5 @@
 	{
 		// Remove the anchor if the user leaves the name blank
-		if ( oAnchor )	
+		if ( oAnchor )
 		{
 			RemoveAnchor() ;
@@ -77,7 +91,7 @@
 		return false ;
 	}
-	
+
 	oEditor.FCKUndo.SaveUndoStep() ;
-	
+
 	if ( oAnchor )	// Modifying an existent anchor.
 	{
@@ -101,10 +115,10 @@
 	{
 		// Nothing was selected, so now just create a normal A
-		oAnchor = oEditor.FCK.CreateElement( 'a' ) ; 
+		oAnchor = oEditor.FCK.CreateElement( 'a' ) ;
 	}
 	else
 	{
 		// Remove the fake href
-		oAnchor.removeAttribute( 'href' ) ; 
+		oAnchor.removeAttribute( 'href' ) ;
 	}
 	// Set the name
@@ -125,5 +139,5 @@
 			var oImg = oEditor.FCKDocumentProcessor_CreateFakeImage( 'FCK__Anchor', oAnchor.cloneNode(true) ) ;
 			oImg.setAttribute( '_fckanchor', 'true', 0 ) ;
-			
+
 			oAnchor.parentNode.insertBefore( oImg, oAnchor ) ;
 			oAnchor.parentNode.removeChild( oAnchor ) ;
@@ -169,5 +183,5 @@
 {
 	var oDoc = FCK.EditorDocument ;
-	
+
 	var aLinks = oDoc.getElementsByTagName( 'A' ) ;
 
Index: /FCKeditor/branches/developers/alfonsoml/editor/dialog/fck_button.html
===================================================================
--- /FCKeditor/branches/developers/alfonsoml/editor/dialog/fck_button.html	(revision 140)
+++ /FCKeditor/branches/developers/alfonsoml/editor/dialog/fck_button.html	(revision 141)
@@ -1,8 +1,24 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
-
 <html xmlns="http://www.w3.org/1999/xhtml">
Index: /FCKeditor/branches/developers/alfonsoml/editor/dialog/fck_checkbox.html
===================================================================
--- /FCKeditor/branches/developers/alfonsoml/editor/dialog/fck_checkbox.html	(revision 140)
+++ /FCKeditor/branches/developers/alfonsoml/editor/dialog/fck_checkbox.html	(revision 141)
@@ -1,8 +1,24 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
-
 <html>
@@ -11,5 +27,4 @@
 		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 		<meta content="noindex, nofollow" name="robots">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema"> 
 		<script src="common/fck_dialog_common.js" type="text/javascript"></script>
 		<script type="text/javascript">
@@ -50,5 +65,5 @@
 	if ( GetE('txtName').value.length > 0 )
 		oActiveEl.name = GetE('txtName').value ;
-		
+
 	if ( oEditor.FCKBrowserInfo.IsIE )
 		oActiveEl.value = GetE('txtValue').value ;
Index: /FCKeditor/branches/developers/alfonsoml/editor/dialog/fck_colorselector.html
===================================================================
--- /FCKeditor/branches/developers/alfonsoml/editor/dialog/fck_colorselector.html	(revision 140)
+++ /FCKeditor/branches/developers/alfonsoml/editor/dialog/fck_colorselector.html	(revision 141)
@@ -1,12 +1,27 @@
-
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
 <html>
 	<head>
-		<meta name="vs_targetSchema" content="http://schemas.microsoft.com/intellisense/ie5"> 
 		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 		<meta name="robots" content="noindex, nofollow" />
@@ -21,5 +36,5 @@
 		</style>
 		<script type="text/javascript">
-		
+
 var oEditor = window.parent.InnerDialogLoaded() ;
 
@@ -28,8 +43,8 @@
 	// First of all, translate the dialog box texts
 	oEditor.FCKLanguageManager.TranslatePage(document) ;
-	
+
 	CreateColorTable() ;
-	
-	window.parent.SetOkButton( true ) ;	
+
+	window.parent.SetOkButton( true ) ;
 	window.parent.SetAutoSize( true ) ;
 }
@@ -46,15 +61,15 @@
 	function AppendColorRow( rangeA, rangeB )
 	{
-		for ( var i = rangeA ; i < rangeA + 3 ; i++ ) 
-		{ 
-			var oRow = oTable.insertRow(-1) ; 
+		for ( var i = rangeA ; i < rangeA + 3 ; i++ )
+		{
+			var oRow = oTable.insertRow(-1) ;
 
-			for ( var j = rangeB ; j < rangeB + 3 ; j++ ) 
-			{ 
-				for ( var n = 0 ; n < 6 ; n++ ) 
-				{ 
-					AppendColorCell( oRow, '#' + aColors[j] + aColors[n] + aColors[i] ) ; 
-				} 
-			} 
+			for ( var j = rangeB ; j < rangeB + 3 ; j++ )
+			{
+				for ( var n = 0 ; n < 6 ; n++ )
+				{
+					AppendColorCell( oRow, '#' + aColors[j] + aColors[n] + aColors[i] ) ;
+				}
+			}
 		}
 	}
@@ -66,5 +81,5 @@
 		oCell.className = 'ColorCell' ;
 		oCell.bgColor = color ;
-		
+
 		oCell.onmouseover = function()
 		{
@@ -72,5 +87,5 @@
 			document.getElementById('hicolortext').innerHTML = this.bgColor ;
 		}
-		
+
 		oCell.onclick = function()
 		{
@@ -87,15 +102,15 @@
 	// Create the last row.
 	var oRow = oTable.insertRow(-1) ;
-	
+
 	// Create the gray scale colors cells.
 	for ( var n = 0 ; n < 6 ; n++ )
 	{
-		AppendColorCell( oRow, '#' + aColors[n] + aColors[n] + aColors[n] ) ; 
+		AppendColorCell( oRow, '#' + aColors[n] + aColors[n] + aColors[n] ) ;
 	}
-	
+
 	// Fill the row with black cells.
 	for ( var i = 0 ; i < 12 ; i++ )
 	{
-		AppendColorCell( oRow, '#000000' ) ; 
+		AppendColorCell( oRow, '#000000' ) ;
 	}
 }
Index: /FCKeditor/branches/developers/alfonsoml/editor/dialog/fck_docprops.html
===================================================================
--- /FCKeditor/branches/developers/alfonsoml/editor/dialog/fck_docprops.html	(revision 140)
+++ /FCKeditor/branches/developers/alfonsoml/editor/dialog/fck_docprops.html	(revision 141)
@@ -1,8 +1,24 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
 <html xmlns="http://www.w3.org/1999/xhtml">
@@ -343,7 +359,7 @@
 }
 
-function SetColor( inputId, color ) 
-{
-	GetE( inputId ).value = color + '' ; 
+function SetColor( inputId, color )
+{
+	GetE( inputId ).value = color + '' ;
 	UpdatePreview() ;
 }
Index: /FCKeditor/branches/developers/alfonsoml/editor/dialog/fck_docprops/fck_document_preview.html
===================================================================
--- /FCKeditor/branches/developers/alfonsoml/editor/dialog/fck_docprops/fck_document_preview.html	(revision 140)
+++ /FCKeditor/branches/developers/alfonsoml/editor/dialog/fck_docprops/fck_document_preview.html	(revision 141)
@@ -1,8 +1,24 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
 <html>
Index: /FCKeditor/branches/developers/alfonsoml/editor/dialog/fck_find.html
===================================================================
--- /FCKeditor/branches/developers/alfonsoml/editor/dialog/fck_find.html	(revision 140)
+++ /FCKeditor/branches/developers/alfonsoml/editor/dialog/fck_find.html	(revision 141)
@@ -1,8 +1,24 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
 <html xmlns="http://www.w3.org/1999/xhtml">
@@ -59,8 +75,10 @@
 function GetRegexExpr()
 {
+	var sExpr ;
+
 	if ( document.getElementById('chkWord').checked )
-		var sExpr = '\\b' + document.getElementById('txtFind').value + '\\b' ;
+		sExpr = '\\b' + document.getElementById('txtFind').value + '\\b' ;
 	else
-		var sExpr = document.getElementById('txtFind').value ;
+		sExpr = document.getElementById('txtFind').value ;
 
 	return sExpr ;
Index: /FCKeditor/branches/developers/alfonsoml/editor/dialog/fck_flash.html
===================================================================
--- /FCKeditor/branches/developers/alfonsoml/editor/dialog/fck_flash.html	(revision 140)
+++ /FCKeditor/branches/developers/alfonsoml/editor/dialog/fck_flash.html	(revision 141)
@@ -1,8 +1,24 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
 <html>
@@ -11,5 +27,4 @@
 		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 		<meta content="noindex, nofollow" name="robots">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema"> 
 		<script src="common/fck_dialog_common.js" type="text/javascript"></script>
 		<script src="fck_flash/fck_flash.js" type="text/javascript"></script>
@@ -78,5 +93,5 @@
 				<br />
 				<input id="btnUpload" type="submit" value="Send it to the Server" fckLang="DlgLnkBtnUpload" />
-				<iframe name="UploadWindow" style="DISPLAY: none" src="javascript:void(0)"></iframe> 
+				<iframe name="UploadWindow" style="DISPLAY: none" src="javascript:void(0)"></iframe>
 			</form>
 		</div>
Index: /FCKeditor/branches/developers/alfonsoml/editor/dialog/fck_flash/fck_flash.js
===================================================================
--- /FCKeditor/branches/developers/alfonsoml/editor/dialog/fck_flash/fck_flash.js	(revision 140)
+++ /FCKeditor/branches/developers/alfonsoml/editor/dialog/fck_flash/fck_flash.js	(revision 141)
@@ -1,8 +1,24 @@
-/* @Packager.Header
-<FileDescription>
-	Scripts related to the Flash dialog window (see fck_flash.html).
-</FileDescription>
-<Author name="Frederico Caldeira Knabben" email="www.fckeditor.net" />
-*/
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2007 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Scripts related to the Flash dialog window (see fck_flash.html).
+ */
 
 var oEditor		= window.parent.InnerDialogLoaded() ;
@@ -79,5 +95,5 @@
 	GetE('chkMenu').checked		= GetAttribute( oEmbed, 'menu', 'true' ) == 'true' ;
 	GetE('cmbScale').value		= GetAttribute( oEmbed, 'scale', '' ).toLowerCase() ;
-	
+
 	GetE('txtAttTitle').value		= oEmbed.title ;
 
@@ -115,5 +131,5 @@
 	}
 	UpdateEmbed( oEmbed ) ;
-	
+
 	if ( !oFakeImage )
 	{
@@ -124,5 +140,5 @@
 	else
 		oEditor.FCKUndo.SaveUndoStep() ;
-	
+
 	oEditor.FCKFlashProcessor.RefreshView( oFakeImage, oEmbed ) ;
 
@@ -138,10 +154,10 @@
 	SetAttribute( e, "width" , GetE('txtWidth').value ) ;
 	SetAttribute( e, "height", GetE('txtHeight').value ) ;
-	
+
 	// Advances Attributes
 
 	SetAttribute( e, 'id'	, GetE('txtAttId').value ) ;
 	SetAttribute( e, 'scale', GetE('cmbScale').value ) ;
-	
+
 	SetAttribute( e, 'play', GetE('chkAutoPlay').checked ? 'true' : 'false' ) ;
 	SetAttribute( e, 'loop', GetE('chkLoop').checked ? 'true' : 'false' ) ;
@@ -167,5 +183,5 @@
 {
 	ePreview = previewEl ;
-	
+
 	if ( GetE('txtUrl').value.length > 0 )
 		UpdatePreview() ;
@@ -176,5 +192,5 @@
 	if ( !ePreview )
 		return ;
-		
+
 	while ( ePreview.firstChild )
 		ePreview.removeChild( ePreview.firstChild ) ;
@@ -186,10 +202,10 @@
 		var oDoc	= ePreview.ownerDocument || ePreview.document ;
 		var e		= oDoc.createElement( 'EMBED' ) ;
-		
+
 		e.src		= GetE('txtUrl').value ;
 		e.type		= 'application/x-shockwave-flash' ;
 		e.width		= '100%' ;
 		e.height	= '100%' ;
-		
+
 		ePreview.appendChild( e ) ;
 	}
@@ -206,9 +222,9 @@
 {
 	GetE('txtUrl').value = url ;
-	
+
 	if ( width )
 		GetE('txtWidth').value = width ;
-		
-	if ( height ) 
+
+	if ( height )
 		GetE('txtHeight').value = height ;
 
@@ -255,5 +271,5 @@
 {
 	var sFile = GetE('txtUploadFile').value ;
-	
+
 	if ( sFile.length == 0 )
 	{
@@ -261,5 +277,5 @@
 		return false ;
 	}
-	
+
 	if ( ( FCKConfig.FlashUploadAllowedExtensions.length > 0 && !oUploadAllowedExtRegex.test( sFile ) ) ||
 		( FCKConfig.FlashUploadDeniedExtensions.length > 0 && oUploadDeniedExtRegex.test( sFile ) ) )
@@ -268,5 +284,5 @@
 		return false ;
 	}
-	
+
 	return true ;
 }
Index: /FCKeditor/branches/developers/alfonsoml/editor/dialog/fck_flash/fck_flash_preview.html
===================================================================
--- /FCKeditor/branches/developers/alfonsoml/editor/dialog/fck_flash/fck_flash_preview.html	(revision 140)
+++ /FCKeditor/branches/developers/alfonsoml/editor/dialog/fck_flash/fck_flash_preview.html	(revision 141)
@@ -1,9 +1,25 @@
-
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <html>
 	<head>
@@ -11,5 +27,4 @@
 		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 		<meta name="robots" content="noindex, nofollow">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema"> 
 		<link href="../common/fck_dialog_common.css" rel="stylesheet" type="text/css" />
 		<script language="javascript">
Index: /FCKeditor/branches/developers/alfonsoml/editor/dialog/fck_form.html
===================================================================
--- /FCKeditor/branches/developers/alfonsoml/editor/dialog/fck_form.html	(revision 140)
+++ /FCKeditor/branches/developers/alfonsoml/editor/dialog/fck_form.html	(revision 141)
@@ -1,8 +1,24 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
-
 <html xmlns="http://www.w3.org/1999/xhtml">
@@ -26,5 +42,5 @@
 	oEditor.FCKLanguageManager.TranslatePage(document) ;
 
-	if ( oActiveEl ) 
+	if ( oActiveEl )
 	{
 		GetE('txtName').value	= oActiveEl.name ;
@@ -46,5 +62,5 @@
 		oActiveEl.innerHTML = ' ' ;
 	}
-	
+
 	oActiveEl.name = GetE('txtName').value ;
 	SetAttribute( oActiveEl, 'action'	, GetE('txtAction').value ) ;
Index: /FCKeditor/branches/developers/alfonsoml/editor/dialog/fck_hiddenfield.html
===================================================================
--- /FCKeditor/branches/developers/alfonsoml/editor/dialog/fck_hiddenfield.html	(revision 140)
+++ /FCKeditor/branches/developers/alfonsoml/editor/dialog/fck_hiddenfield.html	(revision 141)
@@ -1,8 +1,24 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
-
 <html>
@@ -11,5 +27,4 @@
 		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 		<meta content="noindex, nofollow" name="robots">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema"> 
 		<script src="common/fck_dialog_common.js" type="text/javascript"></script>
 		<script type="text/javascript">
@@ -27,5 +42,5 @@
 	oEditor.FCKLanguageManager.TranslatePage(document) ;
 
-	if ( oActiveEl && oActiveEl.tagName == 'INPUT' && oActiveEl.type == 'hidden' ) 
+	if ( oActiveEl && oActiveEl.tagName == 'INPUT' && oActiveEl.type == 'hidden' )
 	{
 		GetE('txtName').value		= oActiveEl.name ;
@@ -36,5 +51,5 @@
 
 	window.parent.SetOkButton( true ) ;
-}	
+}
 
 
@@ -47,5 +62,5 @@
 		oActiveEl = oEditor.FCK.InsertElementAndGetIt( oActiveEl ) ;
 	}
-	
+
 	oActiveEl.name = GetE('txtName').value ;
 	SetAttribute( oActiveEl, 'value', GetE('txtValue').value ) ;
Index: /FCKeditor/branches/developers/alfonsoml/editor/dialog/fck_image.html
===================================================================
--- /FCKeditor/branches/developers/alfonsoml/editor/dialog/fck_image.html	(revision 140)
+++ /FCKeditor/branches/developers/alfonsoml/editor/dialog/fck_image.html	(revision 141)
@@ -1,9 +1,25 @@
-
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
Index: /FCKeditor/branches/developers/alfonsoml/editor/dialog/fck_image/fck_image.js
===================================================================
--- /FCKeditor/branches/developers/alfonsoml/editor/dialog/fck_image/fck_image.js	(revision 140)
+++ /FCKeditor/branches/developers/alfonsoml/editor/dialog/fck_image/fck_image.js	(revision 141)
@@ -1,8 +1,24 @@
-/* @Packager.Header
-<FileDescription>
-	Scripts related to the Image dialog window (see fck_image.html).
-</FileDescription>
-<Author name="Frederico Caldeira Knabben" email="www.fckeditor.net" />
-*/
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2007 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Scripts related to the Image dialog window (see fck_image.html).
+ */
 
 var oEditor		= window.parent.InnerDialogLoaded() ;
@@ -52,5 +68,5 @@
 	if ( !eImgPreview )
 		return ;
-	
+
 	if ( GetE('txtUrl').value.length == 0 )
 	{
@@ -58,5 +74,5 @@
 		return ;
 	}
-		
+
 	oImageOriginal = document.createElement( 'IMG' ) ;	// new Image() ;
 
@@ -120,11 +136,11 @@
 
 	var regexSize = /^\s*(\d+)px\s*$/i ;
-	
+
 	if ( oImage.style.width )
 	{
-		var aMatch  = oImage.style.width.match( regexSize ) ;
-		if ( aMatch )
-		{
-			iWidth = aMatch[1] ;
+		var aMatchW  = oImage.style.width.match( regexSize ) ;
+		if ( aMatchW )
+		{
+			iWidth = aMatchW[1] ;
 			oImage.style.width = '' ;
 		}
@@ -133,8 +149,8 @@
 	if ( oImage.style.height )
 	{
-		var aMatch  = oImage.style.height.match( regexSize ) ;
-		if ( aMatch )
-		{
-			iHeight = aMatch[1] ;
+		var aMatchH  = oImage.style.height.match( regexSize ) ;
+		if ( aMatchH )
+		{
+			iHeight = aMatchH[1] ;
 			oImage.style.height = '' ;
 		}
@@ -164,9 +180,9 @@
 	if ( oLink )
 	{
-		var sUrl = oLink.getAttribute( '_fcksavedurl' ) ;
-		if ( sUrl == null )
-			sUrl = oLink.getAttribute('href',2) ;
-	
-		GetE('txtLnkUrl').value		= sUrl ;
+		var sLinkUrl = oLink.getAttribute( '_fcksavedurl' ) ;
+		if ( sLinkUrl == null )
+			sLinkUrl = oLink.getAttribute('href',2) ;
+
+		GetE('txtLnkUrl').value		= sLinkUrl ;
 		GetE('cmbLnkTarget').value	= oLink.target ;
 	}
@@ -200,5 +216,5 @@
 			oImage = null ;
 	}
-	
+
 	if ( !bHasImage )
 	{
@@ -214,5 +230,5 @@
 	else
 		oEditor.FCKUndo.SaveUndoStep() ;
-	
+
 	UpdateImage( oImage ) ;
 
@@ -288,5 +304,5 @@
 	UpdatePreview() ;
 	UpdateOriginal() ;
-	
+
 	bPreviewInitialized = true ;
 }
@@ -336,5 +352,5 @@
 	{
 		var e = dimension == 'Width' ? GetE('txtHeight') : GetE('txtWidth') ;
-		
+
 		if ( value.length == 0 || isNaN( value ) )
 		{
@@ -411,5 +427,5 @@
 		UpdateOriginal( true ) ;
 	}
-	
+
 	window.parent.SetSelectedTab( 'Info' ) ;
 }
@@ -442,5 +458,5 @@
 	}
 
-	sActualBrowser = ''
+	sActualBrowser = '' ;
 	SetUrl( fileUrl ) ;
 	GetE('frmUpload').reset() ;
@@ -453,5 +469,5 @@
 {
 	var sFile = GetE('txtUploadFile').value ;
-	
+
 	if ( sFile.length == 0 )
 	{
@@ -459,5 +475,5 @@
 		return false ;
 	}
-	
+
 	if ( ( FCKConfig.ImageUploadAllowedExtensions.length > 0 && !oUploadAllowedExtRegex.test( sFile ) ) ||
 		( FCKConfig.ImageUploadDeniedExtensions.length > 0 && oUploadDeniedExtRegex.test( sFile ) ) )
@@ -466,5 +482,5 @@
 		return false ;
 	}
-	
+
 	return true ;
 }
Index: /FCKeditor/branches/developers/alfonsoml/editor/dialog/fck_image/fck_image_preview.html
===================================================================
--- /FCKeditor/branches/developers/alfonsoml/editor/dialog/fck_image/fck_image_preview.html	(revision 140)
+++ /FCKeditor/branches/developers/alfonsoml/editor/dialog/fck_image/fck_image_preview.html	(revision 141)
@@ -1,10 +1,27 @@
-
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
@@ -23,5 +40,5 @@
 window.onload = function()
 {
-	window.parent.SetPreviewElements( 
+	window.parent.SetPreviewElements(
 		document.getElementById( 'imgPreview' ),
 		document.getElementById( 'lnkPreview' ) ) ;
Index: /FCKeditor/branches/developers/alfonsoml/editor/dialog/fck_link.html
===================================================================
--- /FCKeditor/branches/developers/alfonsoml/editor/dialog/fck_link.html	(revision 140)
+++ /FCKeditor/branches/developers/alfonsoml/editor/dialog/fck_link.html	(revision 141)
@@ -1,9 +1,25 @@
-
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <html>
 	<head>
@@ -93,5 +109,5 @@
 				<br />
 				<input id="btnUpload" type="submit" value="Send it to the Server" fckLang="DlgLnkBtnUpload" />
-				<iframe name="UploadWindow" style="DISPLAY: none" src="javascript:void(0)"></iframe> 
+				<iframe name="UploadWindow" style="DISPLAY: none" src="javascript:void(0)"></iframe>
 			</form>
 		</div>
@@ -133,19 +149,19 @@
 								<td valign="top" nowrap="nowrap" width="50%">
 									<input id="chkPopupResizable" name="chkFeature" value="resizable" type="checkbox" /><label for="chkPopupResizable" fckLang="DlgLnkPopResize">Resizable</label><br />
-									<input id="chkPopupLocationBar" name="chkFeature" value="location" type="checkbox" /><label for="chkPopupLocationBar" fckLang="DlgLnkPopLocation">Location 
+									<input id="chkPopupLocationBar" name="chkFeature" value="location" type="checkbox" /><label for="chkPopupLocationBar" fckLang="DlgLnkPopLocation">Location
 										Bar</label><br />
-									<input id="chkPopupManuBar" name="chkFeature" value="menubar" type="checkbox" /><label for="chkPopupManuBar" fckLang="DlgLnkPopMenu">Menu 
+									<input id="chkPopupManuBar" name="chkFeature" value="menubar" type="checkbox" /><label for="chkPopupManuBar" fckLang="DlgLnkPopMenu">Menu
 										Bar</label><br />
-									<input id="chkPopupScrollBars" name="chkFeature" value="scrollbars" type="checkbox" /><label for="chkPopupScrollBars" fckLang="DlgLnkPopScroll">Scroll 
+									<input id="chkPopupScrollBars" name="chkFeature" value="scrollbars" type="checkbox" /><label for="chkPopupScrollBars" fckLang="DlgLnkPopScroll">Scroll
 										Bars</label>
 								</td>
 								<td></td>
 								<td valign="top" nowrap="nowrap" width="50%">
-									<input id="chkPopupStatusBar" name="chkFeature" value="status" type="checkbox" /><label for="chkPopupStatusBar" fckLang="DlgLnkPopStatus">Status 
+									<input id="chkPopupStatusBar" name="chkFeature" value="status" type="checkbox" /><label for="chkPopupStatusBar" fckLang="DlgLnkPopStatus">Status
 										Bar</label><br />
 									<input id="chkPopupToolbar" name="chkFeature" value="toolbar" type="checkbox" /><label for="chkPopupToolbar" fckLang="DlgLnkPopToolbar">Toolbar</label><br />
-									<input id="chkPopupFullScreen" name="chkFeature" value="fullscreen" type="checkbox" /><label for="chkPopupFullScreen" fckLang="DlgLnkPopFullScrn">Full 
+									<input id="chkPopupFullScreen" name="chkFeature" value="fullscreen" type="checkbox" /><label for="chkPopupFullScreen" fckLang="DlgLnkPopFullScrn">Full
 										Screen (IE)</label><br />
-									<input id="chkPopupDependent" name="chkFeature" value="dependent" type="checkbox" /><label for="chkPopupDependent" fckLang="DlgLnkPopDependent">Dependent 
+									<input id="chkPopupDependent" name="chkFeature" value="dependent" type="checkbox" /><label for="chkPopupDependent" fckLang="DlgLnkPopDependent">Dependent
 										(Netscape)</label>
 								</td>
Index: /FCKeditor/branches/developers/alfonsoml/editor/dialog/fck_link/fck_link.js
===================================================================
--- /FCKeditor/branches/developers/alfonsoml/editor/dialog/fck_link/fck_link.js	(revision 140)
+++ /FCKeditor/branches/developers/alfonsoml/editor/dialog/fck_link/fck_link.js	(revision 141)
@@ -1,10 +1,24 @@
-	/* @Packager.Header
-<FileDescription>
-	Scripts related to the Link dialog window (see fck_link.html).
-</FileDescription>
-<Author name="Frederico Caldeira Knabben" email="www.fckeditor.net" />
-<Author name="Dominik Pesch ?dom? (empty selection patch)" email="d.pesch@11com7.de" />
-<Author name="Alfonso Martinez de Lizarrondo - Uritec" email="alfonso at uritec dot net" />
-*/
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2007 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Scripts related to the Link dialog window (see fck_link.html).
+ */
 
 var oEditor		= window.parent.InnerDialogLoaded() ;
@@ -50,5 +64,5 @@
 oRegex.UrlOnChangeTestOther = new RegExp('') ;
 //oRegex.UrlOnChangeTestOther.compile( '^(javascript:|#|/)', 'gi' ) ;
-oRegex.UrlOnChangeTestOther.compile( '^((javascript:)|[#/\.])', 'gi' ) ; 
+oRegex.UrlOnChangeTestOther.compile( '^((javascript:)|[#/\.])', 'gi' ) ;
 
 oRegex.ReserveTarget = new RegExp('') ;
@@ -154,10 +168,10 @@
 function LoadAnchorNamesAndIds()
 {
-	// Since version 2.0, the anchors are replaced in the DOM by IMGs so the user see the icon 
+	// Since version 2.0, the anchors are replaced in the DOM by IMGs so the user see the icon
 	// to edit them. So, we must look for that images now.
 	var aAnchors = new Array() ;
-	
+	var i ;
 	var oImages = oEditor.FCK.EditorDocument.getElementsByTagName( 'IMG' ) ;
-	for( var i = 0 ; i < oImages.length ; i++ )
+	for( i = 0 ; i < oImages.length ; i++ )
 	{
 		if ( oImages[i].getAttribute('_fckanchor') )
@@ -167,15 +181,15 @@
 	// Add also real anchors
 	var oLinks = oEditor.FCK.EditorDocument.getElementsByTagName( 'A' ) ;
-	for( var i = 0 ; i < oLinks.length ; i++ )
+	for( i = 0 ; i < oLinks.length ; i++ )
 	{
 		if ( oLinks[i].name && ( oLinks[i].name.length > 0 ) )
 			aAnchors[ aAnchors.length ] = oLinks[i] ;
 	}
-	
+
 	var aIds = oEditor.FCKTools.GetAllChildrenIds( oEditor.FCK.EditorDocument.body ) ;
 
 	bHasAnchors = ( aAnchors.length > 0 || aIds.length > 0 ) ;
 
-	for ( var i = 0 ; i < aAnchors.length ; i++ )
+	for ( i = 0 ; i < aAnchors.length ; i++ )
 	{
 		var sName = aAnchors[i].name ;
@@ -184,5 +198,5 @@
 	}
 
-	for ( var i = 0 ; i < aIds.length ; i++ )
+	for ( i = 0 ; i < aIds.length ; i++ )
 	{
 		oEditor.FCKTools.AddSelectOption( GetE('cmbAnchorId'), aIds[i], aIds[i] ) ;
@@ -497,5 +511,5 @@
 	if ( !oLink )
 		oLink = oEditor.FCK.CreateLink( sUri ) ;
-	
+
 	if ( oLink )
 		sInnerHtml = oLink.innerHTML ;		// Save the innerHTML (IE changes it if it is like an URL).
@@ -538,9 +552,9 @@
 
 	// Accesible popups
-	if( GetE('cmbTarget').value == 'popup' ) 
+	if( GetE('cmbTarget').value == 'popup' )
 	{
 		SetAttribute( oLink, 'onClick_fckprotectedatt', " onClick=\"" + BuildOnClickPopup() + "\"") ;
-	} 
-	else 
+	}
+	else
 	{
 		// Check if the previous onclick was for a popup:
@@ -561,5 +575,5 @@
 	// Advances Attributes
 	SetAttribute( oLink, 'id'		, GetE('txtAttId').value ) ;
-	SetAttribute( oLink, 'name'		, GetE('txtAttName').value ) ;		
+	SetAttribute( oLink, 'name'		, GetE('txtAttName').value ) ;
 	SetAttribute( oLink, 'dir'		, GetE('cmbAttLangDir').value ) ;
 	SetAttribute( oLink, 'lang'		, GetE('txtAttLangCode').value ) ;
@@ -588,5 +602,5 @@
 	// Select the link.
 	oEditor.FCKSelection.SelectNode(oLink);
-	
+
 	return true ;
 }
@@ -641,5 +655,5 @@
 {
 	var sFile = GetE('txtUploadFile').value ;
-	
+
 	if ( sFile.length == 0 )
 	{
@@ -647,5 +661,5 @@
 		return false ;
 	}
-	
+
 	if ( ( FCKConfig.LinkUploadAllowedExtensions.length > 0 && !oUploadAllowedExtRegex.test( sFile ) ) ||
 		( FCKConfig.LinkUploadDeniedExtensions.length > 0 && oUploadDeniedExtRegex.test( sFile ) ) )
@@ -654,5 +668,5 @@
 		return false ;
 	}
-	
+
 	return true ;
 }
Index: /FCKeditor/branches/developers/alfonsoml/editor/dialog/fck_listprop.html
===================================================================
--- /FCKeditor/branches/developers/alfonsoml/editor/dialog/fck_listprop.html	(revision 140)
+++ /FCKeditor/branches/developers/alfonsoml/editor/dialog/fck_listprop.html	(revision 141)
@@ -1,9 +1,24 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
-
 <html xmlns="http://www.w3.org/1999/xhtml">
Index: /FCKeditor/branches/developers/alfonsoml/editor/dialog/fck_paste.html
===================================================================
--- /FCKeditor/branches/developers/alfonsoml/editor/dialog/fck_paste.html	(revision 140)
+++ /FCKeditor/branches/developers/alfonsoml/editor/dialog/fck_paste.html	(revision 141)
@@ -1,10 +1,26 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
 <html xmlns="http://www.w3.org/1999/xhtml">
@@ -23,11 +39,11 @@
 	// First of all, translate the dialog box texts
 	oEditor.FCKLanguageManager.TranslatePage(document) ;
-	
+
 	if ( window.parent.dialogArguments.CustomValue == 'Word' )
 	{
-		var oFrame = document.getElementById('frmData')
+		var oFrame = document.getElementById('frmData') ;
 		oFrame.style.display = '' ;
-		
-		if ( oFrame.contentDocument ) 
+
+		if ( oFrame.contentDocument )
 			oFrame.contentDocument.designMode = 'on' ;
 		else
@@ -40,6 +56,6 @@
 	}
 
-	window.parent.SetOkButton( true ) ;	
-	window.parent.SetAutoSize( true ) ;	
+	window.parent.SetOkButton( true ) ;
+	window.parent.SetAutoSize( true ) ;
 }
 
@@ -47,5 +63,5 @@
 {
 	var sHtml ;
-	
+
 	if ( window.parent.dialogArguments.CustomValue == 'Word' )
 	{
@@ -53,5 +69,5 @@
 		var oBody ;
 
-		if ( oFrame.contentDocument ) 
+		if ( oFrame.contentDocument )
 			oBody = oFrame.contentDocument.body ;
 		else
@@ -71,10 +87,10 @@
 	else
 	{
-		var sHtml = oEditor.FCKTools.HTMLEncode( document.getElementById('txtData').value )  ;
+		sHtml = oEditor.FCKTools.HTMLEncode( document.getElementById('txtData').value )  ;
 		sHtml = sHtml.replace( /\n/g, '<BR>' ) ;
 	}
-	
+
 	oEditor.FCK.InsertHtml( sHtml ) ;
-	
+
 	return true ;
 }
@@ -83,6 +99,6 @@
 {
 	var oFrame = document.getElementById('frmData') ;
-	
-	if ( oFrame.contentDocument ) 
+
+	if ( oFrame.contentDocument )
 		oFrame.contentDocument.body.innerHTML = '' ;
 	else
@@ -92,5 +108,5 @@
 
 // This function will be called from the PasteFromWord dialog (fck_paste.html)
-// Input: oNode a DOM node that contains the raw paste from the clipboard 
+// Input: oNode a DOM node that contains the raw paste from the clipboard
 // bIgnoreFont, bRemoveStyles booleans according to the values set in the dialog
 // Output: the cleaned string
@@ -101,5 +117,5 @@
 	html = html.replace(/<o:p>\s*<\/o:p>/g, '') ;
 	html = html.replace(/<o:p>.*?<\/o:p>/g, ' ') ;
-	
+
 	// Remove mso-xxx styles.
 	html = html.replace( /\s*mso-[^:]+:[^;"]+;?/gi, '' ) ;
@@ -129,5 +145,5 @@
 		html = html.replace( /\s*FONT-FAMILY:[^;"]*;?/gi, '' ) ;
 	}
-	
+
 	// Remove Class attributes
 	html = html.replace(/<(\w[^>]*) class=([^ |>]*)([^>]*)/gi, "<$1$3") ;
@@ -139,22 +155,22 @@
 	// Remove empty styles.
 	html =  html.replace( /\s*style="\s*"/gi, '' ) ;
-	
+
 	html = html.replace( /<SPAN\s*[^>]*>\s* \s*<\/SPAN>/gi, ' ' ) ;
-	
+
 	html = html.replace( /<SPAN\s*[^>]*><\/SPAN>/gi, '' ) ;
-	
+
 	// Remove Lang attributes
 	html = html.replace(/<(\w[^>]*) lang=([^ |>]*)([^>]*)/gi, "<$1$3") ;
-	
+
 	html = html.replace( /<SPAN\s*>(.*?)<\/SPAN>/gi, '$1' ) ;
-	
+
 	html = html.replace( /<FONT\s*>(.*?)<\/FONT>/gi, '$1' ) ;
 
 	// Remove XML elements and declarations
 	html = html.replace(/<\\?\?xml[^>]*>/gi, '' ) ;
-	
+
 	// Remove Tags with XML namespace declarations: <o:p><\/o:p>
 	html = html.replace(/<\/?\w+:[^>]*>/gi, '' ) ;
-	
+
 	// Remove comments [SF BUG-1481861].
 	html = html.replace(/<\!--.*-->/g, '' ) ;
@@ -163,4 +179,7 @@
 
 	html = html.replace( /<H\d>\s*<\/H\d>/gi, '' ) ;
+
+	// Remove "display:none" tags.
+	html = html.replace( /<(\w+)[^>]*\sstyle="[^"]*DISPLAY\s?:\s?none(.*?)<\/\1>/ig, '' ) ;
 
 	if ( FCKConfig.CleanWordKeepsStructure )
Index: /FCKeditor/branches/developers/alfonsoml/editor/dialog/fck_radiobutton.html
===================================================================
--- /FCKeditor/branches/developers/alfonsoml/editor/dialog/fck_radiobutton.html	(revision 140)
+++ /FCKeditor/branches/developers/alfonsoml/editor/dialog/fck_radiobutton.html	(revision 141)
@@ -1,8 +1,24 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
-
 <html>
@@ -11,5 +27,4 @@
 		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 		<meta content="noindex, nofollow" name="robots">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema"> 
 		<script src="common/fck_dialog_common.js" type="text/javascript"></script>
 		<script type="text/javascript">
@@ -50,5 +65,5 @@
 	if ( GetE('txtName').value.length > 0 )
 		oActiveEl.name = GetE('txtName').value ;
-		
+
 	if ( oEditor.FCKBrowserInfo.IsIE )
 		oActiveEl.value = GetE('txtValue').value ;
Index: /FCKeditor/branches/developers/alfonsoml/editor/dialog/fck_replace.html
===================================================================
--- /FCKeditor/branches/developers/alfonsoml/editor/dialog/fck_replace.html	(revision 140)
+++ /FCKeditor/branches/developers/alfonsoml/editor/dialog/fck_replace.html	(revision 141)
@@ -1,9 +1,24 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
 <html xmlns="http://www.w3.org/1999/xhtml">
@@ -28,6 +43,6 @@
 function btnStat(frm)
 {
-	document.getElementById('btnReplace').disabled = 
-		document.getElementById('btnReplaceAll').disabled = 
+	document.getElementById('btnReplace').disabled =
+		document.getElementById('btnReplaceAll').disabled =
 			( document.getElementById('txtFind').value.length == 0 ) ;
 }
@@ -54,5 +69,5 @@
 			return true ;
 	}
-	
+
 	return hasFound ;
 }
@@ -68,5 +83,5 @@
 }
 
-function GetCase() 
+function GetCase()
 {
 	return ( document.getElementById('chkCase').checked ? '' : 'i' ) ;
Index: /FCKeditor/branches/developers/alfonsoml/editor/dialog/fck_select.html
===================================================================
--- /FCKeditor/branches/developers/alfonsoml/editor/dialog/fck_select.html	(revision 140)
+++ /FCKeditor/branches/developers/alfonsoml/editor/dialog/fck_select.html	(revision 141)
@@ -1,8 +1,24 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
-
 <html>
@@ -11,5 +27,4 @@
 		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 		<meta content="noindex, nofollow" name="robots">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema"> 
 		<script src="common/fck_dialog_common.js" type="text/javascript"></script>
 		<script type="text/javascript" src="fck_select/fck_select.js"></script>
Index: /FCKeditor/branches/developers/alfonsoml/editor/dialog/fck_select/fck_select.js
===================================================================
--- /FCKeditor/branches/developers/alfonsoml/editor/dialog/fck_select/fck_select.js	(revision 140)
+++ /FCKeditor/branches/developers/alfonsoml/editor/dialog/fck_select/fck_select.js	(revision 141)
@@ -1,8 +1,24 @@
-/* @Packager.Header
-<FileDescription>
-	Scripts for the fck_select.html page.
-</FileDescription>
-<Author name="Frederico Caldeira Knabben" email="www.fckeditor.net" />
-*/
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2007 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Scripts for the fck_select.html page.
+ */
 
 function Select( combo )
Index: /FCKeditor/branches/developers/alfonsoml/editor/dialog/fck_smiley.html
===================================================================
--- /FCKeditor/branches/developers/alfonsoml/editor/dialog/fck_smiley.html	(revision 140)
+++ /FCKeditor/branches/developers/alfonsoml/editor/dialog/fck_smiley.html	(revision 141)
@@ -1,9 +1,25 @@
-
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
@@ -33,5 +49,5 @@
 	oImg.src = url ;
 	oImg.setAttribute( '_fcksavedurl', url ) ;
-	
+
 	// For long smileys list, it seams that IE continues loading the images in
 	// the background when you quickly select one image. so, let's clear
@@ -62,5 +78,5 @@
 var aImages		= FCKConfig.SmileyImages ;
 var iCols		= FCKConfig.SmileyColumns ;
-var iColWidth	= parseInt( 100 / iCols ) ;
+var iColWidth	= parseInt( 100 / iCols, 10 ) ;
 
 var i = 0 ;
Index: /FCKeditor/branches/developers/alfonsoml/editor/dialog/fck_source.html
===================================================================
--- /FCKeditor/branches/developers/alfonsoml/editor/dialog/fck_source.html	(revision 140)
+++ /FCKeditor/branches/developers/alfonsoml/editor/dialog/fck_source.html	(revision 141)
@@ -1,9 +1,25 @@
-
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
 <html>
 	<head>
@@ -11,8 +27,7 @@
 		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 		<meta name="robots" content="noindex, nofollow">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema"> 
 		<link href="common/fck_dialog_common.css" rel="stylesheet" type="text/css" />
 		<script language="javascript">
-		
+
 var oEditor		= window.parent.InnerDialogLoaded() ;
 var FCK			= oEditor.FCK ;
@@ -34,7 +49,7 @@
 	if ( oEditor.FCKBrowserInfo.IsIE )
 		oEditor.FCKUndo.SaveUndoStep() ;
-			
+
 	FCK.SetHTML( document.getElementById('txtSource').value, false ) ;
-	
+
 	return true ;
 }
Index: /FCKeditor/branches/developers/alfonsoml/editor/dialog/fck_specialchar.html
===================================================================
--- /FCKeditor/branches/developers/alfonsoml/editor/dialog/fck_specialchar.html	(revision 140)
+++ /FCKeditor/branches/developers/alfonsoml/editor/dialog/fck_specialchar.html	(revision 141)
@@ -1,19 +1,34 @@
-
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
 <html>
 	<head>
-		<meta name="vs_targetSchema" content="http://schemas.microsoft.com/intellisense/ie5" /> 
 		<meta name="robots" content="noindex, nofollow">
 		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 		<style type="text/css">
-				.Hand 
-				{ 
+				.Hand
+				{
 					cursor: pointer ;
-					cursor: hand ; 
+					cursor: hand ;
 				}
 				.Sample { font-size: 24px; }
@@ -68,5 +83,5 @@
 {
 	document.write("<TR>") ;
-	for(var j = 0 ; j < cols ; j++) 
+	for(var j = 0 ; j < cols ; j++)
 	{
 		if (aChars[i])
Index: /FCKeditor/branches/developers/alfonsoml/editor/dialog/fck_spellerpages.html
===================================================================
--- /FCKeditor/branches/developers/alfonsoml/editor/dialog/fck_spellerpages.html	(revision 140)
+++ /FCKeditor/branches/developers/alfonsoml/editor/dialog/fck_spellerpages.html	(revision 141)
@@ -1,8 +1,24 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
-
 <html>
@@ -11,5 +27,4 @@
 		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 		<meta content="noindex, nofollow" name="robots">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema"> 
 		<script src="fck_spellerpages/spellerpages/spellChecker.js"></script>
 		<script type="text/javascript">
@@ -23,4 +38,5 @@
 
 	var oSpeller = new spellChecker( document.getElementById('txtHtml') ) ;
+	oSpeller.spellCheckScript = oEditor.FCKConfig.SpellerPagesServerScript || 'server-scripts/spellchecker.php' ;
 	oSpeller.OnFinished = oSpeller_OnFinished ;
 	oSpeller.openChecker() ;
Index: /FCKeditor/branches/developers/alfonsoml/editor/dialog/fck_spellerpages/spellerpages/controlWindow.js
===================================================================
--- /FCKeditor/branches/developers/alfonsoml/editor/dialog/fck_spellerpages/spellerpages/controlWindow.js	(revision 140)
+++ /FCKeditor/branches/developers/alfonsoml/editor/dialog/fck_spellerpages/spellerpages/controlWindow.js	(revision 141)
@@ -1,3 +1,3 @@
-////////////////////////////////////////////////////
+////////////////////////////////////////////////////
 // controlWindow object
 ////////////////////////////////////////////////////
Index: /FCKeditor/branches/developers/alfonsoml/editor/dialog/fck_spellerpages/spellerpages/controls.html
===================================================================
--- /FCKeditor/branches/developers/alfonsoml/editor/dialog/fck_spellerpages/spellerpages/controls.html	(revision 140)
+++ /FCKeditor/branches/developers/alfonsoml/editor/dialog/fck_spellerpages/spellerpages/controls.html	(revision 141)
@@ -139,5 +139,5 @@
 								</td>
 								<td>  </td>
-								<td> 
+								<td>
 									
+Also if you are hosting your site at an ISP, you will have to check with them
+to see if the use of <CFEXECUTE> is allowed. In most cases ISP will not allow
+the use of that tag for security reasons. Clients would be able to access each
+others files in certain cases.
+--->
 
+
+<cfset apsell_dir	= "c:\aspell\bin">
 
-
-<cfset tempFolder = "c:\test">
-<cfset tempfile = "spell_#randrange(1,1000)#">
-<cfset apsell_dir = "c:\aspell\bin">
-
-<cfset spellercss = "../spellerStyle.css">
-
-<cfset word_win_src = "../wordWindow.js">
+<cfset lang			= "en_US">
+<cfset aspell_opts	= "-a --lang=#lang# --encoding=utf-8 -H">
 
+
+<cfset tempFolder	= "c:\aspell\temp">
+<cfset tempfile		= "spell_#randrange(1,10000)#">
+
+<cfset spellercss	= "../spellerStyle.css">
+<cfset word_win_src	= "../wordWindow.js">
+
+<cfset form.checktext = form["textinputs[]"]>
+
+<cfscript>
+  function LastIndexOf(subs, str)
+  {
+    return Len(str) - Find(subs, Reverse(str)) + 1;
+  }
+</cfscript>
 
 
-<cfset submitted_text = replacelist(form.checktext,"%u201C,%u201D","%22,%22")> 
-<cfset submitted_text = urlDecode(submitted_text)>
+<cfparam name="url.checktext" default="">
+<cfparam name="form.checktext" default="#url.checktext#">
+<cfset submitted_text = replacelist(form.checktext,"%u201C,%u201D","%22,%22")>
 
+
 
+
+<cfset text = "">
+<cfset crlf = Chr(13) & Chr(10)>
+
+<cfloop list="#submitted_text#" index="field" delimiters=",">
+  <cfset text = text & "%" & crlf
+                     & "^A" & crlf
+                     & "!" & crlf>
+  <cfset field = URLDecode(field)>
+  <cfloop list="#field#" index="line" delimiters="#crlf#">
+
+  	<cfset text = text & "^" & Trim(JSStringFormat(line)) & "#crlf#">
+  </cfloop>
+</cfloop>
 
 
 
 <cfset unaltered_text = submitted_text>
-<cfset submitted_text = replace(submitted_text,"'","\'","All")>
-<cfset submitted_text = replace(submitted_text,"""","\""","All")>
-
-
-<cfset text = "">
-<cfloop list="#submitted_text#" index="idx" delimiters="#chr(10)##chr(13)#">
-	<cfset text =text&"^"&idx&"#chr(10)##chr(13)#">
-</cfloop>
-
-
 
 
 <cffile action="write" file="#tempFolder#\#tempfile#.txt" output="#text#" charset="utf-8">
 
-
 
+<cfexecute name="C:\WINDOWS\SYSTEM32\cmd.exe" arguments="/c type c:\test\#tempfile#.txt | c:\aspell\bin\aspell #aspell_opts#" timeout="100" variable="results"></cfexecute> --->
+
+
 
 <cfsavecontent variable="food">
-<cfexecute name="C:\WINDOWS\SYSTEM32\cmd.exe" arguments="/c type #tempFolder#\#tempfile#.txt | #apsell_dir#\aspell -a --encoding=utf-8 -H" timeout="100"></cfexecute>
+<cfexecute name="C:\WINDOWS\SYSTEM32\cmd.exe" arguments="/c type #tempFolder#\#tempfile#.txt | #apsell_dir#\aspell #aspell_opts#" timeout="100"></cfexecute>
 </cfsavecontent>
+
+
 
 
 <cffile action="delete" file="#tempFolder#\#tempfile#.txt">
 
+<cfset texts = StructNew()>
+<cfset texts.textinputs = "">
+<cfset texts.words = "">
+<cfset texts.abort = "">
 
+
 
+<cfset i = "0">
+<cfloop index="text" list="#form.checktext#">
+  <cfset texts.textinputs = ListAppend(texts.textinputs, 'textinputs[#i#] = decodeURIComponent("#text#");', '#Chr(13)##Chr(10)#')>
+  <cfset i = i + "1">
+</cfloop>
 
-<cfoutput>
-<html>
-<head>
-<link rel="stylesheet" type="text/css" href="speller/spellerStyle.css">
-<script src="/speller/wordWindow.js"></script>
-<script language="javascript">
-var suggs = new Array();
-var words = new Array();
-var error;
-var wordtext = unescape('#urlencodedFormat(unaltered_text)#');
+
 
-<cfset cnt = 1>
-<cfset word_cnt = 0>
+<cfset cnt = "1">
+<cfset word_cnt = "0">
+<cfset input_cnt = "-1">
 <cfloop list="#food#" index="list" delimiters="#chr(10)##chr(13)#">
 	
-	<cfif NOT cnt EQ 1>
-		<cfif find("&",list) OR find("##",list)>
+	<cfif NOT cnt IS "1">
+		<cfif Find("&", list) OR Find("##", list)>
 			
-			<cfset bad_word = listGetAt(list,"2"," ")>
+			<cfset bad_word = listGetAt(list, "2", " ")>
 			
-			<cfset wrdList = mid(list,(list.lastindexOf(':') + 2),(len(list) - (list.lastindexOf(':') + 2)))>
+			<cfset wrdList = mid(list,(LastIndexOf(':', list) + 2),(len(list) - (LastIndexOf(':', list) + 2)))>
 			<cfset wrdsList = "">
-			<cfloop list=#wrdList# index="idx">
-				<cfset wrdsList =wrdsList&"'"&trim(replace(idx,"'","\'","All"))&"',">
+			<cfloop list="#wrdList#" index="idx">
+				<cfset wrdsList = ListAppend(wrdsList, " '" & trim(replace(idx,"'","\'","All")) & "'", ", ")>
 			</cfloop>
+      <cfset wrdsList = Right(wrdsList, Len(wrdsList) - 1)>
 			
-			words[#word_cnt#] = '#trim(replace(bad_word,"'","\'","All"))#';
-			suggs[#word_cnt#] = [#trim(wrdsList)#];
+			<cfset texts.words = ListAppend(texts.words, "words[#input_cnt#][#word_cnt#] = '#trim(replace(bad_word,"'","\'","All"))#';", "#Chr(13)##Chr(10)#")>
+			<cfset texts.words = ListAppend(texts.words, "suggs[#input_cnt#][#word_cnt#] = [#trim(wrdsList)#];", "#Chr(13)##Chr(10)#")>
 			<cfset word_cnt = word_cnt + 1>
-		<cfelseif find("*",list)>
-		</cfif>			
+		<cfelseif find("*", list)>
+      <cfset input_cnt = input_cnt + "1">
+      <cfset word_cnt = "0">
+      <cfset texts.words = ListAppend(texts.words, "words[#input_cnt#] = [];", "#crlf#")>
+      <cfset texts.words = ListAppend(texts.words, "suggs[#input_cnt#] = [];", "#crlf#")>
+		</cfif>
 	</cfif>
 	<cfset cnt = cnt + 1>
 </cfloop>
 
+<cfif texts.words IS "">
+  <cfset texts.abort = "alert('Spell check complete.\n\nNo misspellings found.');#chrlf#top.window.close();">
+</cfif>
 
+</cfsilent><cfoutput><cfcontent type="text/html"><html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<link rel="stylesheet" type="text/css" href="#spellercss#" />
+<script language="javascript" src="#word_win_src#"></script>
+<script language="javascript">
+var suggs = new Array();
+var words = new Array();
+var textinputs = new Array();
+var error;
 
-
-
+#texts.textinputs##Chr(13)##Chr(10)#
+#texts.words#
+#texts.abort#
 
 var wordWindowObj = new wordWindow();
 wordWindowObj.originalSpellings = words;
 wordWindowObj.suggestions = suggs;
-wordWindowObj.text = wordtext;
-
+wordWindowObj.textInputs = textinputs;
 
 function init_spell() {
@@ -117,6 +162,4 @@
 }
 
-
-
 </script>
 
@@ -124,9 +167,8 @@
 <body onLoad="init_spell();">
 
-<script>
+<script type="text/javascript">
 wordWindowObj.writeBody();
 </script>
 
 </body>
-</html>
-</cfoutput>
+</html></cfoutput>
Index: /FCKeditor/branches/developers/alfonsoml/editor/dialog/fck_spellerpages/spellerpages/server-scripts/spellchecker.php
===================================================================
--- /FCKeditor/branches/developers/alfonsoml/editor/dialog/fck_spellerpages/spellerpages/server-scripts/spellchecker.php	(revision 140)
+++ /FCKeditor/branches/developers/alfonsoml/editor/dialog/fck_spellerpages/spellerpages/server-scripts/spellchecker.php	(revision 141)
@@ -2,15 +2,18 @@
 header('Content-type: text/html; charset=utf-8');
 
-//$spellercss = '/speller/spellerStyle.css';	// by FredCK
-$spellercss = '../spellerStyle.css';			// by FredCK
-//$word_win_src = '/speller/wordWindow.js';		// by FredCK
-$word_win_src = '../wordWindow.js';				// by FredCK
-$textinputs = $_POST['textinputs']; # array
-//$aspell_prog = 'aspell';									// by FredCK (for Linux)
-$aspell_prog = '"C:\Program Files\Aspell\bin\aspell.exe"';	// by FredCK (for Windows)
-$lang = 'en_US';
-//$aspell_opts = "-a --lang=$lang --encoding=utf-8";	// by FredCK
-$aspell_opts = "-a --lang=$lang --encoding=utf-8 -H";	// by FredCK
-$tempfiledir = "./";
+// The following variables values must reflect your installation needs.
+
+$aspell_prog	= '"C:\Program Files\Aspell\bin\aspell.exe"';	// by FredCK (for Windows)
+//$aspell_prog	= 'aspell';										// by FredCK (for Linux)
+
+$lang			= 'en_US';
+$aspell_opts	= "-a --lang=$lang --encoding=utf-8 -H";		// by FredCK
+
+$tempfiledir	= "./";
+
+$spellercss		= '../spellerStyle.css';						// by FredCK
+$word_win_src	= '../wordWindow.js';							// by FredCK
+
+$textinputs		= $_POST['textinputs']; # array
 $input_separator = "A";
 
Index: /FCKeditor/branches/developers/alfonsoml/editor/dialog/fck_spellerpages/spellerpages/server-scripts/spellchecker.pl
===================================================================
--- /FCKeditor/branches/developers/alfonsoml/editor/dialog/fck_spellerpages/spellerpages/server-scripts/spellchecker.pl	(revision 140)
+++ /FCKeditor/branches/developers/alfonsoml/editor/dialog/fck_spellerpages/spellerpages/server-scripts/spellchecker.pl	(revision 141)
@@ -16,5 +16,5 @@
 my $input_separator = "A";
 
-# set the 'wordtext' JavaScript variable to the submitted text. 
+# set the 'wordtext' JavaScript variable to the submitted text.
 sub printTextVar {
 	for( my $i = 0; $i <= $#textinputs; $i++ ) {
@@ -55,5 +55,5 @@
 
 	# temp file was created properly?
-	
+
 	# open temp file, add the submitted text.
 	for( my $i = 0; $i <= $#textinputs; $i++ ) {
@@ -67,5 +67,5 @@
 			print $fh "^$line\n";
 		}
-		
+
 	}
 	# exec aspell command
@@ -82,5 +82,5 @@
 			printTextIdxDecl( $textInputIdx );
 			$wordIdx = 0;
-	
+
 		} elsif( $ret =~ /^(&|#)/ ) {
 			my @tokens = split( " ", $ret, 5 );
@@ -159,5 +159,5 @@
 			parent.init_spell( wordWindowObj );
 		} else {
-			error = "This page was loaded outside of a frameset. "; 
+			error = "This page was loaded outside of a frameset. ";
 			error += "It might not display properly";
 			alert( error );
Index: /FCKeditor/branches/developers/alfonsoml/editor/dialog/fck_spellerpages/spellerpages/spellChecker.js
===================================================================
--- /FCKeditor/branches/developers/alfonsoml/editor/dialog/fck_spellerpages/spellerpages/spellChecker.js	(revision 140)
+++ /FCKeditor/branches/developers/alfonsoml/editor/dialog/fck_spellerpages/spellerpages/spellChecker.js	(revision 141)
@@ -1,3 +1,3 @@
-////////////////////////////////////////////////////
+////////////////////////////////////////////////////
 // spellChecker.js
 //
@@ -20,5 +20,4 @@
 	this.popUpProps = null ;																	// by FredCK
 //	this.spellCheckScript = '/speller/server-scripts/spellchecker.php';		// by FredCK
-	this.spellCheckScript = 'server-scripts/spellchecker.php';				// by FredCK
 	//this.spellCheckScript = '/cgi-bin/spellchecker.pl';
 
@@ -38,5 +37,5 @@
 	this.wordWin = null;
 	this.textArea = textObject;	// deprecated
-	this.textInputs = arguments; 
+	this.textInputs = arguments;
 
 	// private methods
@@ -98,5 +97,5 @@
 	this.wordWin = wordWindowObj;
 	this.controlWin = controlWindowObj;
-	
+
 	// reset properties
 	this.wordWin.resetForm();
@@ -113,5 +112,5 @@
 	// start
 	this._spellcheck();
-	
+
 	return true;
 }
@@ -150,5 +149,5 @@
 	}
 
-	// set this word as an "ignore all" word. 
+	// set this word as an "ignore all" word.
 	this._setAsIgnored( ti, wi, this.ignrAllFlag );
 
@@ -158,5 +157,5 @@
 			if(( i == ti && j > wi ) || i > ti ) {
 				// future word: set as "from ignore all" if
-				// 1) do not already have a flag and 
+				// 1) do not already have a flag and
 				// 2) have the same value as current word
 				if(( this.wordWin.getTextVal( i, j ) == s_word_to_repl )
@@ -215,5 +214,5 @@
 	var newspell = new String( txt.value );
 
-	// set this word as a "replace all" word. 
+	// set this word as a "replace all" word.
 	this._setWordText( ti, wi, newspell, this.replAllFlag );
 
@@ -223,5 +222,5 @@
 			if(( i == ti && j > wi ) || i > ti ) {
 				// future word: set word text to s_word_to_repl if
-				// 1) do not already have a flag and 
+				// 1) do not already have a flag and
 				// 2) have the same value as s_word_to_repl
 				if(( this.wordWin.getTextVal( i, j ) == s_word_to_repl )
@@ -232,5 +231,5 @@
 		}
 	}
-	
+
 	// finally, move on
 	this.currentWordIndex++;
@@ -291,10 +290,10 @@
 	// skip if this is the first word!
 	var ti = this.currentTextIndex;
-	var wi = this.currentWordIndex
-	
+	var wi = this.currentWordIndex;
+
 	if( this.wordWin.totalPreviousWords( ti, wi ) > 0 ) {
 		this.wordWin.removeFocus( ti, wi );
 
-		// go back to the last word index that was acted upon 
+		// go back to the last word index that was acted upon
 		do {
 			// if the current word index is zero then reset the seed
@@ -308,28 +307,29 @@
 				}
 			}
-		} while ( 
+		} while (
 			this.wordWin.totalWords( this.currentTextIndex ) == 0
 			|| this.wordFlags[this.currentTextIndex][this.currentWordIndex] == this.fromIgnrAll
 			|| this.wordFlags[this.currentTextIndex][this.currentWordIndex] == this.fromReplAll
-		); 
+		);
 
 		var text_idx = this.currentTextIndex;
 		var idx = this.currentWordIndex;
 		var preReplSpell = this.wordWin.originalSpellings[text_idx][idx];
-		
+
 		// if we got back to the first word then set the Undo button back to disabled
 		if( this.wordWin.totalPreviousWords( text_idx, idx ) == 0 ) {
 			this.controlWin.disableUndo();
 		}
-	
+
+		var i, j, origSpell ;
 		// examine what happened to this current word.
 		switch( this.wordFlags[text_idx][idx] ) {
-			// replace all: go through this and all the future occurances of the word 
+			// replace all: go through this and all the future occurances of the word
 			// and revert them all to the original spelling and clear their flags
 			case this.replAllFlag :
-				for( var i = text_idx; i < this.wordWin.textInputs.length; i++ ) {
-					for( var j = 0; j < this.wordWin.totalWords( i ); j++ ) {
+				for( i = text_idx; i < this.wordWin.textInputs.length; i++ ) {
+					for( j = 0; j < this.wordWin.totalWords( i ); j++ ) {
 						if(( i == text_idx && j >= idx ) || i > text_idx ) {
-							var origSpell = this.wordWin.originalSpellings[i][j];
+							origSpell = this.wordWin.originalSpellings[i][j];
 							if( origSpell == preReplSpell ) {
 								this._setWordText ( i, j, origSpell, undefined );
@@ -339,14 +339,14 @@
 				}
 				break;
-				
-			// ignore all: go through all the future occurances of the word 
+
+			// ignore all: go through all the future occurances of the word
 			// and clear their flags
 			case this.ignrAllFlag :
-				for( var i = text_idx; i < this.wordWin.textInputs.length; i++ ) {
-					for( var j = 0; j < this.wordWin.totalWords( i ); j++ ) {
+				for( i = text_idx; i < this.wordWin.textInputs.length; i++ ) {
+					for( j = 0; j < this.wordWin.totalWords( i ); j++ ) {
 						if(( i == text_idx && j >= idx ) || i > text_idx ) {
-							var origSpell = this.wordWin.originalSpellings[i][j];
+							origSpell = this.wordWin.originalSpellings[i][j];
 							if( origSpell == preReplSpell ) {
-								this.wordFlags[i][j] = undefined; 
+								this.wordFlags[i][j] = undefined;
 							}
 						}
@@ -354,5 +354,5 @@
 				}
 				break;
-				
+
 			// replace: revert the word to its original spelling
 			case this.replWordFlag :
@@ -362,5 +362,5 @@
 
 		// For all four cases, clear the wordFlag of this word. re-start the process
-		this.wordFlags[text_idx][idx] = undefined; 
+		this.wordFlags[text_idx][idx] = undefined;
 		this._spellcheck();
 	}
@@ -369,5 +369,5 @@
 function _spellcheck() {
 	var ww = this.wordWin;
-	
+
 	// check if this is the last word in the current text element
 	if( this.currentWordIndex == ww.totalWords( this.currentTextIndex) ) {
@@ -375,5 +375,5 @@
 		this.currentWordIndex = 0;
 		// keep going if we're not yet past the last text element
-		if( this.currentTextIndex < this.wordWin.textInputs.length ) {	
+		if( this.currentTextIndex < this.wordWin.textInputs.length ) {
 			this._spellcheck();
 			return;
@@ -383,5 +383,5 @@
 		}
 	}
-	
+
 	// if this is after the first one make sure the Undo button is enabled
 	if( this.currentWordIndex > 0 ) {
@@ -409,8 +409,8 @@
 	// get the array of suggested words out of the
 	// three-dimensional array containing all suggestions.
-	var a_suggests = this.wordWin.suggestions[text_num][word_num];	
+	var a_suggests = this.wordWin.suggestions[text_num][word_num];
 	if( a_suggests ) {
 		// got an array of suggestions.
-		for( var ii = 0; ii < a_suggests.length; ii++ ) {	
+		for( var ii = 0; ii < a_suggests.length; ii++ ) {
 			this.controlWin.addSuggestion( a_suggests[ii] );
 		}
@@ -454,6 +454,6 @@
 		for( var j = 0; j < document.forms[i].elements.length; j++ ) {
 			if( document.forms[i].elements[j].type.match( inputPattern )) {
-				inputs[inputs.length] = document.forms[i].elements[j]; 
-			}	
+				inputs[inputs.length] = document.forms[i].elements[j];
+			}
 		}
 	}
Index: /FCKeditor/branches/developers/alfonsoml/editor/dialog/fck_spellerpages/spellerpages/spellchecker.html
===================================================================
--- /FCKeditor/branches/developers/alfonsoml/editor/dialog/fck_spellerpages/spellerpages/spellchecker.html	(revision 140)
+++ /FCKeditor/branches/developers/alfonsoml/editor/dialog/fck_spellerpages/spellerpages/spellchecker.html	(revision 141)
@@ -27,6 +27,6 @@
 	var s = new String( str );
 	s = encodeURIComponent( s );
-	// additionally encode single quotes to evade any PHP 
-	// magic_quotes_gpc setting (it inserts escape characters and 
+	// additionally encode single quotes to evade any PHP
+	// magic_quotes_gpc setting (it inserts escape characters and
 	// therefore skews the btye positions of misspelled words)
 	return s.replace( /\'/g, '%27' );
Index: /FCKeditor/branches/developers/alfonsoml/editor/dialog/fck_spellerpages/spellerpages/spellerStyle.css
===================================================================
--- /FCKeditor/branches/developers/alfonsoml/editor/dialog/fck_spellerpages/spellerpages/spellerStyle.css	(revision 140)
+++ /FCKeditor/branches/developers/alfonsoml/editor/dialog/fck_spellerpages/spellerpages/spellerStyle.css	(revision 141)
Index: /FCKeditor/branches/developers/alfonsoml/editor/dialog/fck_spellerpages/spellerpages/wordWindow.js
===================================================================
--- /FCKeditor/branches/developers/alfonsoml/editor/dialog/fck_spellerpages/spellerpages/wordWindow.js	(revision 140)
+++ /FCKeditor/branches/developers/alfonsoml/editor/dialog/fck_spellerpages/spellerpages/wordWindow.js	(revision 141)
@@ -1,3 +1,3 @@
-////////////////////////////////////////////////////
+////////////////////////////////////////////////////
 // wordWindow object
 ////////////////////////////////////////////////////
@@ -13,5 +13,5 @@
 	this._isWordChar = _isWordChar;
 	this._lastPos = _lastPos;
-	
+
 	// public properties
 	this.wordChar = /[a-zA-Z]/;
@@ -70,5 +70,5 @@
 			} else {
 				total_words++;
-			}	
+			}
 		}
 	}
@@ -116,15 +116,15 @@
 		// update the text given the index of the string
 		beginStr = this.textInputs[textIndex].substring( 0, pos );
-		endStr = this.textInputs[textIndex].substring( 
-			pos + oldText.length, 
-			this.textInputs[textIndex].length 
+		endStr = this.textInputs[textIndex].substring(
+			pos + oldText.length,
+			this.textInputs[textIndex].length
 		);
 		this.textInputs[textIndex] = beginStr + newText + endStr;
-		
-		// adjust the indexes on the stack given the differences in 
-		// length between the new word and old word. 
+
+		// adjust the indexes on the stack given the differences in
+		// length between the new word and old word.
 		var lengthDiff = newText.length - oldText.length;
 		this._adjustIndexes( textIndex, wordIndex, lengthDiff );
-		
+
 		word.size = newText.length;
 		word.value = newText;
@@ -141,12 +141,12 @@
 
 	// iterate through each text input.
-	for( var txtid = 0; txtid < this.textInputs.length; txtid++ ) {	
+	for( var txtid = 0; txtid < this.textInputs.length; txtid++ ) {
 		var end_idx = 0;
-		var begin_idx = 0;	
+		var begin_idx = 0;
 		d.writeln( '<form name="textInput'+txtid+'">' );
 		var wordtxt = this.textInputs[txtid];
 		this.indexes[txtid] = [];
 
-		if( wordtxt ) {			
+		if( wordtxt ) {
 			var orig = this.originalSpellings[txtid];
 			if( !orig ) break;
@@ -154,8 +154,8 @@
 			//!!! plain text, or HTML mode?
 			d.writeln( '<div class="plainText">' );
-			// iterate through each occurrence of a misspelled word. 
+			// iterate through each occurrence of a misspelled word.
 			for( var i = 0; i < orig.length; i++ ) {
 				// find the position of the current misspelled word,
-				// starting at the last misspelled word. 
+				// starting at the last misspelled word.
 				// and keep looking if it's a substring of another word
 				do {
@@ -163,15 +163,15 @@
 					end_idx = begin_idx + orig[i].length;
 					// word not found? messed up!
-					if( begin_idx == -1 ) break; 
-					// look at the characters immediately before and after 
+					if( begin_idx == -1 ) break;
+					// look at the characters immediately before and after
 					// the word. If they are word characters we'll keep looking.
 					var before_char = wordtxt.charAt( begin_idx - 1 );
 					var after_char = wordtxt.charAt( end_idx );
-				} while ( 
-					this._isWordChar( before_char ) 
+				} while (
+					this._isWordChar( before_char )
 					|| this._isWordChar( after_char )
 				);
 
-				// keep track of its position in the original text. 
+				// keep track of its position in the original text.
 				this.indexes[txtid][i] = begin_idx;
 
@@ -182,5 +182,5 @@
 				}
 
-				// write out the misspelled word. 
+				// write out the misspelled word.
 				d.write( this._wordInputStr( orig[i] ));
 
@@ -188,9 +188,9 @@
 				if( i == orig.length-1 ){
 					d.write( printForHtml( wordtxt.substr( end_idx )));
-				}			
+				}
 			}
 
 			d.writeln( '</div>' );
-			
+
 		}
 		d.writeln( '</form>' );
@@ -201,6 +201,6 @@
 	//		alert( d.forms[j].elements[k].name + ": " + d.forms[j].elements[k].value );
 	//	}
-	//}	
-	
+	//}
+
 	// set the _forms property
 	this._forms = d.forms;
@@ -218,5 +218,5 @@
 function printForHtml( n ) {
 	return n ;		// by FredCK
-/*	
+/*
 	var htmlstr = n;
 	if( htmlstr.length == 1 ) {
Index: /FCKeditor/branches/developers/alfonsoml/editor/dialog/fck_table.html
===================================================================
--- /FCKeditor/branches/developers/alfonsoml/editor/dialog/fck_table.html	(revision 140)
+++ /FCKeditor/branches/developers/alfonsoml/editor/dialog/fck_table.html	(revision 141)
@@ -1,9 +1,25 @@
-
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
@@ -47,5 +63,5 @@
 		if (iWidth.indexOf('%') >= 0)			// Percentual = %
 		{
-			iWidth = parseInt( iWidth.substr(0,iWidth.length - 1) ) ;
+			iWidth = parseInt( iWidth.substr(0,iWidth.length - 1), 10 ) ;
 			document.getElementById('selWidthType').value = "percent" ;
 		}
@@ -55,8 +71,8 @@
 			document.getElementById('selWidthType').value = "pixels" ;
 		}
-		
+
 		if (iHeight && iHeight.indexOf('px') >= 0)		// Style Pixel = px
 			iHeight = iHeight.substr(0,iHeight.length - 2);
-		
+
 		document.getElementById('txtWidth').value		= iWidth || '' ;
 		document.getElementById('txtHeight').value		= iHeight || '' ;
@@ -69,11 +85,11 @@
 
 		if (table.caption) document.getElementById('txtCaption').value = table.caption.innerHTML ;
-		
+
 		document.getElementById('txtRows').disabled    = true ;
 		document.getElementById('txtColumns').disabled = true ;
 	}
-	
-	window.parent.SetOkButton( true ) ;	
-	window.parent.SetAutoSize( true ) ;	
+
+	window.parent.SetOkButton( true ) ;
+	window.parent.SetAutoSize( true ) ;
 }
 
@@ -82,5 +98,5 @@
 {
 	var bExists = ( table != null ) ;
-	
+
 	if ( ! bExists )
 		table = oEditor.FCK.EditorDocument.createElement( "TABLE" ) ;
@@ -116,10 +132,10 @@
 	else if ( bExists && eCaption )
 		eCaption.parentNode.removeChild( eCaption ) ;
-		
+
 	if (! bExists)
 	{
 		var iRows = document.getElementById('txtRows').value ;
 		var iCols = document.getElementById('txtColumns').value ;
-		
+
 		for ( var r = 0 ; r < iRows ; r++ )
 		{
@@ -128,15 +144,15 @@
 			{
 				var oCell = oRow.insertCell(-1) ;
-				if ( oEditor.FCKBrowserInfo.IsGecko )
-					oCell.innerHTML = '<br _moz_editor_bogus_node="TRUE" />' ;
+				if ( oEditor.FCKBrowserInfo.IsGeckoLike )
+					oCell.innerHTML = GECKO_BOGUS ;
 				//oCell.innerHTML = " " ;
 			}
 		}
-		
+
 		oEditor.FCKUndo.SaveUndoStep() ;
-		
+
 		oEditor.FCK.InsertElement( table ) ;
 	}
-	
+
 	return true ;
 }
Index: /FCKeditor/branches/developers/alfonsoml/editor/dialog/fck_tablecell.html
===================================================================
--- /FCKeditor/branches/developers/alfonsoml/editor/dialog/fck_tablecell.html	(revision 140)
+++ /FCKeditor/branches/developers/alfonsoml/editor/dialog/fck_tablecell.html	(revision 141)
@@ -1,8 +1,24 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
-
 <html xmlns="http://www.w3.org/1999/xhtml">
Index: /FCKeditor/branches/developers/alfonsoml/editor/dialog/fck_template.html
===================================================================
--- /FCKeditor/branches/developers/alfonsoml/editor/dialog/fck_template.html	(revision 140)
+++ /FCKeditor/branches/developers/alfonsoml/editor/dialog/fck_template.html	(revision 141)
@@ -1,8 +1,24 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
 <html xmlns="http://www.w3.org/1999/xhtml">
@@ -52,7 +68,7 @@
 	// Translate the dialog box texts.
 	oEditor.FCKLanguageManager.TranslatePage(document) ;
-	
+
 	GetE('xChkReplaceAll').checked = ( FCKConfig.TemplateReplaceAll !== false ) ;
-	
+
 	if ( FCKConfig.TemplateReplaceCheckbox !== false )
 		GetE('xReplaceBlock').style.display = '' ;
@@ -65,4 +81,6 @@
 function LoadTemplatesXml()
 {
+	var oTemplate ;
+
 	if ( !FCK._Templates )
 	{
@@ -85,7 +103,7 @@
 		for ( var i = 0 ; i < aTplNodes.length ; i++ )
 		{
-			var oNode = aTplNodes[i]
-
-			var oTemplate = new Object() ;
+			var oNode = aTplNodes[i] ;
+
+			oTemplate = new Object() ;
 
 			var oPart ;
@@ -124,10 +142,10 @@
 	else
 	{
-		for ( var i = 0 ; i < FCK._Templates.length ; i++ )
+		for ( var j = 0 ; j < FCK._Templates.length ; j++ )
 		{
-			var oTemplate = FCK._Templates[i] ;
+			oTemplate = FCK._Templates[j] ;
 
 			var oItemDiv = GetE('eList').appendChild( document.createElement( 'DIV' ) ) ;
-			oItemDiv.TplIndex = i ;
+			oItemDiv.TplIndex = j ;
 			oItemDiv.className = 'TplItem' ;
 
@@ -146,5 +164,5 @@
 
 			oItemDiv.innerHTML = sInner ;
-			
+
 			oItemDiv.onmouseover = ItemDiv_OnMouseOver ;
 			oItemDiv.onmouseout = ItemDiv_OnMouseOut ;
Index: /FCKeditor/branches/developers/alfonsoml/editor/dialog/fck_textarea.html
===================================================================
--- /FCKeditor/branches/developers/alfonsoml/editor/dialog/fck_textarea.html	(revision 140)
+++ /FCKeditor/branches/developers/alfonsoml/editor/dialog/fck_textarea.html	(revision 141)
@@ -1,8 +1,24 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
-
 <html>
@@ -11,5 +27,4 @@
 		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 		<meta content="noindex, nofollow" name="robots">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema"> 
 		<script src="common/fck_dialog_common.js" type="text/javascript"></script>
 		<script type="text/javascript">
Index: /FCKeditor/branches/developers/alfonsoml/editor/dialog/fck_textfield.html
===================================================================
--- /FCKeditor/branches/developers/alfonsoml/editor/dialog/fck_textfield.html	(revision 140)
+++ /FCKeditor/branches/developers/alfonsoml/editor/dialog/fck_textfield.html	(revision 141)
@@ -1,8 +1,24 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
-
 <html xmlns="http://www.w3.org/1999/xhtml">
Index: Keditor/branches/developers/alfonsoml/editor/dialog/fck_universalkey.html
===================================================================
--- /FCKeditor/branches/developers/alfonsoml/editor/dialog/fck_universalkey.html	(revision 140)
+++ 	(revision )
@@ -1,52 +1,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
-
-<html>
-	<head>
-		<title>Universal Keyboard</title>
-		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-		<meta content="noindex, nofollow" name="robots">
-		<meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema"> 
-		<link rel="stylesheet" type="text/css" href="fck_universalkey/fck_universalkey.css" />
-		<script type="text/javascript">
-
-var oEditor = window.parent.InnerDialogLoaded() ;
-
-window.onload = function()
-{
-	document.body.style.padding = '0px' ;
-
-	// First of all, translate the dialog box texts
-	oEditor.FCKLanguageManager.TranslatePage(document) ;
-
-	window.parent.SetOkButton( true ) ;
-	window.parent.SetAutoSize( true ) ;	
-}
-
-function Ok()
-{
-	var oArea = document.getElementById( 'uni_area' ) ;
-
-	if ( oArea.value.length > 0 )
-		oEditor.FCK.InsertHtml( oArea.value ) ;
-
-	return true ;
-}
-
-		</script>
-	</head>
-	<body style="OVERFLOW: hidden" scroll="no">
-		<textarea id="uni_area" cols="40" rows="4" style="width:100%;height:60px;">

- - - - - - Index: /FCKeditor/branches/developers/alfonsoml/editor/fckdebug.html =================================================================== --- /FCKeditor/branches/developers/alfonsoml/editor/fckdebug.html (revision 140) +++ /FCKeditor/branches/developers/alfonsoml/editor/fckdebug.html (revision 141) @@ -1,9 +1,25 @@ - @@ -32,8 +48,8 @@ if ( !noParse && message != null && isNaN( message ) ) message = message.replace(/' + message + '<\/font>' ; - + window.FCKMessages[ window.FCKMessages.length ] = message ; StartTimer() ; @@ -43,16 +59,16 @@ { var message ; - - if ( anyObject != null ) + + if ( anyObject != null ) { message = 'Properties of: ' + anyObject + '

' ; - + for (var prop in anyObject) { - try + try { var sVal = anyObject[ prop ] != null ? anyObject[ prop ] + '' : '[null]' ; message += '' + prop + ' : ' + sVal.replace(/' ; - } + } catch (e) { @@ -68,8 +84,8 @@ } - message += '

' ; + message += '' ; } else message = 'OutputObject : Object is "null".' ; - + Output( message, color, true ) ; } @@ -86,5 +102,5 @@ // Get the first item in the queue var sMessage = window.FCKMessages[0] ; - + // Removes the first item from the queue var oTempArray = new Array() ; @@ -92,10 +108,10 @@ oTempArray[ i - 1 ] = window.FCKMessages[ i ] ; window.FCKMessages = oTempArray ; - + var d = new Date() ; - var sTime = - ( d.getHours() + 100 + '' ).substr( 1,2 ) + ':' + - ( d.getMinutes() + 100 + '' ).substr( 1,2 ) + ':' + - ( d.getSeconds() + 100 + '' ).substr( 1,2 ) + ':' + + var sTime = + ( d.getHours() + 100 + '' ).substr( 1,2 ) + ':' + + ( d.getMinutes() + 100 + '' ).substr( 1,2 ) + ':' + + ( d.getSeconds() + 100 + '' ).substr( 1,2 ) + ':' + ( d.getMilliseconds() + 1000 + '' ).substr( 1,3 ) ; Index: /FCKeditor/branches/developers/alfonsoml/editor/fckdialog.html =================================================================== --- /FCKeditor/branches/developers/alfonsoml/editor/fckdialog.html (revision 140) +++ /FCKeditor/branches/developers/alfonsoml/editor/fckdialog.html (revision 141) @@ -1,8 +1,24 @@ - - @@ -85,5 +101,5 @@ { if ( document.all ) - window.dialogHeight = ( parseInt( window.dialogHeight ) + iDiff ) + 'px' ; + window.dialogHeight = ( parseInt( window.dialogHeight, 10 ) + iDiff ) + 'px' ; else window.resizeBy( 0, iDiff ) ; @@ -196,5 +212,5 @@ case 13 : // ENTER var oTarget = e.srcElement || e.target ; - if ( oTarget.tagName == 'TEXTAREA' ) + if ( oTarget.tagName == 'TEXTAREA' ) return true ; Ok() ; Index: /FCKeditor/branches/developers/alfonsoml/editor/fckeditor.html =================================================================== --- /FCKeditor/branches/developers/alfonsoml/editor/fckeditor.html (revision 140) +++ /FCKeditor/branches/developers/alfonsoml/editor/fckeditor.html (revision 141) @@ -1,8 +1,24 @@ - - @@ -72,4 +88,5 @@ LoadScript( '_source/classes/fckdomrange.js' ) ; LoadScript( '_source/classes/fckdocumentfragment_' + sSuffix + '.js' ) ; +LoadScript( '_source/classes/fckw3crange.js' ) ; LoadScript( '_source/classes/fckdomrange_' + sSuffix + '.js' ) ; LoadScript( '_source/classes/fckenterkey.js' ) ; @@ -133,5 +150,13 @@ { // Remove IE mouse flickering. - document.execCommand( 'BackgroundImageCache', false, true ) ; + try + { + document.execCommand( 'BackgroundImageCache', false, true ) ; + } + catch (e) + { + // We have been reported about loading problems caused by the above + // line. For safety, let's just ignore errors. + } // Create the default cleanup object used by the editor. @@ -174,5 +199,5 @@ @@ -18,5 +33,5 @@ var oRegex = new RegExp( '[\?&]' + paramName + '=([^&]+)', 'i' ) ; var oMatch = oRegex.exec( window.top.location.search ) ; - + if ( oMatch && oMatch.length > 1 ) return decodeURIComponent( oMatch[1] ) ; @@ -51,9 +66,9 @@ sUrl += '&Type=' + this.ResourceType ; sUrl += '&CurrentFolder=' + encodeURIComponent( this.CurrentFolder ) ; - + if ( params ) sUrl += '&' + params ; var oXML = new FCKXml() ; - + if ( callBackFunction ) oXML.LoadUrl( sUrl, callBackFunction ) ; // Asynchronous load. @@ -66,11 +81,11 @@ oConnector.CheckError = function( responseXml ) { - var iErrorNumber = 0 + var iErrorNumber = 0 ; var oErrorNode = responseXml.SelectSingleNode( 'Connector/Error' ) ; - + if ( oErrorNode ) { - iErrorNumber = parseInt( oErrorNode.attributes.getNamedItem('number').value ) ; - + iErrorNumber = parseInt( oErrorNode.attributes.getNamedItem('number').value, 10 ) ; + switch ( iErrorNumber ) { @@ -102,8 +117,8 @@ var oIcons = new Object() ; -oIcons.AvailableIconsArray = [ +oIcons.AvailableIconsArray = [ 'ai','avi','bmp','cs','dll','doc','exe','fla','gif','htm','html','jpg','js', 'mdb','mp3','pdf','ppt','rdp','swf','swt','txt','vsd','xls','xml','zip' ] ; - + oIcons.AvailableIcons = new Object() ; Index: /FCKeditor/branches/developers/alfonsoml/editor/filemanager/browser/default/connectors/asp/basexml.asp =================================================================== --- /FCKeditor/branches/developers/alfonsoml/editor/filemanager/browser/default/connectors/asp/basexml.asp (revision 140) +++ /FCKeditor/branches/developers/alfonsoml/editor/filemanager/browser/default/connectors/asp/basexml.asp (revision 141) @@ -1,7 +1,23 @@ - <% @@ -25,5 +41,5 @@ ' Create the main "Connector" node. Response.Write "" - + ' Add the current folder node. Response.Write "" @@ -36,10 +52,10 @@ Sub SendError( number, text ) SetXmlHeaders - + ' Create the XML document header. Response.Write "" - + Response.Write "" - + Response.End End Sub Index: /FCKeditor/branches/developers/alfonsoml/editor/filemanager/browser/default/connectors/asp/class_upload.asp =================================================================== --- /FCKeditor/branches/developers/alfonsoml/editor/filemanager/browser/default/connectors/asp/class_upload.asp (revision 140) +++ /FCKeditor/branches/developers/alfonsoml/editor/filemanager/browser/default/connectors/asp/class_upload.asp (revision 141) @@ -1,8 +1,24 @@ - <% @@ -35,14 +51,14 @@ Private oSourceData Private nMaxSize, nErr, sAllowed, sDenied - + Private Sub Class_Initialize nErr = 0 nMaxSize = 1048576 - + Set File = Server.CreateObject("Scripting.Dictionary") File.CompareMode = 1 Set Form = Server.CreateObject("Scripting.Dictionary") Form.CompareMode = 1 - + Set oSourceData = Server.CreateObject("ADODB.Stream") oSourceData.Type = 1 @@ -50,5 +66,5 @@ oSourceData.Open End Sub - + Private Sub Class_Terminate Form.RemoveAll @@ -56,9 +72,9 @@ File.RemoveAll Set File = Nothing - + oSourceData.Close Set oSourceData = Nothing End Sub - + Public Property Get Version Version = "NetRube Upload Class Version 1.0 Build 20041218" @@ -68,13 +84,13 @@ ErrNum = nErr End Property - + Public Property Let MaxSize(nSize) nMaxSize = nSize End Property - + Public Property Let Allowed(sExt) sAllowed = sExt End Property - + Public Property Let Denied(sExt) sDenied = sExt @@ -88,5 +104,5 @@ Exit Sub End If - + Dim nTotalSize nTotalSize = Request.TotalBytes @@ -99,10 +115,10 @@ Exit Sub End If - + oSourceData.Write Request.BinaryRead(nTotalSize) oSourceData.Position = 0 - + Dim oTotalData, oFormStream, sFormHeader, sFormName, bCrLf, nBoundLen, nFormStart, nFormEnd, nPosStart, nPosEnd, sBoundary - + oTotalData = oSourceData.Read bCrLf = ChrB(13) & ChrB(10) @@ -110,10 +126,10 @@ nBoundLen = LenB(sBoundary) + 2 nFormStart = nBoundLen - + Set oFormStream = Server.CreateObject("ADODB.Stream") - + Do While (nFormStart + 2) < nTotalSize nFormEnd = InStrB(nFormStart, oTotalData, bCrLf & bCrLf) + 3 - + With oFormStream .Type = 1 @@ -128,10 +144,10 @@ .Close End With - + nFormStart = InStrB(nFormEnd, oTotalData, sBoundary) - 1 nPosStart = InStr(22, sFormHeader, " name=", 1) + 7 nPosEnd = InStr(nPosStart, sFormHeader, """") sFormName = Mid(sFormHeader, nPosStart, nPosEnd - nPosStart) - + If InStr(45, sFormHeader, " filename=", 1) > 0 Then Set File(sFormName) = New NetRube_FileInfo @@ -161,8 +177,8 @@ End With End If - + nFormStart = nFormStart + nBoundLen Loop - + oTotalData = "" Set oFormStream = Nothing @@ -174,10 +190,10 @@ Exit Sub End If - + If Not IsAllowed(File(sItem).Ext) Then nErr = 4 Exit Sub End If - + Dim oFileStream Set oFileStream = Server.CreateObject("ADODB.Stream") @@ -194,5 +210,5 @@ Set oFileStream = Nothing End Sub - + Private Function IsAllowed(sExt) Dim oRE @@ -200,5 +216,5 @@ oRE.IgnoreCase = True oRE.Global = True - + If sDenied = "" Then oRE.Pattern = sAllowed @@ -208,5 +224,5 @@ IsAllowed = Not oRE.Test(sExt) End If - + Set oRE = Nothing End Function Index: /FCKeditor/branches/developers/alfonsoml/editor/filemanager/browser/default/connectors/asp/commands.asp =================================================================== --- /FCKeditor/branches/developers/alfonsoml/editor/filemanager/browser/default/connectors/asp/commands.asp (revision 140) +++ /FCKeditor/branches/developers/alfonsoml/editor/filemanager/browser/default/connectors/asp/commands.asp (revision 141) @@ -1,8 +1,24 @@ - <% @@ -23,7 +39,7 @@ Response.Write "" Next - + Set oFSO = Nothing - + ' Close the "Folders" node. Response.Write "" @@ -40,26 +56,26 @@ Set oFolders = oCurrentFolder.SubFolders Set oFiles = oCurrentFolder.Files - + ' Open the "Folders" node. Response.Write "" - + For Each oFolder in oFolders Response.Write "" Next - + ' Close the "Folders" node. Response.Write "" - + ' Open the "Files" node. Response.Write "" - + For Each oFile in oFiles Dim iFileSize iFileSize = Round( oFile.size / 1024 ) If ( iFileSize < 1 AND oFile.size <> 0 ) Then iFileSize = 1 - + Response.Write "" Next - + ' Close the "Files" node. Response.Write "" @@ -78,15 +94,15 @@ Dim sServerDir sServerDir = ServerMapFolder( resourceType, currentFolder & "/" & sNewFolderName ) - + On Error Resume Next CreateServerFolder sServerDir - + Dim iErrNumber, sErrDescription iErrNumber = err.number sErrDescription = err.Description - + On Error Goto 0 - + Select Case iErrNumber Case 0 @@ -117,5 +133,5 @@ Dim sErrorNumber sErrorNumber = "0" - + Dim sFileName, sOriginalFileName, sExtension sFileName = "" @@ -130,5 +146,5 @@ Dim oFSO Set oFSO = Server.CreateObject( "Scripting.FileSystemObject" ) - + ' Get the uploaded file name. sFileName = oUploader.File( "NewFile" ).Name Index: /FCKeditor/branches/developers/alfonsoml/editor/filemanager/browser/default/connectors/asp/config.asp =================================================================== --- /FCKeditor/branches/developers/alfonsoml/editor/filemanager/browser/default/connectors/asp/config.asp (revision 140) +++ /FCKeditor/branches/developers/alfonsoml/editor/filemanager/browser/default/connectors/asp/config.asp (revision 141) @@ -1,14 +1,29 @@ - <% -' SECURITY: You must explicitelly enable this "connector" (set it to "True"). +' SECURITY: You must explicitelly enable this "connector" (set it to "True"). Dim ConfigIsEnabled ConfigIsEnabled = False -ConfigIsEnabled = True ' @Packager.RemoveLine ' Path to user files relative to the document root. @@ -21,5 +36,5 @@ ConfigAllowedExtensions.Add "File", "" -ConfigDeniedExtensions.Add "File", "php|php2|php3|php4|php5|phtml|pwml|inc|asp|aspx|ascx|jsp|cfm|cfc|pl|bat|exe|com|dll|vbs|js|reg|cgi|htaccess" +ConfigDeniedExtensions.Add "File", "html|htm|php|php2|php3|php4|php5|phtml|pwml|inc|asp|aspx|ascx|jsp|cfm|cfc|pl|bat|exe|com|dll|vbs|js|reg|cgi|htaccess|asis" ConfigAllowedExtensions.Add "Image", "jpg|gif|jpeg|png|bmp" Index: /FCKeditor/branches/developers/alfonsoml/editor/filemanager/browser/default/connectors/asp/connector.asp =================================================================== --- /FCKeditor/branches/developers/alfonsoml/editor/filemanager/browser/default/connectors/asp/connector.asp (revision 140) +++ /FCKeditor/branches/developers/alfonsoml/editor/filemanager/browser/default/connectors/asp/connector.asp (revision 141) @@ -1,12 +1,28 @@ -<%@ CodePage=65001 Language="VBScript"%> +<%@ CodePage=65001 Language="VBScript"%> <% Option Explicit Response.Buffer = True %> - @@ -32,5 +48,5 @@ End If Else - sUserFilesPath = "/UserFiles/" + sUserFilesPath = "/userfiles/" End If @@ -47,5 +63,5 @@ Sub DoResponse() Dim sCommand, sResourceType, sCurrentFolder - + ' Get the main request information. sCommand = Request.QueryString("Command") @@ -54,5 +70,5 @@ sResourceType = Request.QueryString("Type") If ( sResourceType = "" ) Then Exit Sub - + sCurrentFolder = Request.QueryString("CurrentFolder") If ( sCurrentFolder = "" ) Then Exit Sub @@ -68,5 +84,5 @@ If ( InStr( 1, sCurrentFolder, ".." ) <> 0 OR InStr( 1, sResourceType, ".." ) <> 0 ) Then SendError 102, "" - End If + End If ' File Upload doesn't have to Return XML, so it must be intercepted before anything. @@ -77,5 +93,5 @@ SetXmlHeaders - + CreateXmlHeader sCommand, sResourceType, sCurrentFolder @@ -101,7 +117,7 @@ oRE.Global = True oRE.Pattern = "^(File|Image|Flash|Media)$" - + IsAllowedType = oRE.Test( resourceType ) - + Set oRE = Nothing End Function Index: /FCKeditor/branches/developers/alfonsoml/editor/filemanager/browser/default/connectors/asp/io.asp =================================================================== --- /FCKeditor/branches/developers/alfonsoml/editor/filemanager/browser/default/connectors/asp/io.asp (revision 140) +++ /FCKeditor/branches/developers/alfonsoml/editor/filemanager/browser/default/connectors/asp/io.asp (revision 141) @@ -1,7 +1,23 @@ - <% @@ -22,5 +38,5 @@ Dim sResourceTypePath sResourceTypePath = sUserFilesDirectory & LCase( resourceType ) & "\" - + ' Ensure that the directory exists. CreateServerFolder sResourceTypePath @@ -33,15 +49,15 @@ Dim oFSO Set oFSO = Server.CreateObject( "Scripting.FileSystemObject" ) - + Dim sParent sParent = oFSO.GetParentFolderName( folderPath ) - + ' Check if the parent exists, or create it. If ( NOT oFSO.FolderExists( sParent ) ) Then CreateServerFolder( sParent ) - - If ( oFSO.FolderExists( folderPath ) = False ) Then + + If ( oFSO.FolderExists( folderPath ) = False ) Then oFSO.CreateFolder( folderPath ) End If - + Set oFSO = Nothing End Sub @@ -52,21 +68,21 @@ oRE.IgnoreCase = True oRE.Global = True - + Dim sAllowed, sDenied sAllowed = ConfigAllowedExtensions.Item( resourceType ) sDenied = ConfigDeniedExtensions.Item( resourceType ) - + IsAllowedExt = True - + If sDenied <> "" Then oRE.Pattern = sDenied IsAllowedExt = Not oRE.Test( extension ) - End If - + End If + If IsAllowedExt And sAllowed <> "" Then oRE.Pattern = sAllowed IsAllowedExt = oRE.Test( extension ) End If - + Set oRE = Nothing End Function Index: /FCKeditor/branches/developers/alfonsoml/editor/filemanager/browser/default/connectors/asp/util.asp =================================================================== --- /FCKeditor/branches/developers/alfonsoml/editor/filemanager/browser/default/connectors/asp/util.asp (revision 140) +++ /FCKeditor/branches/developers/alfonsoml/editor/filemanager/browser/default/connectors/asp/util.asp (revision 141) @@ -1,7 +1,23 @@ - <% Index: /FCKeditor/branches/developers/alfonsoml/editor/filemanager/browser/default/connectors/aspx/connector.aspx =================================================================== --- /FCKeditor/branches/developers/alfonsoml/editor/filemanager/browser/default/connectors/aspx/connector.aspx (revision 140) +++ /FCKeditor/branches/developers/alfonsoml/editor/filemanager/browser/default/connectors/aspx/connector.aspx (revision 141) @@ -1,14 +1,30 @@ <%@ Page language="c#" Inherits="FredCK.FCKeditorV2.FileBrowserConnector" AutoEventWireup="false" %> - +<%-- + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * This is the File Browser Connector for ASP.NET. + * + * The code of this page if included in the FCKeditor.Net package, + * in the FredCK.FCKeditorV2.dll assembly file. So to use it you must + * include that DLL in your "bin" directory. + * + * To download the FCKeditor.Net package, go to our official web site: + * http://www.fckeditor.net +--%> Index: /FCKeditor/branches/developers/alfonsoml/editor/filemanager/browser/default/connectors/cfm/config.cfm =================================================================== --- /FCKeditor/branches/developers/alfonsoml/editor/filemanager/browser/default/connectors/cfm/config.cfm (revision 140) +++ /FCKeditor/branches/developers/alfonsoml/editor/filemanager/browser/default/connectors/cfm/config.cfm (revision 141) @@ -1,4 +1,23 @@ - + config = structNew(); @@ -7,5 +26,5 @@ config.enabled = false; - config.userFilesPath = "/UserFiles/"; + config.userFilesPath = "/userfiles/"; config.serverPath = ""; // use this to force the server path if FCKeditor is not running directly off the root of the application or the FCKeditor directory in the URL is a virtual directory or a symbolic link / junction @@ -16,5 +35,5 @@ // config.allowedExtensions["File"] = "doc,rtf,pdf,ppt,pps,xls,csv,vnd,zip"; config.allowedExtensions["File"] = ""; - config.deniedExtensions["File"] = "php,php2,php3,php4,php5,phtml,pwml,inc,asp,aspx,ascx,jsp,cfm,cfc,pl,bat,exe,com,dll,vbs,js,reg,cgi,htaccess"; + config.deniedExtensions["File"] = "html,htm,php,php2,php3,php4,php5,phtml,pwml,inc,asp,aspx,ascx,jsp,cfm,cfc,pl,bat,exe,com,dll,vbs,js,reg,cgi,htaccess,asis"; config.allowedExtensions["Image"] = "png,gif,jpg,jpeg,bmp"; @@ -36,9 +55,9 @@ - + - + Index: /FCKeditor/branches/developers/alfonsoml/editor/filemanager/browser/default/connectors/cfm/connector.cfm =================================================================== --- /FCKeditor/branches/developers/alfonsoml/editor/filemanager/browser/default/connectors/cfm/connector.cfm (revision 140) +++ /FCKeditor/branches/developers/alfonsoml/editor/filemanager/browser/default/connectors/cfm/connector.cfm (revision 141) @@ -1,26 +1,41 @@ - - - + @@ -32,15 +47,11 @@ lAllowedExtensions = config.allowedExtensions[url.type]; lDeniedExtensions = config.deniedExtensions[url.type]; - + // make sure the user files path is correctly formatted userFilesPath = replace(userFilesPath, "\", "/", "ALL"); - userFilesPath = replace(userFilesPath, '//', '/', 'ALL'); if ( right(userFilesPath,1) neq "/" ) { userFilesPath = userFilesPath & "/"; } - if ( left(userFilesPath,1) neq "/" ) { - userFilesPath = "/" & userFilesPath; - } - + // make sure the current folder is correctly formatted url.currentFolder = replace(url.currentFolder, "\", "/", "ALL"); @@ -58,7 +69,7 @@ fs = "\"; } - + // Get the base physical path to the web root for this application. The code to determine the path automatically assumes that - // the "FCKeditor" directory in the http request path is directly off the web root for the application and that it's not a + // the "FCKeditor" directory in the http request path is directly off the web root for the application and that it's not a // virtual directory or a symbolic link / junction. Use the serverPath config setting to force a physical path if necessary. if ( len(config.serverPath) ) { @@ -67,8 +78,8 @@ serverPath = replaceNoCase(getBaseTemplatePath(),replace(cgi.script_name,"/",fs,"all"),""); } - + // map the user files path to a physical directory - userFilesServerPath = serverPath & replace(userFilesPath,"/",fs,"all"); - + userFilesServerPath = serverPath & url.type & replace(url.currentFolder,"/",fs,"all"); + xmlContent = ""; // append to this string to build content @@ -77,9 +88,9 @@ "> - + - + "> - + @@ -87,22 +98,22 @@ - + - - - + + - + - + - + - + @@ -118,20 +129,20 @@ - + - - + + - - + + - + - + - + - + - + - + - + - + - + errorNumber = 0; fileName = cffile.ClientFileName; fileExt = cffile.ServerFileExt; - + // munge filename for html download. Only a-z, 0-9, _, - and . are allowed if( reFind("[^A-Za-z0-9_\-\.]", fileName) ) { @@ -166,5 +177,5 @@ fileName = reReplace(fileName, "$_([^_]+)$", "\1", "ALL"); } - + // When the original filename already exists, add numbers (0), (1), (2), ... at the end of the filename. if( compare( cffile.ServerFileName, fileName ) ) { @@ -177,8 +188,8 @@ } - + - + - - - + + + - + - + - + - + - - + + - + @@ -212,5 +223,5 @@ - + @@ -219,21 +230,21 @@ - + - + - + - - + + - + - - + i=1; @@ -243,23 +254,23 @@ break; if( not listFind(".,..", qDir.name[i]) ) - folders = folders & ''; + folders = folders & ''; i=i+1; } - + xmlContent = xmlContent & '' & folders & ''; - + - - + + - + - - + i=1; @@ -268,23 +279,23 @@ while( i lte qDir.recordCount ) { if( not compareNoCase( qDir.type[i], "DIR" ) and not listFind(".,..", qDir.name[i]) ) { - folders = folders & ''; + folders = folders & ''; } else if( not compareNoCase( qDir.type[i], "FILE" ) ) { fileSizeKB = round(qDir.size[i] / 1024); - files = files & ''; + files = files & ''; } i=i+1; } - + xmlContent = xmlContent & '' & folders & ''; xmlContent = xmlContent & '' & files & ''; - + - - + + - + - + newFolderName = url.newFolderName; @@ -298,7 +309,7 @@ } - + - + @@ -307,5 +318,5 @@ - + - @@ -323,19 +334,19 @@ - + '> - + - - + + - + - + - - + + - + Index: /FCKeditor/branches/developers/alfonsoml/editor/filemanager/browser/default/connectors/lasso/config.lasso =================================================================== --- /FCKeditor/branches/developers/alfonsoml/editor/filemanager/browser/default/connectors/lasso/config.lasso (revision 140) +++ /FCKeditor/branches/developers/alfonsoml/editor/filemanager/browser/default/connectors/lasso/config.lasso (revision 141) @@ -1,16 +1,32 @@ [//lasso -/* @Packager.Header - - Configuration file for the File Manager Connector for Lasso. - - -*/ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * Configuration file for the File Manager Connector for Lasso. + */ - /*..................................................................... + /*..................................................................... The connector uses the file tags, which require authentication. Enter a valid username and password from Lasso admin for a group with file tags - permissions for uploads and the path you define in UserFilesPath below. - */ - + permissions for uploads and the path you define in UserFilesPath below. + */ + var('connection') = array( -username='xxxxxxxx', @@ -19,13 +35,13 @@ - /*..................................................................... + /*..................................................................... Set the base path for files that users can upload and browse (relative to server root). - - Set which file extensions are allowed and/or denied for each file type. - */ + + Set which file extensions are allowed and/or denied for each file type. + */ var('config') = map( 'Enabled' = true, - 'UserFilesPath' = '/UserFiles/', + 'UserFilesPath' = '/userfiles/', 'Subdirectories' = map( 'File' = 'File/', @@ -41,5 +57,5 @@ ), 'DeniedExtensions' = map( - 'File' = array('php','php2','php3','php4','php5','phtml','pwml','inc','asp','aspx','ascx','jsp','cfm','cfc','pl','bat','exe','com','dll','vbs','js','reg','cgi','lasso','lassoapp','htaccess'), + 'File' = array('html','htm','php','php2','php3','php4','php5','phtml','pwml','inc','asp','aspx','ascx','jsp','cfm','cfc','pl','bat','exe','com','dll','vbs','js','reg','cgi','lasso','lassoapp','htaccess','asis'), 'Image' = array(), 'Flash' = array(), Index: /FCKeditor/branches/developers/alfonsoml/editor/filemanager/browser/default/connectors/lasso/connector.lasso =================================================================== --- /FCKeditor/branches/developers/alfonsoml/editor/filemanager/browser/default/connectors/lasso/connector.lasso (revision 140) +++ /FCKeditor/branches/developers/alfonsoml/editor/filemanager/browser/default/connectors/lasso/connector.lasso (revision 141) @@ -1,25 +1,41 @@ [//lasso -/* @Packager.Header - - This is the File Manager Connector for Lasso. - - -*/ - - /*..................................................................... - Include global configuration. See config.lasso for details. - */ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * This is the File Manager Connector for Lasso. + */ + + /*..................................................................... + Include global configuration. See config.lasso for details. + */ include('config.lasso'); - - /*..................................................................... - Translate current date/time to GMT for custom header. - */ + + /*..................................................................... + Translate current date/time to GMT for custom header. + */ var('headerDate') = date_localtogmt(date)->format('%a, %d %b %Y %T GMT'); - /*..................................................................... - Convert query string parameters to variables and initialize output. - */ + /*..................................................................... + Convert query string parameters to variables and initialize output. + */ var( 'Command' = action_param('Command'), @@ -41,10 +57,10 @@ - /*..................................................................... - Calculate the path to the current folder. - */ + /*..................................................................... + Calculate the path to the current folder. + */ $ServerPath == '' ? $ServerPath = $config->find('UserFilesPath'); - - var('currentFolderURL' = $ServerPath + + var('currentFolderURL' = $ServerPath + $config->find('Subdirectories')->find(action_param('Type')) + action_param('CurrentFolder') @@ -52,27 +68,27 @@ - /*..................................................................... + /*..................................................................... Build the appropriate response per the 'Command' parameter. Wrap the - entire process in an inline for file tag permissions. - */ + entire process in an inline for file tag permissions. + */ inline($connection); - select($Command); - /*............................................................. - List all subdirectories in the 'Current Folder' directory. - */ + select($Command); + /*............................................................. + List all subdirectories in the 'Current Folder' directory. + */ case('GetFolders'); $commandData += '\t\n'; - + iterate(file_listdirectory($currentFolderURL), local('this')); #this->endswith('/') ? $commandData += '\t\t\n'; /iterate; - + $commandData += '\t\n'; - /*............................................................. + /*............................................................. List both files and folders in the 'Current Folder' directory. - Include the file sizes in kilobytes. - */ + Include the file sizes in kilobytes. + */ case('GetFoldersAndFiles'); iterate(file_listdirectory($currentFolderURL), local('this')); @@ -82,24 +98,24 @@ local('size') = file_getsize($currentFolderURL + #this) / 1024; $files += '\t\t\n'; - /if; + /if; /iterate; $folders += '\t\n'; $files += '\t\n'; - + $commandData += $folders + $files; - /*............................................................. - Create a directory 'NewFolderName' within the 'Current Folder.' - */ + /*............................................................. + Create a directory 'NewFolderName' within the 'Current Folder.' + */ case('CreateFolder'); - var('newFolder' = $currentFolderURL + $NewFolderName + '/'); - file_create($newFolder); - - - /*......................................................... - Map Lasso's file error codes to FCKEditor's error codes. - */ + var('newFolder' = $currentFolderURL + $NewFolderName + '/'); + file_create($newFolder); + + + /*......................................................... + Map Lasso's file error codes to FCKEditor's error codes. + */ select(file_currenterror( -errorcode)); case(0); @@ -116,60 +132,60 @@ $errorNumber = 110; /select; - + $commandData += '\n'; - /*............................................................. - Process an uploaded file. - */ - case('FileUpload'); - /*......................................................... - This is the only command that returns an HTML response. - */ + /*............................................................. + Process an uploaded file. + */ + case('FileUpload'); + /*......................................................... + This is the only command that returns an HTML response. + */ $responseType = 'html'; - - - /*......................................................... - Was a file actually uploaded? - */ + + + /*......................................................... + Was a file actually uploaded? + */ file_uploads->size ? $NewFile = file_uploads->get(1) | $uploadResult = '202'; - + if($uploadResult == '0'); - /*..................................................... + /*..................................................... Split the file's extension from the filename in order to follow the API's naming convention for duplicate - files. (Test.txt, Test(1).txt, Test(2).txt, etc.) - */ - $NewFileName = $NewFile->find('OrigName'); + files. (Test.txt, Test(1).txt, Test(2).txt, etc.) + */ + $NewFileName = $NewFile->find('OrigName'); $OrigFilePath = $currentFolderURL + $NewFileName; $NewFilePath = $OrigFilePath; - local('fileExtension') = '.' + $NewFile->find('OrigExtension'); + local('fileExtension') = '.' + $NewFile->find('OrigExtension'); local('shortFileName') = $NewFileName->removetrailing(#fileExtension)&; - /*..................................................... - Make sure the file extension is allowed. - */ + /*..................................................... + Make sure the file extension is allowed. + */ if($config->find('DeniedExtensions')->find($Type) >> $NewFile->find('OrigExtension')); $uploadResult = '202'; else; - /*................................................. - Rename the target path until it is unique. - */ + /*................................................. + Rename the target path until it is unique. + */ while(file_exists($NewFilePath)); $NewFilePath = $currentFolderURL + #shortFileName + '(' + loop_count + ')' + #fileExtension; /while; - - - /*................................................. - Copy the uploaded file to its final location. - */ + + + /*................................................. + Copy the uploaded file to its final location. + */ file_copy($NewFile->find('path'), $NewFilePath); - /*................................................. + /*................................................. Set the error code for the response. Note whether - the file had to be renamed. - */ + the file had to be renamed. + */ select(file_currenterror( -errorcode)); case(0); @@ -182,7 +198,7 @@ - /*......................................................... - Set the HTML response. - */ + /*......................................................... + Set the HTML response. + */ $__html_reply__ = '\ @@ -17,5 +32,5 @@ { oConnector.ResourceType = resourceType ; - oConnector.CurrentFolder = folderPath + oConnector.CurrentFolder = folderPath ; } @@ -23,9 +38,9 @@ { var sFolderName ; - - while ( true ) + + while ( true ) { sFolderName = prompt( 'Type the name of the new folder:', '' ) ; - + if ( sFolderName == null ) return ; @@ -35,5 +50,5 @@ break ; } - + oConnector.SendCommand( 'CreateFolder', 'NewFolderName=' + encodeURIComponent( sFolderName) , CreateFolderCallBack ) ; } @@ -43,10 +58,10 @@ if ( oConnector.CheckError( fckXml ) == 0 ) window.parent.frames['frmResourcesList'].Refresh() ; - + /* // Get the current folder path. var oNode = fckXml.SelectSingleNode( 'Connector/Error' ) ; var iErrorNumber = parseInt( oNode.attributes.getNamedItem('number').value ) ; - + switch ( iErrorNumber ) { Index: /FCKeditor/branches/developers/alfonsoml/editor/filemanager/browser/default/frmfolders.html =================================================================== --- /FCKeditor/branches/developers/alfonsoml/editor/filemanager/browser/default/frmfolders.html (revision 140) +++ /FCKeditor/branches/developers/alfonsoml/editor/filemanager/browser/default/frmfolders.html (revision 141) @@ -1,13 +1,28 @@ - - - @@ -26,5 +41,5 @@ this.UpRow = document.getElementById('trUp') ; - this.TableRows = new Object() ; + this.TableRows = new Object() ; } @@ -57,5 +72,5 @@ oCell.noWrap = true ; oCell.innerHTML = ' ' + sLink + folderName + '' ; - + this.TableRows[ folderPath ] = oRow ; } @@ -64,5 +79,5 @@ { this.UpRow.style.display = ( upFolderPath != null ? '' : 'none' ) ; - + if ( upFolderPath != null ) { @@ -77,6 +92,6 @@ function CheckLoaded() { - if ( window.top.IsLoadedActualFolder - && window.top.IsLoadedCreateFolder + if ( window.top.IsLoadedActualFolder + && window.top.IsLoadedCreateFolder && window.top.IsLoadedUpload && window.top.IsLoadedResourcesList ) @@ -102,5 +117,5 @@ for ( var sFolderPath in oListManager.TableRows ) { - oListManager.TableRows[ sFolderPath ].className = + oListManager.TableRows[ sFolderPath ].className = ( sFolderPath == folderPath ? 'FolderListCurrentFolder' : 'FolderListFolder' ) ; } @@ -110,5 +125,5 @@ window.parent.frames['frmCreateFolder'].SetCurrentFolder( oConnector.ResourceType, folderPath ) ; window.parent.frames['frmUpload'].SetCurrentFolder( oConnector.ResourceType, folderPath ) ; - + // Load the resources list for this folder. window.parent.frames['frmResourcesList'].LoadResources( oConnector.ResourceType, folderPath ) ; @@ -127,9 +142,9 @@ // Show/Hide the Up Folder. oListManager.ShowUpFolder( sParentFolderPath ) ; - + if ( folderPath != '/' ) { sActiveFolder = folderPath ; - oConnector.CurrentFolder = sParentFolderPath + oConnector.CurrentFolder = sParentFolderPath ; oConnector.SendCommand( 'GetFolders', null, GetFoldersCallBack ) ; } @@ -142,11 +157,11 @@ if ( oConnector.CheckError( fckXml ) != 0 ) return ; - + // Get the current folder path. var oNode = fckXml.SelectSingleNode( 'Connector/CurrentFolder' ) ; var sCurrentFolderPath = oNode.attributes.getNamedItem('path').value ; - + var oNodes = fckXml.SelectNodes( 'Connector/Folders/Folder' ) ; - + for ( var i = 0 ; i < oNodes.length ; i++ ) { @@ -154,5 +169,5 @@ oListManager.AddItem( sFolderName, sCurrentFolderPath + sFolderName + "/" ) ; } - + OpenFolder( sActiveFolder ) ; } Index: /FCKeditor/branches/developers/alfonsoml/editor/filemanager/browser/default/frmresourceslist.html =================================================================== --- /FCKeditor/branches/developers/alfonsoml/editor/filemanager/browser/default/frmresourceslist.html (revision 140) +++ /FCKeditor/branches/developers/alfonsoml/editor/filemanager/browser/default/frmresourceslist.html (revision 141) @@ -1,8 +1,24 @@ - @@ -29,6 +45,6 @@ '' + '' ; @@ -45,12 +61,12 @@ return '' + '' ; @@ -89,12 +105,12 @@ // Get the current folder path. - var oNode = fckXml.SelectSingleNode( 'Connector/CurrentFolder' ) ; - if ( oNode == null ) + var oFolderNode = fckXml.SelectSingleNode( 'Connector/CurrentFolder' ) ; + if ( oFolderNode == null ) { alert( 'The server didn\'t reply with a proper XML file\r\nCheck your configuration.' ) ; return ; } - var sCurrentFolderPath = oNode.attributes.getNamedItem('path').value ; - var sCurrentFolderUrl = oNode.attributes.getNamedItem('url').value ; + var sCurrentFolderPath = oFolderNode.attributes.getNamedItem('path').value ; + var sCurrentFolderUrl = oFolderNode.attributes.getNamedItem('url').value ; // var dTimer = new Date() ; @@ -102,6 +118,7 @@ var oHtml = new StringBuilder( '

' + - sLink + - folderName + + sLink + + folderName + '' + '
' + - sLink + + sLink + '' + '	' + - sLink + - fileName + + sLink + + fileName + '' + '	' + - fileSize + + fileSize + ' KB' + '

' ) ; - // Add the Folders. - var oNodes = fckXml.SelectNodes( 'Connector/Folders/Folder' ) ; + // Add the Folders. + var oNodes ; + oNodes = fckXml.SelectNodes( 'Connector/Folders/Folder' ) ; for ( var i = 0 ; i < oNodes.length ; i++ ) { @@ -110,21 +127,21 @@ } - // Add the Files. - var oNodes = fckXml.SelectNodes( 'Connector/Files/File' ) ; - for ( var i = 0 ; i < oNodes.length ; i++ ) + // Add the Files. + oNodes = fckXml.SelectNodes( 'Connector/Files/File' ) ; + for ( var j = 0 ; j < oNodes.length ; j++ ) { - var oNode = oNodes[i] ; + var oNode = oNodes[j] ; var sFileName = oNode.attributes.getNamedItem('name').value ; var sFileSize = oNode.attributes.getNamedItem('size').value ; // Get the optional "url" attribute. If not available, build the url. - var oFileUrlAtt = oNodes[i].attributes.getNamedItem('url') ; + var oFileUrlAtt = oNodes[j].attributes.getNamedItem('url') ; var sFileUrl = oFileUrlAtt != null ? oFileUrlAtt.value : sCurrentFolderUrl + sFileName ; - + oHtml.Append( oListManager.GetFileRowHtml( sFileName, sFileUrl, sFileSize ) ) ; } oHtml.Append( '<\/table>' ) ; - + document.body.innerHTML = oHtml.ToString() ; Index: /FCKeditor/branches/developers/alfonsoml/editor/filemanager/browser/default/frmresourcetype.html =================================================================== --- /FCKeditor/branches/developers/alfonsoml/editor/filemanager/browser/default/frmresourcetype.html (revision 140) +++ /FCKeditor/branches/developers/alfonsoml/editor/filemanager/browser/default/frmresourcetype.html (revision 141) @@ -1,13 +1,28 @@ - - - Index: /FCKeditor/branches/developers/alfonsoml/editor/filemanager/browser/default/frmupload.html =================================================================== --- /FCKeditor/branches/developers/alfonsoml/editor/filemanager/browser/default/frmupload.html (revision 140) +++ /FCKeditor/branches/developers/alfonsoml/editor/filemanager/browser/default/frmupload.html (revision 141) @@ -1,8 +1,24 @@ - @@ -17,5 +33,5 @@ sUrl += '&Type=' + resourceType ; sUrl += '&CurrentFolder=' + encodeURIComponent( folderPath ) ; - + document.getElementById('frmUpload').action = sUrl ; } @@ -32,5 +48,5 @@ document.getElementById('eUploadMessage').innerHTML = 'Upload a new file in this folder (Upload in progress, please wait...)' ; document.getElementById('btnUpload').disabled = true ; - + return true ; } @@ -40,5 +56,5 @@ // Reset the Upload Worker Frame. window.parent.frames['frmUploadWorker'].location = 'javascript:void(0)' ; - + // Reset the upload form (On IE we must do a little trick to avout problems). if ( document.all ) @@ -46,9 +62,9 @@ else document.getElementById('frmUpload').reset() ; - + // Reset the interface elements. document.getElementById('eUploadMessage').innerHTML = 'Upload a new file in this folder' ; document.getElementById('btnUpload').disabled = false ; - + switch ( errorNumber ) { Index: /FCKeditor/branches/developers/alfonsoml/editor/filemanager/browser/default/js/common.js =================================================================== --- /FCKeditor/branches/developers/alfonsoml/editor/filemanager/browser/default/js/common.js (revision 140) +++ /FCKeditor/branches/developers/alfonsoml/editor/filemanager/browser/default/js/common.js (revision 141) @@ -1,9 +1,25 @@ -/* @Packager.Header - - Common objects and functions shared by all pages that compose the - File Browser dialog window. - - -*/ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * Common objects and functions shared by all pages that compose the + * File Browser dialog window. + */ function AddSelectOption( selectElement, optionText, optionValue ) @@ -12,5 +28,5 @@ oOption.text = optionText ; - oOption.value = optionValue ; + oOption.value = optionValue ; selectElement.options.add(oOption) ; Index: /FCKeditor/branches/developers/alfonsoml/editor/filemanager/browser/default/js/fckxml.js =================================================================== --- /FCKeditor/branches/developers/alfonsoml/editor/filemanager/browser/default/js/fckxml.js (revision 140) +++ /FCKeditor/branches/developers/alfonsoml/editor/filemanager/browser/default/js/fckxml.js (revision 141) @@ -1,11 +1,28 @@ -/* @Packager.Header - - Defines the FCKXml object that is used for XML data calls - and XML processing. - This script is shared by almost all pages that compose the - File Browser frameset. - - -*/ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * Defines the FCKXml object that is used for XML data calls + * and XML processing. + * + * This script is shared by almost all pages that compose the + * File Browser frameset. + */ var FCKXml = function() @@ -19,5 +36,5 @@ // IE6 - try { return new ActiveXObject( 'Msxml2.XMLHTTP' ) ; } + try { return new ActiveXObject( 'Msxml2.XMLHTTP' ) ; } catch(e) {} @@ -36,10 +53,10 @@ var oXmlHttp = this.GetHttpRequest() ; - + oXmlHttp.open( "GET", urlToCall, bAsync ) ; if ( bAsync ) - { - oXmlHttp.onreadystatechange = function() + { + oXmlHttp.onreadystatechange = function() { if ( oXmlHttp.readyState == 4 ) @@ -60,7 +77,7 @@ } } - + oXmlHttp.send( null ) ; - + if ( ! bAsync ) { @@ -82,7 +99,7 @@ var aNodeArray = new Array(); - var xPathResult = this.DOMDocument.evaluate( xpath, this.DOMDocument, + var xPathResult = this.DOMDocument.evaluate( xpath, this.DOMDocument, this.DOMDocument.createNSResolver(this.DOMDocument.documentElement), XPathResult.ORDERED_NODE_ITERATOR_TYPE, null) ; - if ( xPathResult ) + if ( xPathResult ) { var oNode = xPathResult.iterateNext() ; @@ -92,10 +109,10 @@ oNode = xPathResult.iterateNext(); } - } + } return aNodeArray ; } } -FCKXml.prototype.SelectSingleNode = function( xpath ) +FCKXml.prototype.SelectSingleNode = function( xpath ) { if ( navigator.userAgent.indexOf('MSIE') >= 0 ) // IE @@ -108,5 +125,5 @@ if ( xPathResult && xPathResult.singleNodeValue ) return xPathResult.singleNodeValue ; - else + else return null ; } Index: /FCKeditor/branches/developers/alfonsoml/editor/filemanager/upload/asp/class_upload.asp =================================================================== --- /FCKeditor/branches/developers/alfonsoml/editor/filemanager/upload/asp/class_upload.asp (revision 140) +++ /FCKeditor/branches/developers/alfonsoml/editor/filemanager/upload/asp/class_upload.asp (revision 141) @@ -1,8 +1,24 @@ - <% @@ -35,14 +51,14 @@ Private oSourceData Private nMaxSize, nErr, sAllowed, sDenied - + Private Sub Class_Initialize nErr = 0 nMaxSize = 1048576 - + Set File = Server.CreateObject("Scripting.Dictionary") File.CompareMode = 1 Set Form = Server.CreateObject("Scripting.Dictionary") Form.CompareMode = 1 - + Set oSourceData = Server.CreateObject("ADODB.Stream") oSourceData.Type = 1 @@ -50,5 +66,5 @@ oSourceData.Open End Sub - + Private Sub Class_Terminate Form.RemoveAll @@ -56,9 +72,9 @@ File.RemoveAll Set File = Nothing - + oSourceData.Close Set oSourceData = Nothing End Sub - + Public Property Get Version Version = "NetRube Upload Class Version 1.0 Build 20041218" @@ -68,13 +84,13 @@ ErrNum = nErr End Property - + Public Property Let MaxSize(nSize) nMaxSize = nSize End Property - + Public Property Let Allowed(sExt) sAllowed = sExt End Property - + Public Property Let Denied(sExt) sDenied = sExt @@ -88,5 +104,5 @@ Exit Sub End If - + Dim nTotalSize nTotalSize = Request.TotalBytes @@ -99,10 +115,10 @@ Exit Sub End If - + oSourceData.Write Request.BinaryRead(nTotalSize) oSourceData.Position = 0 - + Dim oTotalData, oFormStream, sFormHeader, sFormName, bCrLf, nBoundLen, nFormStart, nFormEnd, nPosStart, nPosEnd, sBoundary - + oTotalData = oSourceData.Read bCrLf = ChrB(13) & ChrB(10) @@ -110,10 +126,10 @@ nBoundLen = LenB(sBoundary) + 2 nFormStart = nBoundLen - + Set oFormStream = Server.CreateObject("ADODB.Stream") - + Do While (nFormStart + 2) < nTotalSize nFormEnd = InStrB(nFormStart, oTotalData, bCrLf & bCrLf) + 3 - + With oFormStream .Type = 1 @@ -128,10 +144,10 @@ .Close End With - + nFormStart = InStrB(nFormEnd, oTotalData, sBoundary) - 1 nPosStart = InStr(22, sFormHeader, " name=", 1) + 7 nPosEnd = InStr(nPosStart, sFormHeader, """") sFormName = Mid(sFormHeader, nPosStart, nPosEnd - nPosStart) - + If InStr(45, sFormHeader, " filename=", 1) > 0 Then Set File(sFormName) = New NetRube_FileInfo @@ -161,8 +177,8 @@ End With End If - + nFormStart = nFormStart + nBoundLen Loop - + oTotalData = "" Set oFormStream = Nothing @@ -174,10 +190,10 @@ Exit Sub End If - + If Not IsAllowed(File(sItem).Ext) Then nErr = 4 Exit Sub End If - + Dim oFileStream Set oFileStream = Server.CreateObject("ADODB.Stream") @@ -194,5 +210,5 @@ Set oFileStream = Nothing End Sub - + Private Function IsAllowed(sExt) Dim oRE @@ -200,5 +216,5 @@ oRE.IgnoreCase = True oRE.Global = True - + If sDenied = "" Then oRE.Pattern = sAllowed @@ -208,5 +224,5 @@ IsAllowed = Not oRE.Test(sExt) End If - + Set oRE = Nothing End Function Index: /FCKeditor/branches/developers/alfonsoml/editor/filemanager/upload/asp/config.asp =================================================================== --- /FCKeditor/branches/developers/alfonsoml/editor/filemanager/upload/asp/config.asp (revision 140) +++ /FCKeditor/branches/developers/alfonsoml/editor/filemanager/upload/asp/config.asp (revision 141) @@ -1,17 +1,32 @@ - <% -' SECURITY: You must explicitelly enable this "uploader" (set it to "True"). +' SECURITY: You must explicitelly enable this "uploader" (set it to "True"). Dim ConfigIsEnabled ConfigIsEnabled = False -ConfigIsEnabled = True ' @Packager.RemoveLine -' Set if the file type must be considere in the target path. -' Ex: /UserFiles/Image/ or /UserFiles/File/ +' Set if the file type must be considere in the target path. +' Ex: /userfiles/image/ or /userfiles/file/ Dim ConfigUseFileType ConfigUseFileType = False @@ -19,5 +34,5 @@ ' Path to user files relative to the document root. Dim ConfigUserFilesPath -ConfigUserFilesPath = "/UserFiles/" +ConfigUserFilesPath = "/userfiles/" ' Allowed and Denied extensions configurations. @@ -27,5 +42,5 @@ ConfigAllowedExtensions.Add "File", "" -ConfigDeniedExtensions.Add "File", "php|php2|php3|php4|php5|phtml|pwml|inc|asp|aspx|ascx|jsp|cfm|cfc|pl|bat|exe|com|dll|vbs|js|reg|cgi" +ConfigDeniedExtensions.Add "File", "html|htm|php|php2|php3|php4|php5|phtml|pwml|inc|asp|aspx|ascx|jsp|cfm|cfc|pl|bat|exe|com|dll|vbs|js|reg|cgi|htaccess|asis" ConfigAllowedExtensions.Add "Image", "jpg|gif|jpeg|png|bmp" Index: /FCKeditor/branches/developers/alfonsoml/editor/filemanager/upload/asp/io.asp =================================================================== --- /FCKeditor/branches/developers/alfonsoml/editor/filemanager/upload/asp/io.asp (revision 140) +++ /FCKeditor/branches/developers/alfonsoml/editor/filemanager/upload/asp/io.asp (revision 141) @@ -1,7 +1,23 @@ - <% Index: /FCKeditor/branches/developers/alfonsoml/editor/filemanager/upload/asp/upload.asp =================================================================== --- /FCKeditor/branches/developers/alfonsoml/editor/filemanager/upload/asp/upload.asp (revision 140) +++ /FCKeditor/branches/developers/alfonsoml/editor/filemanager/upload/asp/upload.asp (revision 141) @@ -1,12 +1,28 @@ -<%@ CodePage=65001 Language="VBScript"%> +<%@ CodePage=65001 Language="VBScript"%> <% Option Explicit Response.Buffer = True %> - @@ -61,8 +77,8 @@ sServerDir = sServerDir & "\" End If - + If ( ConfigUseFileType = True ) Then sServerDir = sServerDir & resourceType & "\" - End If + End If Dim oFSO @@ -99,5 +115,5 @@ SendResults sErrorNumber, sFileUrl, sFileName, "" - + End If Index: /FCKeditor/branches/developers/alfonsoml/editor/filemanager/upload/aspx/upload.aspx =================================================================== --- /FCKeditor/branches/developers/alfonsoml/editor/filemanager/upload/aspx/upload.aspx (revision 140) +++ /FCKeditor/branches/developers/alfonsoml/editor/filemanager/upload/aspx/upload.aspx (revision 141) @@ -1,14 +1,30 @@ <%@ Page language="c#" Inherits="FredCK.FCKeditorV2.Uploader" AutoEventWireup="false" %> - +<%-- + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * This is the Uploader for ASP.NET. + * + * The code of this page if included in the FCKeditor.Net package, + * in the FredCK.FCKeditorV2.dll assemblyfile. So to use it you must + * include that DLL in your "bin" directory. + * + * To download the FCKeditor.Net package, go to our official web site: + * http://www.fckeditor.net +--%> Index: /FCKeditor/branches/developers/alfonsoml/editor/filemanager/upload/cfm/config.cfm =================================================================== --- /FCKeditor/branches/developers/alfonsoml/editor/filemanager/upload/cfm/config.cfm (revision 140) +++ /FCKeditor/branches/developers/alfonsoml/editor/filemanager/upload/cfm/config.cfm (revision 141) @@ -1,29 +1,45 @@ - config = StructNew(); - - // SECURITY: You must explicitelly enable this "uploader". + + // SECURITY: You must explicitelly enable this "uploader". config.enabled = false; - + // Path to uploaded files relative to the document root. - config.userFilesPath = "/UserFiles/"; - + config.userFilesPath = "/userfiles/"; + config.serverPath = ""; // use this to force the server path if FCKeditor is not running directly off the root of the application or the FCKeditor directory in the URL is a virtual directory or a symbolic link / junction - + config.allowedExtensions = StructNew(); config.deniedExtensions = StructNew(); - + config.allowedExtensions["File"] = ""; - config.deniedExtensions["File"] = "php,php2,php3,php4,php5,phtml,pwml,inc,asp,aspx,ascx,jsp,cfm,cfc,pl,bat,exe,com,dll,vbs,js,reg,cgi"; - + config.deniedExtensions["File"] = "html,htm,php,php2,php3,php4,php5,phtml,pwml,inc,asp,aspx,ascx,jsp,cfm,cfc,pl,bat,exe,com,dll,vbs,js,reg,cgi,htaccess,asis"; + config.allowedExtensions["Image"] = "png,gif,jpg,jpeg,bmp"; config.deniedExtensions["Image"] = ""; - + config.allowedExtensions["Flash"] = "swf,fla"; config.deniedExtensions["Flash"] = ""; @@ -38,9 +54,9 @@ - + - + Index: /FCKeditor/branches/developers/alfonsoml/editor/filemanager/upload/cfm/upload.cfm =================================================================== --- /FCKeditor/branches/developers/alfonsoml/editor/filemanager/upload/cfm/upload.cfm (revision 140) +++ /FCKeditor/branches/developers/alfonsoml/editor/filemanager/upload/cfm/upload.cfm (revision 141) @@ -1,8 +1,24 @@ - @@ -16,8 +32,8 @@ - + @@ -30,10 +46,10 @@ - + userFilesPath = config.userFilesPath; lAllowedExtensions = config.allowedExtensions[url.type]; lDeniedExtensions = config.deniedExtensions[url.type]; customMsg = ''; // Can be overwritten. The last value will be sent with the result - + // make sure the user files path is correctly formatted userFilesPath = replace(userFilesPath, "\", "/", "ALL"); @@ -45,5 +61,5 @@ userFilesPath = "/" & userFilesPath; } - + if (find("/",getBaseTemplatePath())) { fs = "/"; @@ -51,7 +67,7 @@ fs = "\"; } - + // Get the base physical path to the web root for this application. The code to determine the path automatically assumes that - // the "FCKeditor" directory in the http request path is directly off the web root for the application and that it's not a + // the "FCKeditor" directory in the http request path is directly off the web root for the application and that it's not a // virtual directory or a symbolic link / junction. Use the serverPath config setting to force a physical path if necessary. if ( len(config.serverPath) ) { @@ -60,19 +76,19 @@ serverPath = replaceNoCase(getBaseTemplatePath(),replace(cgi.script_name,"/",fs,"all"),""); } - + // map the user files path to a physical directory userFilesServerPath = serverPath & replace(userFilesPath,"/",fs,"all"); - + - + - + - + - + - + - + - + - + errorNumber = 0; fileName = cffile.ClientFileName; fileExt = cffile.ServerFileExt; - + // munge filename for html download. Only a-z, 0-9, _, - and . are allowed if( reFind("[^A-Za-z0-9_\-\.]", fileName) ) { @@ -104,5 +120,5 @@ fileName = reReplace(fileName, "$_([^_]+)$", "\1", "ALL"); } - + // When the original filename already exists, add numbers (0), (1), (2), ... at the end of the filename. if( compare( cffile.ServerFileName, fileName ) ) { @@ -115,8 +131,8 @@ } - + - + - - - + + + - + - + - + - + - + Index: /FCKeditor/branches/developers/alfonsoml/editor/filemanager/upload/lasso/config.lasso =================================================================== --- /FCKeditor/branches/developers/alfonsoml/editor/filemanager/upload/lasso/config.lasso (revision 140) +++ /FCKeditor/branches/developers/alfonsoml/editor/filemanager/upload/lasso/config.lasso (revision 141) @@ -1,26 +1,32 @@ [//lasso /* - * FCKeditor - The text editor for internet - * Copyright (C) 2003-2006 Frederico Caldeira Knabben - * - * Licensed under the terms of the GNU Lesser General Public License: - * http://www.opensource.org/licenses/lgpl-license.php - * - * For further information visit: - * http://www.fckeditor.net/ - * - * File Name: config.php - * Configuration file for the Lasso File Uploader. - * - * File Authors: - * Jason Huck (jason.huck@corefive.com) + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * Configuration file for the Lasso File Uploader. */ - /*..................................................................... + /*..................................................................... The connector uses the file tags, which require authentication. Enter a valid username and password from Lasso admin for a group with file tags - permissions for uploads and the path you define in UserFilesPath below. - */ - + permissions for uploads and the path you define in UserFilesPath below. + */ + var('connection') = array( -username='xxxxxxxx', @@ -29,13 +35,13 @@ - /*..................................................................... + /*..................................................................... Set the base path for files that users can upload and browse (relative to server root). - - Set which file extensions are allowed and/or denied for each file type. - */ + + Set which file extensions are allowed and/or denied for each file type. + */ var('config') = map( 'Enabled' = false, - 'UserFilesPath' = '/UserFiles/', + 'UserFilesPath' = '/userfiles/', 'Subdirectories' = map( 'File' = 'File/', @@ -51,5 +57,5 @@ ), 'DeniedExtensions' = map( - 'File' = array('php','php2','php3','php4','php5','phtml','pwml','inc','asp','aspx','ascx','jsp','cfm','cfc','pl','bat','exe','com','dll','vbs','js','reg','cgi','lasso','lassoapp'), + 'File' = array('html','htm','php','php2','php3','php4','php5','phtml','pwml','inc','asp','aspx','ascx','jsp','cfm','cfc','pl','bat','exe','com','dll','vbs','js','reg','cgi','lasso','lassoapp','htaccess','asis'), 'Image' = array(), 'Flash' = array(), Index: /FCKeditor/branches/developers/alfonsoml/editor/filemanager/upload/lasso/upload.lasso =================================================================== --- /FCKeditor/branches/developers/alfonsoml/editor/filemanager/upload/lasso/upload.lasso (revision 140) +++ /FCKeditor/branches/developers/alfonsoml/editor/filemanager/upload/lasso/upload.lasso (revision 141) @@ -1,30 +1,35 @@ [//lasso /* - * FCKeditor - The text editor for internet - * Copyright (C) 2003-2006 Frederico Caldeira Knabben - * - * Licensed under the terms of the GNU Lesser General Public License: - * http://www.opensource.org/licenses/lgpl-license.php - * - * For further information visit: - * http://www.fckeditor.net/ - * - * File Name: upload.php - * This is the "File Uploader" for Lasso. - * - * File Authors: - * Jason Huck (jason.huck@corefive.com) + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * This is the "File Uploader" for Lasso. */ - - /*..................................................................... - Include global configuration. See config.lasso for details. - */ + /*..................................................................... + Include global configuration. See config.lasso for details. + */ include('config.lasso'); - /*..................................................................... - Convert query string parameters to variables and initialize output. - */ + /*..................................................................... + Convert query string parameters to variables and initialize output. + */ var( 'Type' = action_param('Type'), @@ -42,10 +47,10 @@ - /*..................................................................... - Calculate the path to the current folder. - */ + /*..................................................................... + Calculate the path to the current folder. + */ $ServerPath == '' ? $ServerPath = $config->find('UserFilesPath'); - - var('currentFolderURL' = $ServerPath + + var('currentFolderURL' = $ServerPath + $config->find('Subdirectories')->find(action_param('Type')) + action_param('CurrentFolder') @@ -53,8 +58,8 @@ - /*..................................................................... - Custom tag sets the HTML response. + /*..................................................................... + Custom tag sets the HTML response. */ - + define_tag( 'sendresults', @@ -73,7 +78,7 @@ $__html_reply__ = '\ @@ -83,51 +88,51 @@ if($config->find('Enabled')); - /*................................................................. - Process an uploaded file. - */ + /*................................................................. + Process an uploaded file. + */ inline($connection); - /*............................................................. - Was a file actually uploaded? - */ + /*............................................................. + Was a file actually uploaded? + */ file_uploads->size ? $NewFile = file_uploads->get(1) | $errorNumber = 202; - + if($errorNumber == 0); - /*......................................................... + /*......................................................... Split the file's extension from the filename in order to follow the API's naming convention for duplicate - files. (Test.txt, Test(1).txt, Test(2).txt, etc.) - */ - $NewFileName = $NewFile->find('OrigName'); + files. (Test.txt, Test(1).txt, Test(2).txt, etc.) + */ + $NewFileName = $NewFile->find('OrigName'); $OrigFilePath = $currentFolderURL + $NewFileName; $NewFilePath = $OrigFilePath; - local('fileExtension') = '.' + $NewFile->find('OrigExtension'); + local('fileExtension') = '.' + $NewFile->find('OrigExtension'); local('shortFileName') = $NewFileName->removetrailing(#fileExtension)&; - - - /*......................................................... - Make sure the file extension is allowed. - */ - + + + /*......................................................... + Make sure the file extension is allowed. + */ + if($config->find('DeniedExtensions')->find($Type) >> $NewFile->find('OrigExtension')); $errorNumber = 202; else; - /*..................................................... - Rename the target path until it is unique. - */ + /*..................................................... + Rename the target path until it is unique. + */ while(file_exists($NewFilePath)); $NewFileName = #shortFileName + '(' + loop_count + ')' + #fileExtension; $NewFilePath = $currentFolderURL + $NewFileName; /while; - - - /*..................................................... - Copy the uploaded file to its final location. - */ + + + /*..................................................... + Copy the uploaded file to its final location. + */ file_copy($NewFile->find('path'), $NewFilePath); - - - /*..................................................... - Set the error code for the response. - */ + + + /*..................................................... + Set the error code for the response. + */ select(file_currenterror( -errorcode)); case(0); @@ -143,5 +148,5 @@ $customMsg = 'This file uploader is disabled. Please check the "editor/filemanager/upload/lasso/config.lasso" file.'; /if; - + fck_sendresults( -errorNumber=$errorNumber, @@ -150,3 +155,3 @@ -customMsg=$customMsg ); -] +] Index: /FCKeditor/branches/developers/alfonsoml/editor/filemanager/upload/php/config.php =================================================================== --- /FCKeditor/branches/developers/alfonsoml/editor/filemanager/upload/php/config.php (revision 140) +++ /FCKeditor/branches/developers/alfonsoml/editor/filemanager/upload/php/config.php (revision 141) @@ -1,25 +1,41 @@ - - Configuration file for the PHP File Uploader. - - -*/ + - This is the "File Uploader" for PHP. - - -*/ + 0 ) $sServerDir = $Config['UserFilesAbsolutePath'] ; -else +else $sServerDir = GetRootPath() . $Config["UserFilesPath"] ; @@ -94,5 +111,5 @@ umask( $oldumask ) ; } - + if ( $Config['UseFileType'] ) $sFileUrl = $Config["UserFilesPath"] . $sType . '/' . $sFileName ; Index: /FCKeditor/branches/developers/alfonsoml/editor/filemanager/upload/php/util.php =================================================================== --- /FCKeditor/branches/developers/alfonsoml/editor/filemanager/upload/php/util.php (revision 140) +++ /FCKeditor/branches/developers/alfonsoml/editor/filemanager/upload/php/util.php (revision 141) @@ -1,8 +1,25 @@ - - This is the File Manager Connector for ASP. - - -*/ + FCKeditor - Uploaders Tests -

FCKeditor - ColdFusion - Sample 1

FCKeditor - Test 009

+ FCKeditor - Test 009

- Version 2.3.3 (SVN)

+ Version 2.4

+ Version 2.3.3

Version 2.3.2