typo 5.0.3.98.1 → 5.1

data/public/javascripts/fckeditor/editor/_source/internals/fcktools_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 ==
  *
@@ -30,9 +30,11 @@ FCKTools.CancelEvent = function( e )
 FCKTools.DisableSelection = function( element )
 {
 	if ( FCKBrowserInfo.IsGecko )
-		element.style.MozUserSelect	= 'none' ;	// Gecko only.
+		element.style.MozUserSelect		= 'none' ;	// Gecko only.
+	else if ( FCKBrowserInfo.IsSafari )
+		element.style.KhtmlUserSelect	= 'none' ;	// WebKit only.
 	else
-		element.style.userSelect	= 'none' ;	// CSS3 (not supported yet).
+		element.style.userSelect		= 'none' ;	// CSS3 (not supported yet).
 }
 
 // Appends a CSS file to a document.
@@ -47,8 +49,11 @@ FCKTools._AppendStyleSheet = function( documentElement, cssFileUrl )
 }
 
 // Appends a CSS style string to a document.
-FCKTools._AppendStyleString = function( documentElement, cssStyles )
+FCKTools.AppendStyleString = function( documentElement, cssStyles )
 {
+	if ( !cssStyles )
+		return null ;
+
 	var e = documentElement.createElement( "STYLE" ) ;
 	e.appendChild( documentElement.createTextNode( cssStyles ) ) ;
 	documentElement.getElementsByTagName( "HEAD" )[0].appendChild( e ) ;
@@ -111,8 +116,15 @@ FCKTools.CreateXmlObject = function( object )
 	{
 		case 'XmlHttp' :
 			return new XMLHttpRequest() ;
+
 		case 'DOMDocument' :
-			return document.implementation.createDocument( '', '', null ) ;
+			// Originaly, we were had the following here:
+			// return document.implementation.createDocument( '', '', null ) ;
+			// But that doesn't work if we're running under domain relaxation mode, so we need a workaround.
+			// See http://ajaxian.com/archives/xml-messages-with-cross-domain-json about the trick we're using.
+			var doc = ( new DOMParser() ).parseFromString( '<tmp></tmp>', 'text/xml' ) ;
+			FCKDomTools.RemoveNode( doc.firstChild ) ;
+			return doc ;
 	}
 	return null ;
 }
@@ -191,7 +203,7 @@ FCKTools.RegisterDollarFunction = function( targetWindow )
 {
 	targetWindow.$ = function( id )
 	{
-		return this.document.getElementById( id ) ;
+		return targetWindow.document.getElementById( id ) ;
 	} ;
 }
 
@@ -224,7 +236,7 @@ FCKTools.GetElementPosition = function( el, relativeWindow )
 			break ;
 
 		/*
-		FCKDebug.Output( el.tagName + ":" + "offset=" + el.offsetLeft + "," + el.offsetTop + "  " 
+		FCKDebug.Output( el.tagName + ":" + "offset=" + el.offsetLeft + "," + el.offsetTop + "  "
 				+ "scroll=" + el.scrollLeft + "," + el.scrollTop ) ;
 		*/
 

data/public/javascripts/fckeditor/editor/_source/internals/fcktools_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 ==
  *
@@ -33,8 +33,11 @@ FCKTools._AppendStyleSheet = function( documentElement, cssFileUrl )
 }
 
 // Appends a CSS style string to a document.
