typo 5.0.3.98.1 → 5.1

data/public/javascripts/fckeditor/editor/_source/classes/fckdomrange_gecko.js

@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2007 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
@@ -35,7 +35,8 @@ FCKDomRange.prototype.MoveToSelection = function()
 		this._UpdateElementInfo() ;
 	}
 	else
-		this.MoveToElementStart( this.Window.document.body ) ;
+		if ( this.Window.document )
+			this.MoveToElementStart( this.Window.document.body ) ;
 }
 
 FCKDomRange.prototype.Select = function()
@@ -100,4 +101,4 @@ FCKDomRange.prototype.SelectBookmark = function( bookmark )
 	var selection = this.Window.getSelection() ;
 	selection.removeAllRanges() ;
 	selection.addRange( domRange ) ;
-}
+}

data/public/javascripts/fckeditor/editor/_source/classes/fckdomrange_ie.js

@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2007 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
@@ -66,15 +66,15 @@ FCKDomRange.prototype.MoveToSelection = function()
 	}
 }
 
-FCKDomRange.prototype.Select = function()
+FCKDomRange.prototype.Select = function( forceExpand )
 {
 	if ( this._Range )
-		this.SelectBookmark( this.CreateBookmark( true ) ) ;
+		this.SelectBookmark( this.CreateBookmark( true ), forceExpand ) ;
 }
 
 // Not compatible with bookmark created with CreateBookmark2.
 // The bookmark nodes will be deleted from the document.
-FCKDomRange.prototype.SelectBookmark = function( bookmark )
+FCKDomRange.prototype.SelectBookmark = function( bookmark, forceExpand )
 {
 	var bIsCollapsed = this.CheckIsCollapsed() ;
 	var bIsStartMakerAlone ;
@@ -82,7 +82,7 @@ FCKDomRange.prototype.SelectBookmark = function( bookmark )
 
 	// Create marker tags for the start and end boundaries.
 	var eStartMarker = this.GetBookmarkNode( bookmark, true ) ;
-	
+
 	if ( !eStartMarker )
 		return ;
 
@@ -111,26 +111,27 @@ FCKDomRange.prototype.SelectBookmark = function( bookmark )
 	}
 	else
 	{
-		bIsStartMakerAlone = ( !eStartMarker.previousSibling || eStartMarker.previousSibling.nodeName.toLowerCase() == 'br' ) && !eStartMarker.nextSibing ;
-		
-		// Append a temporary <span>&nbsp;</span> before the selection.
+		bIsStartMakerAlone = ( forceExpand || !eStartMarker.previousSibling || eStartMarker.previousSibling.nodeName.toLowerCase() == 'br' ) && !eStartMarker.nextSibing ;
+
+		// Append a temporary <span>&#65279;</span> before the selection.
 		// This is needed to avoid IE destroying selections inside empty
 		// inline elements, like <b></b> (#253).
 		// It is also needed when placing the selection right after an inline
 		// element to avoid the selection moving inside of it.
 		dummySpan = this.Window.document.createElement( 'span' ) ;
-		dummySpan.innerHTML = '&nbsp;' ;
+		dummySpan.innerHTML = '&#65279;' ;	// Zero Width No-Break Space (U+FEFF). See #1359.
 		eStartMarker.parentNode.insertBefore( dummySpan, eStartMarker ) ;
-		
+
 		if ( bIsStartMakerAlone )
 		{
 			// To expand empty blocks or line spaces after <br>, we need
-			// instead to have a &nbsp;, which will be later deleted using the
+			// instead to have any char, which will be later deleted using the
 			// selection.
-			eStartMarker.parentNode.insertBefore( this.Window.document.createTextNode( '\u00a0' ), eStartMarker ) ;
+			// \ufeff = Zero Width No-Break Space (U+FEFF). See #1359.
+			eStartMarker.parentNode.insertBefore( this.Window.document.createTextNode( '\ufeff' ), eStartMarker ) ;
 		}
 	}
-	
+
 	if ( !this._Range )
 		this._Range = this.CreateRange() ;
 
