|
+ wmode="transparent" + |
+
+
+ wmode="opaque" + + |
+
+ wmode="window" + + |
+
+ no wmode + + |
+
. */ - _ApplyBlockStyle : function( range, selectIt ) + _ApplyBlockStyle : function( range, selectIt, updateRange ) { // Bookmark the range so we can re-select it after processing. @@ -769,4 +773,43 @@ // Move everything from the current node to the new one. FCKDomTools.MoveChildren( block, newBlock ) ; + + // If we're in a non-IE browser, and the newBlock is, and the old block is not, + // then we need to clear linebreaks and compress ANSI whitespaces so that we don't get disrupted + // output inmode. (Bug #1355) + if ( !FCKBrowserInfo.IsIE && newBlock.nodeName.IEquals( 'pre' ) && !block.nodeName.IEquals( 'pre' ) ) + { + // If the newBlock's first child is a text node, left-trim it since any ANSI whitespace + // after a non-pre block is meaningless. + if ( newBlock.firstChild && newBlock.firstChild.nodeType == 3 ) + newBlock.firstChild.nodeValue = newBlock.firstChild.nodeValue.LTrim() ; + + // Ditto for the last child. + if ( newBlock.lastChild && newBlock.lastChild.nodeType == 3 ) + newBlock.lastChild.nodeValue = newBlock.lastChild.nodeValue.RTrim() ; + + // DFS walk the newBlock to compress ANSI whitespaces and delete excessive linebreaks. + var currentNode = newBlock ; + while ( currentNode ) + { + currentNode = FCKDomTools.GetNextSourceNode( currentNode, false, 3, newBlock.parentNode ) ; + if ( currentNode ) + { + // If the text node ends with a line break, and its next sibling is a
, + // then right-trim the text node. + if ( currentNode.nodeValue.charAt( currentNode.nodeValue.length - 1 ) == '\n' + && currentNode.nextSibling + && currentNode.nextSibling.nodeName.IEquals( 'br' ) ) + currentNode.nodeValue = currentNode.nodeValue.RTrim() ; + // If the text node begins with a line break, and its next sibling is a
, + // then left-trim the text node. + if ( currentNode.nodeValue.charAt( 0 ) == '\n' + && currentNode.previousSibling + && currentNode.previousSibling.nodeName.IEquals( 'br' ) ) + currentNode.nodeValue = currentNode.nodeValue.LTrim() ; + // Compress any ANSI whitespaces left. + currentNode.nodeValue = currentNode.nodeValue.replace( /[\r\n\t ]+/g, ' ' ) ; + } + } + } // Delete the current node. @@ -777,4 +820,7 @@ if ( selectIt ) range.SelectBookmark( bookmark ) ; + + if ( updateRange ) + range.MoveToBookmark( range ) ; }, @@ -789,5 +835,5 @@ * XYZ */ - _ApplyInlineStyle : function( range, selectIt ) + _ApplyInlineStyle : function( range, selectIt, updateRange ) { var doc = range.Window.document ; @@ -970,4 +1016,7 @@ if ( selectIt ) range.SelectBookmark( bookmark ) ; + + if ( updateRange ) + range.MoveToBookmark( bookmark ) ; }, Index: /FCKeditor/trunk/editor/_source/commandclasses/fck_othercommands.js =================================================================== --- /FCKeditor/trunk/editor/_source/commandclasses/fck_othercommands.js (revision 1397) +++ /FCKeditor/trunk/editor/_source/commandclasses/fck_othercommands.js (revision 1398) @@ -24,5 +24,5 @@ // ### General Dialog Box Commands. -var FCKDialogCommand = function( name, title, url, width, height, getStateFunction, getStateParam ) +var FCKDialogCommand = function( name, title, url, width, height, getStateFunction, getStateParam, customValue ) { this.Name = name ; @@ -31,4 +31,5 @@ this.Width = width ; this.Height = height ; + this.CustomValue = customValue ; this.GetStateFunction = getStateFunction ; @@ -40,5 +41,5 @@ FCKDialogCommand.prototype.Execute = function() { - FCKDialog.OpenDialog( 'FCKDialog_' + this.Name , this.Title, this.Url, this.Width, this.Height, null, null, this.Resizable ) ; + FCKDialog.OpenDialog( 'FCKDialog_' + this.Name , this.Title, this.Url, this.Width, this.Height, this.CustomValue, null, this.Resizable ) ; } Index: /FCKeditor/trunk/editor/_source/commandclasses/fcktextcolorcommand.js =================================================================== --- /FCKeditor/trunk/editor/_source/commandclasses/fcktextcolorcommand.js (revision 1397) +++ /FCKeditor/trunk/editor/_source/commandclasses/fcktextcolorcommand.js (revision 1398) @@ -109,5 +109,6 @@ this.className = 'ColorDeselected' ; command._Panel.Hide() ; - FCKDialog.OpenDialog( 'FCKDialog_Color', FCKLang.DlgColorTitle, 'dialog/fck_colorselector.html', 400, 330, FCKTools.Hitch(command, 'SetColor') ) ; + FCKDialog.OpenDialog( 'FCKDialog_Color', FCKLang.DlgColorTitle, 'dialog/fck_colorselector.html', 410, 320, + FCKTools.Bind( command, command.SetColor ) ) ; } Index: /FCKeditor/trunk/editor/_source/internals/fck.js =================================================================== --- /FCKeditor/trunk/editor/_source/internals/fck.js (revision 1397) +++ /FCKeditor/trunk/editor/_source/internals/fck.js (revision 1398) @@ -957,7 +957,4 @@ return ; - if ( FCKConfig.Debug ) - FCKDebug._GetWindow() ; - FCK.SetStatus( FCK_STATUS_ACTIVE ) ; } Index: /FCKeditor/trunk/editor/_source/internals/fckbrowserinfo.js =================================================================== --- /FCKeditor/trunk/editor/_source/internals/fckbrowserinfo.js (revision 1397) +++ /FCKeditor/trunk/editor/_source/internals/fckbrowserinfo.js (revision 1398) @@ -28,4 +28,5 @@ IsIE : /*@cc_on!@*/false, IsIE7 : /*@cc_on!@*/false && ( parseFloat( s.match( /msie ([\d|\.]+)/ )[1] ) >= 7 ), + IsIE6 : /*@cc_on!@*/false && ( parseFloat( s.match( /msie ([\d|\.]+)/ )[1] ) >= 6 ), IsGecko : s.Contains('gecko/'), IsSafari : s.Contains(' applewebkit/'), // Read "IsWebKit" Index: /FCKeditor/trunk/editor/_source/internals/fckcommands.js =================================================================== --- /FCKeditor/trunk/editor/_source/internals/fckcommands.js (revision 1397) +++ /FCKeditor/trunk/editor/_source/internals/fckcommands.js (revision 1398) @@ -48,24 +48,23 @@ case 'RemoveFormat' : oCommand = new FCKRemoveFormatCommand() ; break ; - case 'DocProps' : oCommand = new FCKDialogCommand( 'DocProps' , FCKLang.DocProps , 'dialog/fck_docprops.html' , 400, 390, FCKCommands.GetFullPageState ) ; break ; + case 'DocProps' : oCommand = new FCKDialogCommand( 'DocProps' , FCKLang.DocProps , 'dialog/fck_docprops.html' , 400, 380, FCKCommands.GetFullPageState ) ; break ; case 'Templates' : oCommand = new FCKDialogCommand( 'Templates' , FCKLang.DlgTemplatesTitle , 'dialog/fck_template.html' , 380, 450 ) ; break ; - case 'Link' : oCommand = new FCKDialogCommand( 'Link' , FCKLang.DlgLnkWindowTitle , 'dialog/fck_link.html' , 400, 330 ) ; break ; + case 'Link' : oCommand = new FCKDialogCommand( 'Link' , FCKLang.DlgLnkWindowTitle , 'dialog/fck_link.html' , 400, 300 ) ; break ; case 'Unlink' : oCommand = new FCKUnlinkCommand() ; break ; - case 'Anchor' : oCommand = new FCKDialogCommand( 'Anchor' , FCKLang.DlgAnchorTitle , 'dialog/fck_anchor.html' , 370, 170 ) ; break ; + case 'Anchor' : oCommand = new FCKDialogCommand( 'Anchor' , FCKLang.DlgAnchorTitle , 'dialog/fck_anchor.html' , 370, 160 ) ; break ; case 'AnchorDelete' : oCommand = new FCKAnchorDeleteCommand() ; break ; - case 'BulletedList' : oCommand = new FCKDialogCommand( 'BulletedList', FCKLang.BulletedListProp , 'dialog/fck_listprop.html?UL' , 370, 170 ) ; break ; - case 'NumberedList' : oCommand = new FCKDialogCommand( 'NumberedList', FCKLang.NumberedListProp , 'dialog/fck_listprop.html?OL' , 370, 170 ) ; break ; - case 'About' : oCommand = new FCKDialogCommand( 'About' , FCKLang.About , 'dialog/fck_about.html' , 400, 330, function(){ return FCK_TRISTATE_OFF ; } ) ; break ; + case 'BulletedList' : oCommand = new FCKDialogCommand( 'BulletedList', FCKLang.BulletedListProp , 'dialog/fck_listprop.html?UL' , 370, 160 ) ; break ; + case 'NumberedList' : oCommand = new FCKDialogCommand( 'NumberedList', FCKLang.NumberedListProp , 'dialog/fck_listprop.html?OL' , 370, 160 ) ; break ; + case 'About' : oCommand = new FCKDialogCommand( 'About' , FCKLang.About , 'dialog/fck_about.html' , 400, 310, function(){ return FCK_TRISTATE_OFF ; } ) ; break ; + case 'Find' : oCommand = new FCKDialogCommand( 'Find' , FCKLang.DlgFindAndReplaceTitle, 'dialog/fck_replace.html' , 340, 230, null, null, 'Find' ) ; break ; + case 'Replace' : oCommand = new FCKDialogCommand( 'Replace' , FCKLang.DlgFindAndReplaceTitle, 'dialog/fck_replace.html' , 340, 230, null, null, 'Replace' ) ; break ; - case 'Find' : oCommand = new FCKDialogCommand( 'Find' , FCKLang.DlgFindAndReplaceTitle , 'dialog/fck_replace.html' , 340, 250 ) ; break ; - case 'Replace' : oCommand = new FCKDialogCommand( 'Replace' , FCKLang.DlgFindAndReplaceTitle , 'dialog/fck_replace.html' , 340, 250 ) ; break ; - - case 'Image' : oCommand = new FCKDialogCommand( 'Image' , FCKLang.DlgImgTitle , 'dialog/fck_image.html' , 450, 400 ) ; break ; - case 'Flash' : oCommand = new FCKDialogCommand( 'Flash' , FCKLang.DlgFlashTitle , 'dialog/fck_flash.html' , 450, 400 ) ; break ; - case 'SpecialChar' : oCommand = new FCKDialogCommand( 'SpecialChar', FCKLang.DlgSpecialCharTitle , 'dialog/fck_specialchar.html' , 400, 320 ) ; break ; + case 'Image' : oCommand = new FCKDialogCommand( 'Image' , FCKLang.DlgImgTitle , 'dialog/fck_image.html' , 450, 390 ) ; break ; + case 'Flash' : oCommand = new FCKDialogCommand( 'Flash' , FCKLang.DlgFlashTitle , 'dialog/fck_flash.html' , 450, 390 ) ; break ; + case 'SpecialChar' : oCommand = new FCKDialogCommand( 'SpecialChar', FCKLang.DlgSpecialCharTitle , 'dialog/fck_specialchar.html' , 400, 290 ) ; break ; case 'Smiley' : oCommand = new FCKDialogCommand( 'Smiley' , FCKLang.DlgSmileyTitle , 'dialog/fck_smiley.html' , FCKConfig.SmileyWindowWidth, FCKConfig.SmileyWindowHeight ) ; break ; case 'Table' : oCommand = new FCKDialogCommand( 'Table' , FCKLang.DlgTableTitle , 'dialog/fck_table.html' , 480, 250 ) ; break ; case 'TableProp' : oCommand = new FCKDialogCommand( 'Table' , FCKLang.DlgTableTitle , 'dialog/fck_table.html?Parent', 480, 250 ) ; break ; - case 'TableCellProp': oCommand = new FCKDialogCommand( 'TableCell' , FCKLang.DlgCellTitle , 'dialog/fck_tablecell.html' , 550, 250 ) ; break ; + case 'TableCellProp': oCommand = new FCKDialogCommand( 'TableCell' , FCKLang.DlgCellTitle , 'dialog/fck_tablecell.html' , 550, 240 ) ; break ; case 'Style' : oCommand = new FCKStyleCommand() ; break ; @@ -113,13 +112,13 @@ case 'TableDelete' : oCommand = new FCKTableCommand('TableDelete') ; break ; - case 'Form' : oCommand = new FCKDialogCommand( 'Form' , FCKLang.Form , 'dialog/fck_form.html' , 380, 230 ) ; break ; - case 'Checkbox' : oCommand = new FCKDialogCommand( 'Checkbox' , FCKLang.Checkbox , 'dialog/fck_checkbox.html' , 380, 230 ) ; break ; - case 'Radio' : oCommand = new FCKDialogCommand( 'Radio' , FCKLang.RadioButton , 'dialog/fck_radiobutton.html' , 380, 230 ) ; break ; - case 'TextField' : oCommand = new FCKDialogCommand( 'TextField' , FCKLang.TextField , 'dialog/fck_textfield.html' , 380, 230 ) ; break ; - case 'Textarea' : oCommand = new FCKDialogCommand( 'Textarea' , FCKLang.Textarea , 'dialog/fck_textarea.html' , 380, 230 ) ; break ; - case 'HiddenField' : oCommand = new FCKDialogCommand( 'HiddenField', FCKLang.HiddenField , 'dialog/fck_hiddenfield.html' , 380, 230 ) ; break ; - case 'Button' : oCommand = new FCKDialogCommand( 'Button' , FCKLang.Button , 'dialog/fck_button.html' , 380, 230 ) ; break ; - case 'Select' : oCommand = new FCKDialogCommand( 'Select' , FCKLang.SelectionField, 'dialog/fck_select.html' , 400, 380 ) ; break ; - case 'ImageButton' : oCommand = new FCKDialogCommand( 'ImageButton', FCKLang.ImageButton , 'dialog/fck_image.html?ImageButton', 450, 400 ) ; break ; + case 'Form' : oCommand = new FCKDialogCommand( 'Form' , FCKLang.Form , 'dialog/fck_form.html' , 380, 210 ) ; break ; + case 'Checkbox' : oCommand = new FCKDialogCommand( 'Checkbox' , FCKLang.Checkbox , 'dialog/fck_checkbox.html' , 380, 200 ) ; break ; + case 'Radio' : oCommand = new FCKDialogCommand( 'Radio' , FCKLang.RadioButton , 'dialog/fck_radiobutton.html' , 380, 200 ) ; break ; + case 'TextField' : oCommand = new FCKDialogCommand( 'TextField' , FCKLang.TextField , 'dialog/fck_textfield.html' , 380, 210 ) ; break ; + case 'Textarea' : oCommand = new FCKDialogCommand( 'Textarea' , FCKLang.Textarea , 'dialog/fck_textarea.html' , 380, 210 ) ; break ; + case 'HiddenField' : oCommand = new FCKDialogCommand( 'HiddenField', FCKLang.HiddenField , 'dialog/fck_hiddenfield.html' , 380, 190 ) ; break ; + case 'Button' : oCommand = new FCKDialogCommand( 'Button' , FCKLang.Button , 'dialog/fck_button.html' , 380, 210 ) ; break ; + case 'Select' : oCommand = new FCKDialogCommand( 'Select' , FCKLang.SelectionField, 'dialog/fck_select.html' , 400, 340 ) ; break ; + case 'ImageButton' : oCommand = new FCKDialogCommand( 'ImageButton', FCKLang.ImageButton , 'dialog/fck_image.html?ImageButton', 450, 390 ) ; break ; case 'SpellCheck' : oCommand = new FCKSpellCheckCommand() ; break ; Index: /FCKeditor/trunk/editor/_source/internals/fckdialog.js =================================================================== --- /FCKeditor/trunk/editor/_source/internals/fckdialog.js (revision 1397) +++ /FCKeditor/trunk/editor/_source/internals/fckdialog.js (revision 1398) @@ -22,17 +22,227 @@ */ -var FCKDialog = new Object() ; - -// This method opens a dialog window using the standard dialog template. -FCKDialog.OpenDialog = function( dialogName, dialogTitle, dialogPage, width, height, customValue, parentWindow, resizable ) +var FCKDialog = ( function() { - // Setup the dialog info. - var oDialogInfo = new Object() ; - oDialogInfo.Title = dialogTitle ; - oDialogInfo.Page = dialogPage ; - oDialogInfo.Editor = window ; - oDialogInfo.CustomValue = customValue ; // Optional - - var sUrl = FCKConfig.BasePath + 'fckdialog.html' ; - this.Show( oDialogInfo, dialogName, sUrl, width, height, parentWindow, resizable ) ; -} + var topDialog ; + var baseZIndex ; + var cover ; + + // The document that holds the dialog. + var topWindow = window.parent ; + + while ( topWindow.parent && topWindow.parent != topWindow ) + { + try + { + if ( topWindow.parent.document.domain != document.domain ) + break ; + if ( topWindow.parent.document.getElementsByTagName( 'frameset' ).length > 0 ) + break ; + } + catch ( e ) + { + break ; + } + topWindow = topWindow.parent ; + } + + var topDocument = topWindow.document ; + + var getZIndex = function() + { + if ( !baseZIndex ) + baseZIndex = FCKConfig.FloatingPanelsZIndex + 999 ; + return ++baseZIndex ; + } + + // TODO : This logic is not actually working when reducing the window, only + // when enlarging it. + var resizeHandler = function() + { + if ( !cover ) + return ; + + var documentElement = topDocument.documentElement ; + + FCKDomTools.SetElementStyles( cover, + { + 'width' : Math.max( documentElement.scrollWidth, + documentElement.clientWidth, + topDocument.scrollWidth || 0 ) - 1 + 'px', + 'height' : Math.max( documentElement.scrollHeight, + documentElement.clientHeight, + topDocument.scrollHeight || 0 ) - 1 + 'px' + } ) ; + } + + return { + SelectionData : null, + + /** + * Opens a dialog window using the standard dialog template. + */ + OpenDialog : function( dialogName, dialogTitle, dialogPage, width, height, customValue, parentWindow, resizable ) + { + if ( !topDialog ) + this.DisplayMainCover() ; + + // Setup the dialog info to be passed to the dialog. + var dialogInfo = + { + Title : dialogTitle, + Page : dialogPage, + Editor : window, + CustomValue : customValue, // Optional + SelectionData : null, + TopWindow : topWindow + } + + var currentInstance = FCK.ToolbarSet.CurrentInstance ; + + // IE doens't support multiple selections, even if in different + // IFRAMEs, like the dialog, so the current selection must be saved to + // be restored in the dialog code. + if ( FCKBrowserInfo.IsIE && !topDialog ) + { + var editorDocument = currentInstance.EditorDocument ; + var selection = editorDocument.selection ; + var range ; + + if ( selection ) + { + range = selection.createRange() ; + + // Ensure that the range comes from the editor document. + if ( range ) + { + if ( range.parentElement && FCKTools.GetElementDocument( range.parentElement() ) != editorDocument ) + range = null ; + else if ( range.item && FCKTools.GetElementDocument( range.item(0) )!= editorDocument ) + range = null ; + } + } + + this.SelectionData = range ; + } + + // Calculate the dialog position, centering it on the screen. + var viewSize = FCKTools.GetViewPaneSize( topWindow ) ; + var scrollPosition = FCKTools.GetScrollPosition( topWindow ) ; + var iTop = Math.max( scrollPosition.Y + ( viewSize.Height - height - 20 ) / 2, 0 ) ; + var iLeft = Math.max( scrollPosition.X + ( viewSize.Width - width - 20 ) / 2, 0 ) ; + + // Setup the IFRAME that will hold the dialog. + var dialog = topDocument.createElement( 'iframe' ) ; + dialog.src = FCKConfig.BasePath + 'fckdialog.html' ; + + // Dummy URL for testing whether the code in fckdialog.js alone leaks memory. + // dialog.src = 'about:blank'; + + dialog.frameBorder = 0 ; + dialog.allowTransparency = true ; + FCKDomTools.SetElementStyles( dialog, + { + 'position' : 'absolute', + 'top' : iTop + 'px', + 'left' : iLeft + 'px', + 'width' : width + 'px', + 'height' : height + 'px', + 'zIndex' : getZIndex() + } ) ; + + // Save the dialog info to be used by the dialog page once loaded. + dialog._DialogArguments = dialogInfo ; + + // Append the IFRAME to the target document. + topDocument.body.appendChild( dialog ) ; + + // Keep record of the dialog's parent/child relationships. + dialog._ParentDialog = topDialog ; + topDialog = dialog ; + }, + + /** + * (For internal use) + * Called when the top dialog is closed. + */ + OnDialogClose : function( dialogWindow ) + { + var dialog = dialogWindow.frameElement ; + FCKDomTools.RemoveNode( dialog ) ; + + if ( dialog._ParentDialog ) // Nested Dialog. + { + topDialog = dialog._ParentDialog ; + dialog._ParentDialog.contentWindow.SetEnabled( true ) ; + } + else // First Dialog. + { + // Set the Focus in the browser, so the "OnBlur" event is not + // fired. In IE, there is no need to d othat because the dialog + // already moved the selection to the editing area before + // closing (EnsureSelection). Also, the Focus() call here + // causes memory leak on IE7 (weird). + if ( !FCKBrowserInfo.IsIE ) + FCK.Focus() ; + + this.HideMainCover() ; + topDialog = null ; + this.SelectionData = null ; + } + }, + + DisplayMainCover : function() + { + // Setup the DIV that will be used to cover. + cover = topDocument.createElement( 'div' ) ; + FCKDomTools.SetElementStyles( cover, + { + 'position' : 'absolute', + 'zIndex' : getZIndex(), + 'top' : '0px', + 'left' : '0px', + 'backgroundColor' : FCKConfig.BackgroundBlockerColor + } ) ; + FCKDomTools.SetOpacity( cover, FCKConfig.BackgroundBlockerOpacity ) ; + + // For IE6-, we need to fill the cover with a transparent IFRAME, + // to properly block