-FCKTools._AppendStyleString = function( documentElement, cssStyles )
+FCKTools.AppendStyleString = function( documentElement, cssStyles )
 {
+	if ( !cssStyles )
+		return null ;
+
 	var s = documentElement.createStyleSheet( "" ) ;
 	s.cssText = cssStyles ;
 	return s ;
@@ -71,6 +74,9 @@ FCKTools.CreateXmlObject = function( object )
 	switch ( object )
 	{
 		case 'XmlHttp' :
+			// Try the native XMLHttpRequest introduced with IE7.
+			try { return new XMLHttpRequest() ; } catch (e) {}
+
 			aObjs = [ 'MSXML2.XmlHttp', 'Microsoft.XmlHttp' ] ;
 			break ;
 

data/public/javascripts/fckeditor/editor/_source/internals/fckundo.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 ==
  *
@@ -27,9 +27,12 @@ FCKUndo.TypesCount = 0 ;
 FCKUndo.Changed = false ;	// Is the document changed in respect to its initial image?
 FCKUndo.MaxTypes = 25 ;
 FCKUndo.Typing = false ;
+FCKUndo.SaveLocked = false ;
 
 FCKUndo._GetBookmark = function()
 {
+	FCKSelection.Restore() ;
+
 	var range = new FCKDomRange( FCK.EditorWindow ) ;
 	try
 	{
@@ -107,14 +110,14 @@ FCKUndo._CheckIsBookmarksEqual = function( bookmark1, bookmark2 )
 	}
 	else
 	{
-		return this._CompareCursors( bookmark1.Start, bookmark2.Start ) == 0 
+		return this._CompareCursors( bookmark1.Start, bookmark2.Start ) == 0
 			&& this._CompareCursors( bookmark1.End, bookmark2.End ) == 0 ;
 	}
 }
 
 FCKUndo.SaveUndoStep = function()
 {
-	if ( FCK.EditMode != FCK_EDITMODE_WYSIWYG )
+	if ( FCK.EditMode != FCK_EDITMODE_WYSIWYG || this.SaveLocked )
 		return ;
 
 	// Assume the editor content is changed when SaveUndoStep() is called after the first time.
@@ -130,8 +133,8 @@ FCKUndo.SaveUndoStep = function()
 	this.SavedData = this.SavedData.slice( 0, this.CurrentIndex + 1 ) ;
 
 	// Cancel operation if the new step is identical to the previous one.
-	if ( this.CurrentIndex > 0 
-			&& sHtml == this.SavedData[ this.CurrentIndex ][0] 
+	if ( this.CurrentIndex > 0
+			&& sHtml == this.SavedData[ this.CurrentIndex ][0]
 			&& this._CheckIsBookmarksEqual( bookmark, this.SavedData[ this.CurrentIndex ][1] ) )
 		return ;
 	// Save the selection and caret position in the first undo level for the first change.

data/public/javascripts/fckeditor/editor/_source/internals/fckurlparams.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 ==
  *
@@ -36,4 +36,4 @@ var FCKURLParams = new Object() ;
 
 		FCKURLParams[ sParamName ] = sParamValue ;
 	}
-})();
+})();

data/public/javascripts/fckeditor/editor/_source/internals/fckxhtml.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 ==
  *
@@ -27,7 +27,7 @@ FCKXHtml.CurrentJobNum = 0 ;
 
 FCKXHtml.GetXHTML = function( node, includeNode, format )
 {
-	FCKDomTools.CheckAndRemovePaddingNode( node.ownerDocument, FCKConfig.EnterMode ) ;
+	FCKDomTools.CheckAndRemovePaddingNode( FCKTools.GetElementDocument( node ), FCKConfig.EnterMode ) ;
 	FCKXHtmlEntities.Initialize() ;
 
 	// Set the correct entity to use for empty blocks.
@@ -146,7 +146,7 @@ FCKXHtml._AppendChildNodes = function( xmlNode, htmlNode, isBlockElement )
 				this._AppendEntity( xmlNode, this._NbspEntity ) ;
 		}
 	}