@@ -142,9 +143,9 @@ FCKDomRange.prototype.SelectBookmark = function( bookmark )
 	{
 		if ( bIsStartMakerAlone )
 		{
-			// Move the selection start to include the temporary &nbsp;.
+			// Move the selection start to include the temporary &#65279;.
 			oIERange.moveStart( 'character', -1 ) ;
-			
+
 			oIERange.select() ;
 
 			// Remove our temporary stuff.

data/public/javascripts/fckeditor/editor/_source/classes/fckdomrangeiterator.js

@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2007 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
@@ -92,6 +92,8 @@ FCKDomRangeIterator.prototype =
 		var currentNode = this._NextNode ;
 		var lastNode = this._LastNode ;
 
+		this._NextNode = null ;
+
 		while ( currentNode )
 		{
 			// closeRange indicates that a paragraph boundary has been found,
@@ -110,7 +112,7 @@ FCKDomRangeIterator.prototype =
 			{
 				var nodeName = currentNode.nodeName.toLowerCase() ;
 
-				if ( boundarySet[ nodeName ] )
+				if ( boundarySet[ nodeName ] && ( !FCKBrowserInfo.IsIE || currentNode.scopeName == 'HTML' ) )
 				{
 					// <br> boundaries must be part of the range. It will
 					// happen only if ForceBrBreak.
@@ -125,6 +127,18 @@ FCKDomRangeIterator.prototype =
 						break ;
 					}
 
+					// The range must finish right before the boundary,
+					// including possibly skipped empty spaces. (#1603)
+					if ( range )
+					{
+						range.SetEnd( currentNode, 3, true ) ;
+
+						// The found boundary must be set as the next one at this
+						// point. (#1717)
+						if ( nodeName != 'br' )
+							this._NextNode = currentNode ;
+					}
+
 					closeRange = true ;
 				}
 				else
@@ -181,6 +195,7 @@ FCKDomRangeIterator.prototype =
 					}
 
 					currentNode = parentNode ;
+					includeNode = true ;
 					isLast = ( currentNode == lastNode ) ;
 					continueFromSibling = true ;
 				}
@@ -195,15 +210,15 @@ FCKDomRangeIterator.prototype =
 			if ( ( closeRange || isLast ) && range )
 			{
 				range._UpdateElementInfo() ;
-				
-				if ( range.StartNode == range.EndNode 
-						&& range.StartNode.parentNode == range.StartBlockLimit 
+
+				if ( range.StartNode == range.EndNode
+						&& range.StartNode.parentNode == range.StartBlockLimit
 						&& range.StartNode.getAttribute && range.StartNode.getAttribute( '_fck_bookmark' ) )
 					range = null ;
 				else
 					break ;
 			}
-			
+
 			if ( isLast )
 				break ;
 
@@ -285,8 +300,13 @@ FCKDomRangeIterator.prototype =
 		if ( removePreviousBr )
 		{
 			var previousSibling = block.previousSibling ;
-			if ( previousSibling && previousSibling.nodeType == 1 && previousSibling.nodeName.toLowerCase() == 'br' )
-				previousSibling.parentNode.removeChild( previousSibling ) ;
+			if ( previousSibling && previousSibling.nodeType == 1 )
+			{
+				if ( previousSibling.nodeName.toLowerCase() == 'br' )
+					previousSibling.parentNode.removeChild( previousSibling ) ;
+				else if ( previousSibling.lastChild && previousSibling.lastChild.nodeName.IEquals( 'br' ) )
+					previousSibling.removeChild( previousSibling.lastChild ) ;
+			}
 		}
 
 		if ( removeLastBr )
@@ -299,7 +319,8 @@ FCKDomRangeIterator.prototype =
 		// Get a reference for the next element. This is important because the
 		// above block can be removed or changed, so we can rely on it for the
 		// next interation.
-		this._NextNode = ( isLast || block == lastNode ) ? null : FCKDomTools.GetNextSourceNode( block, true, null, lastNode ) ;
+		if ( !this._NextNode )
+			this._NextNode = ( isLast || block == lastNode ) ? null : FCKDomTools.GetNextSourceNode( block, true, null, lastNode ) ;
 
 		return block ;
 	}

data/public/javascripts/fckeditor/editor/_source/classes/fckeditingarea.js

@@ -1,6 +1,6 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2007 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
@@ -44,31 +44,15 @@ FCKEditingArea.prototype.Start = function( html, secondCall )
 	var oTargetDocument	= FCKTools.GetElementDocument( eTargetElement ) ;
 
 	// Remove all child nodes from the target.
-	var oChild ;
-	while( ( oChild = eTargetElement.firstChild ) )		// Only one "=".
-	{
-		// Set innerHTML = '' to avoid memory leak.
-		if ( oChild.contentWindow )
-			oChild.contentWindow.document.body.innerHTML = '' ;
-
-		eTargetElement.removeChild( oChild ) ;
-	}
+	while( eTargetElement.firstChild )
+		eTargetElement.removeChild( eTargetElement.firstChild ) ;
 
 	if ( this.Mode == FCK_EDITMODE_WYSIWYG )
 	{
-		// Create the editing area IFRAME.
-		var oIFrame = this.IFrame = oTargetDocument.createElement( 'iframe' ) ;
-		
-		// Firefox will render the tables inside the body in Quirks mode if the 
-		// source of the iframe is set to javascript. see #515
-		if ( !FCKBrowserInfo.IsGecko )
-			oIFrame.src = 'javascript:void(0)' ;
-		
-		oIFrame.frameBorder = 0 ;
-		oIFrame.width = oIFrame.height = '100%' ;
-
-		// Append the new IFRAME to the target.
-		eTargetElement.appendChild( oIFrame ) ;
+		// For FF, document.domain must be set only when different, otherwhise
+		// we'll strangely have "Permission denied" issues.
+		if ( FCK_IS_CUSTOM_DOMAIN )
+			html = '<script>document.domain="' + FCK_RUNTIME_DOMAIN + '";</script>' + html ;
 
 		// IE has a bug with the <base> tag... it must have a </base> closer,
 		// otherwise the all successive tags will be set as children nodes of the <base>.
@@ -104,6 +88,38 @@ FCKEditingArea.prototype.Start = function( html, secondCall )
 				this._BodyHTML = html ;			// Invalid HTML input.
 		}
 
+		// Create the editing area IFRAME.
+		var oIFrame = this.IFrame = oTargetDocument.createElement( 'iframe' ) ;
+
+		// IE: Avoid JavaScript errors thrown by the editing are source (like tags events).
+		// See #1055.
+		var sOverrideError = '<script type="text/javascript" _fcktemp="true">window.onerror=function(){return true;};</script>' ;
+
+		oIFrame.frameBorder = 0 ;
+		oIFrame.width = oIFrame.height = '100%' ;
+
+		if ( FCK_IS_CUSTOM_DOMAIN && FCKBrowserInfo.IsIE )
+		{
+			window._FCKHtmlToLoad = sOverrideError + html ;
+			oIFrame.src = 'javascript:void( (function(){' +
+				'document.open() ;' +
+				'document.domain="' + document.domain + '" ;' +
+				'document.write( window.parent._FCKHtmlToLoad );' +
+				'document.close() ;' +
+				'window.parent._FCKHtmlToLoad = null ;' +
+				'})() )' ;
+		}
+		else if ( !FCKBrowserInfo.IsGecko )
+		{
+			// Firefox will render the tables inside the body in Quirks mode if the
+			// source of the iframe is set to javascript. see #515
+			oIFrame.src = 'javascript:void(0)' ;
+		}
+
+		// Append the new IFRAME to the target. For IE, it must be done after
+		// setting the "src", to avoid the "secure/unsecure" message under HTTPS.
+		eTargetElement.appendChild( oIFrame ) ;
+
 		// Get the window and document objects used to interact with the newly created IFRAME.
 		this.Window = oIFrame.contentWindow ;
 
@@ -111,11 +127,17 @@ FCKEditingArea.prototype.Start = function( html, secondCall )
 		// TODO: This error handler is not being fired.
 		// this.Window.onerror = function() { alert( 'Error!' ) ; return true ; }
 
-		var oDoc = this.Document = this.Window.document ;
+		if ( !FCK_IS_CUSTOM_DOMAIN || !FCKBrowserInfo.IsIE )
+		{
+			var oDoc = this.Window.document ;
 
-		oDoc.open() ;
-		oDoc.write( html ) ;
-		oDoc.close() ;
+			oDoc.open() ;
+			oDoc.write( sOverrideError + html ) ;
+			oDoc.close() ;
+		}
+
+		if ( FCKBrowserInfo.IsAIR )
+			FCKAdobeAIR.EditingArea_Start( oDoc, html ) ;
 
 		// Firefox 1.0.x is buggy... ohh yes... so let's do it two times and it
 		// will magically work.
@@ -125,27 +147,46 @@ FCKEditingArea.prototype.Start = function( html, secondCall )
 			return ;
 		}
 