-	
+
 	// If the resulting node is empty.
 	if ( xmlNode.childNodes.length == 0 )
 	{
@@ -182,8 +182,8 @@ FCKXHtml._AppendNode = function( xmlNode, htmlNode )
 		case 1 :
 			// If we detect a <br> inside a <pre> in Gecko, turn it into a line break instead.
 			// This is a workaround for the Gecko bug here: https://bugzilla.mozilla.org/show_bug.cgi?id=92921
-			if ( FCKBrowserInfo.IsGecko 
-					&& htmlNode.tagName.toLowerCase() == 'br' 
+			if ( FCKBrowserInfo.IsGecko
+					&& htmlNode.tagName.toLowerCase() == 'br'
 					&& htmlNode.parentNode.tagName.toLowerCase() == 'pre' )
 			{
 				var val = '\r' ;
@@ -198,7 +198,8 @@ FCKXHtml._AppendNode = function( xmlNode, htmlNode )
 				return FCKXHtml._AppendNode( xmlNode, FCK.GetRealElement( htmlNode ) ) ;
 
 			// Ignore bogus BR nodes in the DOM.
-			if ( FCKBrowserInfo.IsGecko && 
+			if ( FCKBrowserInfo.IsGecko &&
+					htmlNode.nextSibling &&
 					( htmlNode.hasAttribute('_moz_editor_bogus_node') || htmlNode.getAttribute( 'type' ) == '_moz' ) )
 				return false ;
 
@@ -234,7 +235,7 @@ FCKXHtml._AppendNode = function( xmlNode, htmlNode )
 				return false ;
 
 			var oNode = this.XML.createElement( sNodeName ) ;
-			
+
 			// Add all attributes.
 			FCKXHtml._AppendAttributes( xmlNode, htmlNode, oNode, sNodeName ) ;
 
@@ -312,19 +313,6 @@ function FCKXHtml_GetEntity( character )
 // An object that hold tag specific operations.
 FCKXHtml.TagProcessors =
 {
-	img : function( node, htmlNode )
-	{
-		// The "ALT" attribute is required in XHTML.
-		if ( ! node.attributes.getNamedItem( 'alt' ) )
-			FCKXHtml._AppendAttribute( node, 'alt', '' ) ;
-
-		var sSavedUrl = htmlNode.getAttribute( '_fcksavedurl' ) ;
-		if ( sSavedUrl != null )
-			FCKXHtml._AppendAttribute( node, 'src', sSavedUrl ) ;
-
-		return node ;
-	},
-
 	a : function( node, htmlNode )
 	{
 		// Firefox may create empty tags when deleting the selection in some special cases (SF-BUG 1556878).
@@ -349,51 +337,99 @@ FCKXHtml.TagProcessors =
 		return node ;
 	},
 
-	script : function( node, htmlNode )
+	area : function( node, htmlNode )
 	{
-		// The "TYPE" attribute is required in XHTML.
-		if ( ! node.attributes.getNamedItem( 'type' ) )
-			FCKXHtml._AppendAttribute( node, 'type', 'text/javascript' ) ;
+		var sSavedUrl = htmlNode.getAttribute( '_fcksavedurl' ) ;
+		if ( sSavedUrl != null )
+			FCKXHtml._AppendAttribute( node, 'href', sSavedUrl ) ;
 
-		node.appendChild( FCKXHtml.XML.createTextNode( FCKXHtml._AppendSpecialItem( htmlNode.text ) ) ) ;
+		// IE ignores the "COORDS" and "SHAPE" attribute so we must add it manually.
+		if ( FCKBrowserInfo.IsIE )
+		{
+			if ( ! node.attributes.getNamedItem( 'coords' ) )
+			{
+				var sCoords = htmlNode.getAttribute( 'coords', 2 ) ;
+				if ( sCoords && sCoords != '0,0,0' )
+					FCKXHtml._AppendAttribute( node, 'coords', sCoords ) ;
+			}
+
+			if ( ! node.attributes.getNamedItem( 'shape' ) )
+			{
+				var sShape = htmlNode.getAttribute( 'shape', 2 ) ;
+				if ( sShape && sShape.length > 0 )
+					FCKXHtml._AppendAttribute( node, 'shape', sShape.toLowerCase() ) ;
+			}
+		}
 
 		return node ;
 	},
 
-	style : function( node, htmlNode )
+	body : function( node, htmlNode )
 	{
-		// The "TYPE" attribute is required in XHTML.
-		if ( ! node.attributes.getNamedItem( 'type' ) )
-			FCKXHtml._AppendAttribute( node, 'type', 'text/css' ) ;
+		node = FCKXHtml._AppendChildNodes( node, htmlNode, false ) ;
+		// Remove spellchecker attributes added for Firefox when converting to HTML code (Bug #1351).
+		node.removeAttribute( 'spellcheck' ) ;
+		return node ;
+	},
 
-		var cssText = htmlNode.innerHTML ;
-		if ( FCKBrowserInfo.IsIE )	// Bug #403 : IE always appends a \r\n to the beginning of StyleNode.innerHTML
-			cssText = cssText.replace( /^(\r\n|\n|\r)/, '' ) ;
+	// IE loses contents of iframes, and Gecko does give it back HtmlEncoded
+	// Note: Opera does lose the content and doesn't provide it in the innerHTML string
+	iframe : function( node, htmlNode )
+	{
+		var sHtml = htmlNode.innerHTML ;
 
-		node.appendChild( FCKXHtml.XML.createTextNode( FCKXHtml._AppendSpecialItem( cssText ) ) ) ;
+		// Gecko does give back the encoded html
+		if ( FCKBrowserInfo.IsGecko )
+			sHtml = FCKTools.HTMLDecode( sHtml );
+
+		// Remove the saved urls here as the data won't be processed as nodes
+		sHtml = sHtml.replace( /\s_fcksavedurl="[^"]*"/g, '' ) ;
+
+		node.appendChild( FCKXHtml.XML.createTextNode( FCKXHtml._AppendSpecialItem( sHtml ) ) ) ;
 
 		return node ;
 	},
 
-	pre : function ( node, htmlNode )
+	img : function( node, htmlNode )
 	{
-		for ( var i = 0 ; i < htmlNode.childNodes.length ; i++ )
-		{
-			var item = htmlNode.childNodes[i] ;
-			var val = item.nodeValue ;
-			if ( item.nodeType == 3 && i == 0 )
-				node.appendChild( FCKXHtml.XML.createTextNode( FCKXHtml._AppendSpecialItem( '\r\n' + val ) ) ) ;
-			else
-				FCKXHtml._AppendNode( node, item ) ;
-		}
+		// The "ALT" attribute is required in XHTML.
+		if ( ! node.attributes.getNamedItem( 'alt' ) )
+			FCKXHtml._AppendAttribute( node, 'alt', '' ) ;
+
+		var sSavedUrl = htmlNode.getAttribute( '_fcksavedurl' ) ;
+		if ( sSavedUrl != null )
+			FCKXHtml._AppendAttribute( node, 'src', sSavedUrl ) ;
+
 		return node ;
 	},
 
-	title : function( node, htmlNode )
+	// Fix orphaned <li> nodes (Bug #503).
+	li : function( node, htmlNode, targetNode )
 	{
-		node.appendChild( FCKXHtml.XML.createTextNode( FCK.EditorDocument.title ) ) ;
+		// If the XML parent node is already a <ul> or <ol>, then add the <li> as usual.
+		if ( targetNode.nodeName.IEquals( ['ul', 'ol'] ) )
+			return FCKXHtml._AppendChildNodes( node, htmlNode, true ) ;
 
-		return node ;
+		var newTarget = FCKXHtml.XML.createElement( 'ul' ) ;
+
+		// Reset the _fckxhtmljob so the HTML node is processed again.
+		htmlNode._fckxhtmljob = null ;
+
+		// Loop through all sibling LIs, adding them to the <ul>.
+		do
+		{
+			FCKXHtml._AppendNode( newTarget, htmlNode ) ;
+
+			// Look for the next element following this <li>.
+			do
+			{
+				htmlNode = FCKDomTools.GetNextSibling( htmlNode ) ;
+
+			} while ( htmlNode && htmlNode.nodeType == 3 && htmlNode.nodeValue.Trim().length == 0 )
+
+		}	while ( htmlNode && htmlNode.nodeName.toLowerCase() == 'li' )
+
+		return newTarget ;
 	},
 
 	// Fix nested <ul> and <ol>.
@@ -419,6 +455,29 @@ FCKXHtml.TagProcessors =
 		return node ;
 	},
 
+	pre : function ( node, htmlNode )
+	{
+		var firstChild = htmlNode.firstChild ;
+
+		if ( firstChild && firstChild.nodeType == 3 )
+			node.appendChild( FCKXHtml.XML.createTextNode( FCKXHtml._AppendSpecialItem( '\r\n' ) ) ) ;
+
+		FCKXHtml._AppendChildNodes( node, htmlNode, true ) ;
+
+		return node ;
+	},
+
+	script : function( node, htmlNode )
+	{
+		// The "TYPE" attribute is required in XHTML.
+		if ( ! node.attributes.getNamedItem( 'type' ) )
+			FCKXHtml._AppendAttribute( node, 'type', 'text/javascript' ) ;
+
+		node.appendChild( FCKXHtml.XML.createTextNode( FCKXHtml._AppendSpecialItem( htmlNode.text ) ) ) ;
+
+		return node ;
+	},
+
 	span : function( node, htmlNode )
 	{
 		// Firefox may create empty tags when deleting the selection in some special cases (SF-BUG 1084404).
@@ -430,29 +489,25 @@ FCKXHtml.TagProcessors =
 		return node ;
 	},
 
-	// IE loses contents of iframes, and Gecko does give it back HtmlEncoded
-	// Note: Opera does lose the content and doesn't provide it in the innerHTML string
-	iframe : function( node, htmlNode )
+	style : function( node, htmlNode )
 	{
-		var sHtml = htmlNode.innerHTML ;
-
-		// Gecko does give back the encoded html
-		if ( FCKBrowserInfo.IsGecko )
-			sHtml = FCKTools.HTMLDecode( sHtml );
+		// The "TYPE" attribute is required in XHTML.
+		if ( ! node.attributes.getNamedItem( 'type' ) )
+			FCKXHtml._AppendAttribute( node, 'type', 'text/css' ) ;
 
-		// Remove the saved urls here as the data won't be processed as nodes
-		sHtml = sHtml.replace( /\s_fcksavedurl="[^"]*"/g, '' ) ;
+		var cssText = htmlNode.innerHTML ;
+		if ( FCKBrowserInfo.IsIE )	// Bug #403 : IE always appends a \r\n to the beginning of StyleNode.innerHTML
+			cssText = cssText.replace( /^(\r\n|\n|\r)/, '' ) ;
 
-		node.appendChild( FCKXHtml.XML.createTextNode( FCKXHtml._AppendSpecialItem( sHtml ) ) ) ;
+		node.appendChild( FCKXHtml.XML.createTextNode( FCKXHtml._AppendSpecialItem( cssText ) ) ) ;
 
 		return node ;
 	},
 
-	body : function( node, htmlNode )
+	title : function( node, htmlNode )
 	{
-		node = FCKXHtml._AppendChildNodes( node, htmlNode, false ) ;
-		// Remove spellchecker attributes added for Firefox when converting to HTML code (Bug #1351).
-		node.removeAttribute( 'spellcheck' ) ;
+		node.appendChild( FCKXHtml.XML.createTextNode( FCK.EditorDocument.title ) ) ;
+
 		return node ;
 	}
 } ;

data/public/javascripts/fckeditor/editor/_source/internals/fckxhtml_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 ==
  *
@@ -24,11 +24,7 @@
 
 FCKXHtml._GetMainXmlString = function()
 {
-	// Create the XMLSerializer.
-	var oSerializer = new XMLSerializer() ;
-
-	// Return the serialized XML as a string.
-	return oSerializer.serializeToString( this.MainNode ) ;
+	return ( new XMLSerializer() ).serializeToString( this.MainNode ) ;
 }
 
 FCKXHtml._AppendAttributes = function( xmlNode, htmlNode, node )
@@ -72,13 +68,13 @@ FCKXHtml._AppendAttributes = function( xmlNode, htmlNode, node )
 if ( FCKBrowserInfo.IsOpera )
 {
 	// Opera moves the <FCK:meta> element outside head (#1166).
-	
+
 	// Save a reference to the XML <head> node, so we can use it for
 	// orphan <meta>s.
 	FCKXHtml.TagProcessors['head'] = function( node, htmlNode )
 	{
 		FCKXHtml.XML._HeadElement = node ;
-		
+
 		node = FCKXHtml._AppendChildNodes( node, htmlNode, true ) ;
 
 		return node ;
@@ -91,7 +87,7 @@ if ( FCKBrowserInfo.IsOpera )
 		if ( htmlNode.parentNode.nodeName.toLowerCase() != 'head' )
 		{
 			var headElement = FCKXHtml.XML._HeadElement ;
-			
+
 			if ( headElement && xmlNode != headElement )
 			{
 				delete htmlNode._fckxhtmljob ;
@@ -102,4 +98,4 @@ if ( FCKBrowserInfo.IsOpera )
 
 		return node ;
 	}
-}
+}