-		this.Window._FCKEditingArea = this ;
-
-		// FF 1.0.x is buggy... we must wait a lot to enable editing because
-		// sometimes the content simply disappears, for example when pasting
-		// "bla1!<img src='some_url'>!bla2" in the source and then switching
-		// back to design.
-		if ( FCKBrowserInfo.IsGecko10 )
-			this.Window.setTimeout( FCKEditingArea_CompleteStart, 500 ) ;
+		if ( oIFrame.readyState && oIFrame.readyState != 'completed' )
+		{
+			var editArea = this ;
+			( oIFrame.onreadystatechange = function()
+			{
+				if ( oIFrame.readyState == 'complete' )
+				{
+					oIFrame.onreadystatechange = null ;
+					editArea.Window._FCKEditingArea = editArea ;
+					FCKEditingArea_CompleteStart.call( editArea.Window ) ;
+				}
+			// It happened that IE changed the state to "complete" after the
+			// "if" and before the "onreadystatechange" assignement, making we
+			// lost the event call, so we do a manual call just to be sure.
+			} )() ;
+		}
 		else
-			FCKEditingArea_CompleteStart.call( this.Window ) ;
+		{
+			this.Window._FCKEditingArea = this ;
+
+			// FF 1.0.x is buggy... we must wait a lot to enable editing because
+			// sometimes the content simply disappears, for example when pasting
+			// "bla1!<img src='some_url'>!bla2" in the source and then switching
+			// back to design.
+			if ( FCKBrowserInfo.IsGecko10 )
+				this.Window.setTimeout( FCKEditingArea_CompleteStart, 500 ) ;
+			else
+				FCKEditingArea_CompleteStart.call( this.Window ) ;
+		}
 	}
 	else
 	{
 		var eTextarea = this.Textarea = oTargetDocument.createElement( 'textarea' ) ;
 		eTextarea.className = 'SourceField' ;
 		eTextarea.dir = 'ltr' ;
-		FCKDomTools.SetElementStyles( eTextarea, 
-			{ 
-				width	: '100%', 
-				height	: '100%', 
-				border	: 'none', 
+		FCKDomTools.SetElementStyles( eTextarea,
+			{
+				width	: '100%',
+				height	: '100%',
+				border	: 'none',
 				resize	: 'none',
 				outline	: 'none'
 			} ) ;
@@ -169,7 +210,10 @@ function FCKEditingArea_CompleteStart()
 	}
 
 	var oEditorArea = this._FCKEditingArea ;
-	
+
+	// Save this reference to be re-used later.
+	oEditorArea.Document = oEditorArea.Window.document ;
+
 	oEditorArea.MakeEditable() ;
 
 	// Fire the "OnLoad" event.
@@ -207,31 +251,13 @@ FCKEditingArea.prototype.MakeEditable = function()
 
 			oDoc.designMode = 'on' ;
 
-			// Tell Gecko to use or not the <SPAN> tag for the bold, italic and underline.
-			try
-			{
-				oDoc.execCommand( 'styleWithCSS', false, FCKConfig.GeckoUseSPAN ) ;
-			}
-			catch (e)
-			{
-				// As evidenced here, useCSS is deprecated in favor of styleWithCSS:
-				// http://www.mozilla.org/editor/midas-spec.html
-				oDoc.execCommand( 'useCSS', false, !FCKConfig.GeckoUseSPAN ) ;
-			}
-
-			// Analyzing Firefox 1.5 source code, it seams that there is support for a
-			// "insertBrOnReturn" command. Applying it gives no error, but it doesn't
-			// gives the same behavior that you have with IE. It works only if you are
-			// already inside a paragraph and it doesn't render correctly in the first enter.
-			// oDoc.execCommand( 'insertBrOnReturn', false, false ) ;
-
 			// Tell Gecko (Firefox 1.5+) to enable or not live resizing of objects (by Alfonso Martinez)
 			oDoc.execCommand( 'enableObjectResizing', false, !FCKConfig.DisableObjectResizing ) ;
 
 			// Disable the standard table editing features of Firefox.
 			oDoc.execCommand( 'enableInlineTableEditing', false, !FCKConfig.DisableFFTableHandles ) ;
 		}
-		catch (e) 
+		catch (e)
 		{
 			// In Firefox if the iframe is initially hidden it can't be set to designMode and it raises an exception
 			// So we set up a DOM Mutation event Listener on the HTML, as it will raise several events when the document is  visible again
@@ -246,12 +272,12 @@ FCKEditingArea.prototype.MakeEditable = function()
 function FCKEditingArea_Document_AttributeNodeModified( evt )
 {
 	var editingArea = evt.currentTarget.contentWindow._FCKEditingArea ;
-	
+
 	// We want to run our function after the events no longer fire, so we can know that it's a stable situation
 	if ( editingArea._timer )
 		window.clearTimeout( editingArea._timer ) ;
 
-	editingArea._timer = FCKTools.SetTimeout( FCKEditingArea_MakeEditableByMutation, 1000, editingArea ) ;	
+	editingArea._timer = FCKTools.SetTimeout( FCKEditingArea_MakeEditableByMutation, 1000, editingArea ) ;
 }
 
 // This function ideally should be called after the document is visible, it does clean up of the
@@ -273,21 +299,10 @@ FCKEditingArea.prototype.Focus = function()
 	{
 		if ( this.Mode == FCK_EDITMODE_WYSIWYG )
 		{
-			// The following check is important to avoid IE entering in a focus loop. Ref:
-			// http://sourceforge.net/tracker/index.php?func=detail&aid=1567060&group_id=75348&atid=543653
-			if ( FCKBrowserInfo.IsIE && this.Document.hasFocus() )
-				this._EnsureFocusIE() ;
-
-			if ( FCKBrowserInfo.IsSafari )
-				this.IFrame.focus() ;
+			if ( FCKBrowserInfo.IsIE )
+				this._FocusIE() ;
 			else
-			{
 				this.Window.focus() ;
-
-				// In IE it can happen that the document is in theory focused but the active element is outside it
-				if ( FCKBrowserInfo.IsIE )
-					this._EnsureFocusIE() ;
-			}
 		}
 		else
 		{
@@ -301,30 +316,33 @@ FCKEditingArea.prototype.Focus = function()
 	catch(e) {}
 }
 
-FCKEditingArea.prototype._EnsureFocusIE = function()
+FCKEditingArea.prototype._FocusIE = function()
 {
-	// In IE it can happen that the document is in theory focused but the active element is outside it
+	// In IE it can happen that the document is in theory focused but the
+	// active element is outside of it.
 	this.Document.body.setActive() ;
 
+	this.Window.focus() ;
+
 	// Kludge for #141... yet more code to workaround IE bugs
 	var range = this.Document.selection.createRange() ;
 
-	// Only apply the fix when in a block and the block is empty.
 	var parentNode = range.parentElement() ;
+	var parentTag = parentNode.nodeName.toLowerCase() ;
 
-	if ( ! ( parentNode.childNodes.length == 0 && ( 
-					FCKListsLib.BlockElements[parentNode.nodeName.toLowerCase()] || 
-					FCKListsLib.NonEmptyBlockElements[parentNode.nodeName.toLowerCase()] ) ) )
-		return ;
-
-	var oldLength = range.text.length ;
-	range.moveEnd( "character", 1 ) ;
-	range.select() ;
-	if ( range.text.length > oldLength )
+	// Only apply the fix when in a block, and the block is empty.
+	if ( parentNode.childNodes.length > 0 ||
+		 !( FCKListsLib.BlockElements[parentTag] ||
+		    FCKListsLib.NonEmptyBlockElements[parentTag] ) )
 	{
-		range.moveEnd( "character", -1 ) ;
-		range.select() ;
+		return ;
 	}
+
+	// Force the selection to happen, in this way we guarantee the focus will
+	// be there.
+	range = new FCKDomRange( this.Window ) ;
+	range.MoveToElementEditStart( parentNode ) ;
+	range.Select() ;
 }
 
 function FCKEditingArea_Cleanup()