typo 5.0.3.98.1 → 5.1

data/public/javascripts/fckeditor/editor/_source/internals/fcklanguagemanager.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 ==
  *
@@ -48,6 +48,7 @@ var FCKLanguageManager = FCK.Language =
 		fi		: 'Finnish',
 		fo		: 'Faroese',
 		fr		: 'French',
+		'fr-ca'	: 'French (Canada)',
 		gl		: 'Galician',
 		he		: 'Hebrew',
 		hi		: 'Hindi',

data/public/javascripts/fckeditor/editor/_source/internals/fcklisthandler.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 ==
  *
@@ -149,4 +149,4 @@ var FCKListHandler =
 
 		return false ;
 	}
-} ;
+} ;

data/public/javascripts/fckeditor/editor/_source/internals/fcklistslib.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 ==
  *
@@ -53,7 +53,10 @@ var FCKListsLib =
 
 	// Object elements for the Styles System.
 	StyleObjectElements : { img:1,hr:1,li:1,table:1,tr:1,td:1,embed:1,object:1,ol:1,ul:1 },
-	
+
+	// Elements that accept text nodes, but are not possible to edit in the browser.
+	NonEditableElements : { button:1,option:1,script:1,iframe:1,textarea:1,object:1,embed:1,map:1,applet:1 },
+
 	// Elements used to separate block contents.
 	BlockBoundaries : { p:1,div:1,h1:1,h2:1,h3:1,h4:1,h5:1,h6:1,hr:1,address:1,pre:1,ol:1,ul:1,li:1,dt:1,de:1,table:1,thead:1,tbody:1,tfoot:1,tr:1,th:1,td:1,caption:1,col:1,colgroup:1,blockquote:1,body:1 },
 	ListBoundaries  : { p:1,div:1,h1:1,h2:1,h3:1,h4:1,h5:1,h6:1,hr:1,address:1,pre:1,ol:1,ul:1,li:1,dt:1,de:1,table:1,thead:1,tbody:1,tfoot:1,tr:1,th:1,td:1,caption:1,col:1,colgroup:1,blockquote:1,body:1,br:1 }

data/public/javascripts/fckeditor/editor/_source/internals/fckplugins.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 ==
  *
@@ -43,4 +43,4 @@ FCKPlugins.Load = function()
 
 	// This is a self destroyable function (must be called once).
 	FCKPlugins.Load = null ;
-}
+}

data/public/javascripts/fckeditor/editor/_source/internals/fckregexlib.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 ==
  *
@@ -74,6 +74,7 @@ GeckoEntitiesMarker : /#\?-\:/g ,
 // like "thumbnail.php?src=someimage.jpg" (SF-BUG 1554141).
 ProtectUrlsImg	: /<img(?=\s).*?\ssrc=((?:(?:\s*)("|').*?\2)|(?:[^"'][^ >]+))/gi ,
 ProtectUrlsA	: /<a(?=\s).*?\shref=((?:(?:\s*)("|').*?\2)|(?:[^"'][^ >]+))/gi ,
+ProtectUrlsArea	: /<area(?=\s).*?\shref=((?:(?:\s*)("|').*?\2)|(?:[^"'][^ >]+))/gi ,
 
 Html4DocType	: /HTML 4\.0 Transitional/i ,
 DocTypeTag		: /<!DOCTYPE[^>]*>/i ,
@@ -92,5 +93,7 @@ InvalidSelfCloseTags : /(<(?!base|meta|link|hr|br|param|img|area|input)([a-zA-Z0
 // name is returned with $2.
 StyleVariableAttName : /#\(\s*("|')(.+?)\1[^\)]*\s*\)/g,
 
-RegExp : /^\/(.*)\/([gim]*)$/
+RegExp : /^\/(.*)\/([gim]*)$/,
+
+HtmlTag : /<[^\s<>](?:"[^"]*"|'[^']*'|[^<])*>/
 } ;

data/public/javascripts/fckeditor/editor/_source/internals/fckselection.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 ==
  *
@@ -21,7 +21,7 @@
  * Active selection functions.
  */
 
-var FCKSelection = FCK.Selection = 
+var FCKSelection = FCK.Selection =
 {
 	GetParentBlock : function()
 	{
@@ -34,7 +34,7 @@ var FCKSelection = FCK.Selection =
 		}
 		return retval ;
 	},
-	
+
 	ApplyStyle : function( styleDefinition )
 	{
 		FCKStyles.ApplyStyle( new FCKStyle( styleDefinition ) ) ;

data/public/javascripts/fckeditor/editor/_source/internals/fckselection_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,7 +30,7 @@ FCKSelection.GetType = function()
 	// Check if the actual selection is a Control (IMG, TABLE, HR, etc...).
 
 	var sel ;
-	try { sel = FCK.EditorWindow.getSelection() ; } catch (e) {}
+	try { sel = this.GetSelection() ; } catch (e) {}
 
 	if ( sel && sel.rangeCount == 1 )
 	{
@@ -51,27 +51,19 @@ FCKSelection.GetType = function()
 // element (object like and image or a table) is selected.
 FCKSelection.GetSelectedElement = function()
 {
-	var selectedElement = null ;
+	var selection = !!FCK.EditorWindow && this.GetSelection() ;
+	if ( !selection || selection.rangeCount < 1 )
+		return null ;
 
-	var selection = !!FCK.EditorWindow && FCK.EditorWindow.getSelection() ;
+	var range = selection.getRangeAt( 0 ) ;
+	if ( range.startContainer != range.endContainer || range.startContainer.nodeType != 1 || range.startOffset != range.endOffset - 1 )
+		return null ;
 
-	if ( selection && selection.anchorNode && selection.anchorNode.nodeType == 1 )
-	{
-		// This one is good for all browsers, expect Safari Mac.
-		selectedElement = selection.anchorNode.childNodes[ selection.anchorOffset ] ;
-
-		// For Safari (Mac only), the anchor node for a control selection is
-		// the control itself, which seams logic. FF and Opera use the parent
-		// as the anchor node, pointing to the control with the offset.
-		// As FF created the selection "standard", Safari would do better by
-		// following their steps.
-		if ( !selectedElement )
-			selectedElement = selection.anchorNode ;
-		else if ( selectedElement.nodeType != 1 )
-			return null ;
-	}
+	var node = range.startContainer.childNodes[ range.startOffset ] ;
+	if ( node.nodeType != 1 )
+		return null ;
 
-	return selectedElement ;
+	return node ;
 }
 
 FCKSelection.GetParentElement = function()
@@ -80,7 +72,7 @@ FCKSelection.GetParentElement = function()
 		return FCKSelection.GetSelectedElement().parentNode ;
 	else
 	{
-		var oSel = FCK.EditorWindow.getSelection() ;
+		var oSel = this.GetSelection() ;
 		if ( oSel )
 		{
 			// make the common case fast - for collapsed/nearly collapsed selections just return anchor.parent.
@@ -125,7 +117,7 @@ FCKSelection.GetBoundaryParentElement = function( startBoundary )
 		return FCKSelection.GetSelectedElement().parentNode ;
 	else
 	{
-		var oSel = FCK.EditorWindow.getSelection() ;
+		var oSel = this.GetSelection() ;
 		if ( oSel && oSel.rangeCount > 0 )
 		{
 			var range = oSel.getRangeAt( startBoundary ? 0 : ( oSel.rangeCount - 1 ) ) ;
@@ -143,14 +135,14 @@ FCKSelection.SelectNode = function( element )
 	var oRange = FCK.EditorDocument.createRange() ;
 	oRange.selectNode( element ) ;
 
-	var oSel = FCK.EditorWindow.getSelection() ;
+	var oSel = this.GetSelection() ;
 	oSel.removeAllRanges() ;
 	oSel.addRange( oRange ) ;
 }
 
 FCKSelection.Collapse = function( toStart )
 {
-	var oSel = FCK.EditorWindow.getSelection() ;
+	var oSel = this.GetSelection() ;
 
 	if ( toStart == null || toStart === true )
 		oSel.collapseToStart() ;
@@ -164,7 +156,7 @@ FCKSelection.HasAncestorNode = function( nodeTagName )
 	var oContainer = this.GetSelectedElement() ;
 	if ( ! oContainer && FCK.EditorWindow )
 	{
-		try		{ oContainer = FCK.EditorWindow.getSelection().getRangeAt(0).startContainer ; }
+		try		{ oContainer = this.GetSelection().getRangeAt(0).startContainer ; }
 		catch(e){}
 	}
 
@@ -184,7 +176,7 @@ FCKSelection.MoveToAncestorNode = function( nodeTagName )
 
 	var oContainer = this.GetSelectedElement() ;
 	if ( ! oContainer )
-		oContainer = FCK.EditorWindow.getSelection().getRangeAt(0).startContainer ;
+		oContainer = this.GetSelection().getRangeAt(0).startContainer ;
 
 	while ( oContainer )
 	{
@@ -199,7 +191,7 @@ FCKSelection.MoveToAncestorNode = function( nodeTagName )
 FCKSelection.Delete = function()
 {
 	// Gets the actual selection.
-	var oSel = FCK.EditorWindow.getSelection() ;
+	var oSel = this.GetSelection() ;
 
 	// Deletes the actual selection contents.
 	for ( var i = 0 ; i < oSel.rangeCount ; i++ )
@@ -209,3 +201,20 @@ FCKSelection.Delete = function()
 
 	return oSel ;
 }
+
+/**
+ * Returns the native selection object.
+ */
+FCKSelection.GetSelection = function()
+{
+	return FCK.EditorWindow.getSelection() ;
+}
+
+// The following are IE only features (we don't need then in other browsers
+// currently).
+FCKSelection.Save = function()
+{}
+FCKSelection.Restore = function()
+{}
+FCKSelection.Release = function()
+{}

data/public/javascripts/fckeditor/editor/_source/internals/fckselection_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 ==
  *
@@ -28,11 +28,11 @@ FCKSelection.GetType = function()
 	// So we'd better check the object returned by createRange() rather than by looking at the type.
 	try
 	{
-		var ieType = FCK.EditorDocument.selection.type ;
+		var ieType = FCKSelection.GetSelection().type ;
 		if ( ieType == 'Control' || ieType == 'Text' )
 			return ieType ;
 
-		if ( FCK.EditorDocument.selection.createRange().parentElement )
+		if ( this.GetSelection().createRange().parentElement )
 			return 'Text' ;
 	}
 	catch(e)
@@ -49,10 +49,10 @@ FCKSelection.GetSelectedElement = function()
 {
 	if ( this.GetType() == 'Control' )
 	{
-		var oRange = FCK.EditorDocument.selection.createRange() ;
+		var oRange = this.GetSelection().createRange() ;
 
 		if ( oRange && oRange.item )
-			return FCK.EditorDocument.selection.createRange().item(0) ;
+			return this.GetSelection().createRange().item(0) ;
 	}
 	return null ;
 } ;
@@ -69,7 +69,7 @@ FCKSelection.GetParentElement = function()
 			return null ;
 
 		default :
-			return FCK.EditorDocument.selection.createRange().parentElement() ;
+			return this.GetSelection().createRange().parentElement() ;
 	}
 } ;
 
@@ -86,12 +86,12 @@ FCKSelection.GetBoundaryParentElement = function( startBoundary )
 
 		default :
 			var doc = FCK.EditorDocument ;
-			
+
 			var range = doc.selection.createRange() ;
 			range.collapse( startBoundary !== false ) ;
-			
+
 			var el = range.parentElement() ;
-			
+
 			// It may happen that range is comming from outside "doc", so we
 			// must check it (#1204).
 			return FCKTools.GetElementDocument( el ) == doc ? el : null ;
@@ -101,7 +101,7 @@ FCKSelection.GetBoundaryParentElement = function( startBoundary )
 FCKSelection.SelectNode = function( node )
 {
 	FCK.Focus() ;
-	FCK.EditorDocument.selection.empty() ;
+	this.GetSelection().empty() ;
 	var oRange ;
 	try
 	{
@@ -124,7 +124,7 @@ FCKSelection.Collapse = function( toStart )
 	FCK.Focus() ;
 	if ( this.GetType() == 'Text' )
 	{
-		var oRange = FCK.EditorDocument.selection.createRange() ;
+		var oRange = this.GetSelection().createRange() ;
 		oRange.collapse( toStart == null || toStart === true ) ;
 		oRange.select() ;
 	}
@@ -135,13 +135,13 @@ FCKSelection.HasAncestorNode = function( nodeTagName )
 {
 	var oContainer ;
 
-	if ( FCK.EditorDocument.selection.type == "Control" )
+	if ( this.GetSelection().type == "Control" )
 	{
 		oContainer = this.GetSelectedElement() ;
 	}
 	else
 	{
-		var oRange  = FCK.EditorDocument.selection.createRange() ;
+		var oRange  = this.GetSelection().createRange() ;
 		oContainer = oRange.parentElement() ;
 	}
 
@@ -162,9 +162,9 @@ FCKSelection.MoveToAncestorNode = function( nodeTagName )
 	if ( ! FCK.EditorDocument )
 		return null ;
 
-	if ( FCK.EditorDocument.selection.type == "Control" )
+	if ( this.GetSelection().type == "Control" )
 	{
-		oRange = FCK.EditorDocument.selection.createRange() ;
+		oRange = this.GetSelection().createRange() ;
 		for ( i = 0 ; i < oRange.length ; i++ )
 		{
 			if (oRange(i).parentNode)
@@ -176,7 +176,7 @@ FCKSelection.MoveToAncestorNode = function( nodeTagName )
 	}
 	else
 	{
-		oRange  = FCK.EditorDocument.selection.createRange() ;
+		oRange  = this.GetSelection().createRange() ;
 		oNode = oRange.parentElement() ;
 	}
 
@@ -189,7 +189,7 @@ FCKSelection.MoveToAncestorNode = function( nodeTagName )
 FCKSelection.Delete = function()
 {
 	// Gets the actual selection.
-	var oSel = FCK.EditorDocument.selection ;
+	var oSel = this.GetSelection() ;
 
 	// Deletes the actual selection contents.
 	if ( oSel.type.toLowerCase() != "none" )
@@ -199,3 +199,77 @@ FCKSelection.Delete = function()
 
 	return oSel ;
 } ;
+
+/**
+ * Returns the native selection object.
+ */
+FCKSelection.GetSelection = function()
+{
+	this.Restore() ;
+	return FCK.EditorDocument.selection ;
+}
+
+FCKSelection.Save = function()
+{
+	// Ensures the editor has the selection focus. (#1801)
+	FCK.Focus() ;
+
+	var editorDocument = FCK.EditorDocument ;
+
+	if ( !editorDocument )
+		return ;
+
+	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 ;
+}
+
+FCKSelection._GetSelectionDocument = function( selection )
+{
+	var range = selection.createRange() ;
+	if ( !range )
+		return null;
+	else if ( range.item )
+		return FCKTools.GetElementDocument( range.item( 0 ) ) ;
+	else
+		return FCKTools.GetElementDocument( range.parentElement() ) ;
+}
+
+FCKSelection.Restore = function()
+{
+	if ( this.SelectionData )
+	{
+		FCK.IsSelectionChangeLocked = true ;
+
+		try
+		{
+			// Don't repeat the restore process if the editor document is already selected.
+			if ( this._GetSelectionDocument( FCK.EditorDocument.selection ) == FCK.EditorDocument )
+				return ;
+			this.SelectionData.select() ;
+		}
+		catch ( e ) {}
+
+		FCK.IsSelectionChangeLocked = false ;
+	}
+}
+
+FCKSelection.Release = function()
+{
+	delete this.SelectionData ;
+}

data/public/javascripts/fckeditor/editor/_source/internals/fckstyles.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 ==
  *
@@ -37,7 +37,7 @@ var FCKStyles = FCK.Styles =
 				style.ApplyToObject( FCKSelection.GetSelectedElement() ) ;
 			else
 				style.ApplyToSelection( FCK.EditorWindow ) ;
-	
+
 			FCK.Events.FireEvent( 'OnSelectionChange' ) ;
 		}
 	},
@@ -88,7 +88,7 @@ var FCKStyles = FCK.Styles =
 				var style = styles[ styleName ] ;
 				var state = style.CheckActive( path ) ;
 
-				if ( style._LastState != state )
+				if ( state != ( style._LastState || null ) )
 				{
 					style._LastState = state ;
 
@@ -210,6 +210,8 @@ var FCKStyles = FCK.Styles =
 			// Remove elements nodes that match with this style rules.
 			if ( tagsRegex.test( currentNode.nodeName ) )
 				FCKDomTools.RemoveNode( currentNode, true ) ;
+			else
+				FCKDomTools.RemoveAttributes( currentNode, FCKConfig.RemoveAttributesArray );
 
 			currentNode = nextNode ;
 		}
@@ -218,7 +220,7 @@ var FCKStyles = FCK.Styles =
 
 		FCK.Events.FireEvent( 'OnSelectionChange' ) ;
 	},
-	
+
 	GetStyle : function( styleName )
 	{
 		return this.GetStyles()[ styleName ] ;
@@ -229,14 +231,14 @@ var FCKStyles = FCK.Styles =
 		var styles = this._GetStyles ;
 		if ( !styles )
 		{
-			styles = this._GetStyles = FCKTools.Merge( 
+			styles = this._GetStyles = FCKTools.Merge(
 				this._LoadStylesCore(),
 				this._LoadStylesCustom(),
 				this._LoadStylesXml() ) ;
 		}
 		return styles ;
 	},
-	
+
 	CheckHasObjectStyle : function( elementName )
 	{
 		return !!this._ObjectStyles[ elementName ] ;
@@ -264,7 +266,10 @@ var FCKStyles = FCK.Styles =
 		if ( styleDefs )
 		{
 			for ( var styleName in styleDefs )
-				styles[ styleName ] = new FCKStyle( styleDefs[ styleName ] ) ;
+			{
+				var style = styles[ styleName ] = new FCKStyle( styleDefs[ styleName ] ) ;
+				style.Name = styleName ;
+			}
 		}
 
 		return styles ;
@@ -282,12 +287,16 @@ var FCKStyles = FCK.Styles =
 		// Load the XML file into a FCKXml object.
 		var xml = new FCKXml() ;
 		xml.LoadUrl( stylesXmlPath ) ;
-		
+
 		var stylesXmlObj = FCKXml.TransformToObject( xml.SelectSingleNode( 'Styles' ) ) ;
 
 		// Get the "Style" nodes defined in the XML file.
 		var styleNodes = stylesXmlObj.$Style ;
 
+		// Check that it did contain some valid nodes
+		if ( !styleNodes )
+			return styles ;
+
 		// Add each style to our "Styles" collection.
 		for ( var i = 0 ; i < styleNodes.length ; i++ )
 		{
@@ -325,16 +334,16 @@ var FCKStyles = FCK.Styles =
 
 			// Load override definitions.
 			var cssStyleOverrideNodes = styleNode.$Override ;
-			if ( cssStyleOverrideNodes ) 
+			if ( cssStyleOverrideNodes )
 			{
 				for ( j = 0 ; j < cssStyleOverrideNodes.length ; j++ )
 				{
 					var overrideNode = cssStyleOverrideNodes[j] ;
-					var overrideDef = 
+					var overrideDef =
 					{
 						Element : overrideNode.element
 					} ;
-					
+
 					var overrideAttNode = overrideNode.$Attribute ;
 					if ( overrideAttNode )
 					{
@@ -352,14 +361,14 @@ var FCKStyles = FCK.Styles =
 							overrideDef.Attributes[ overrideAttNode[k].name ] = overrideAttValue ;
 						}
 					}
-					
+
 					styleDef.Overrides.push( overrideDef ) ;
 				}
 			}
 
 			var style = new FCKStyle( styleDef ) ;
 			style.Name = styleNode.name || element ;
-			
+
 			if ( style.GetType() == FCK_STYLE_OBJECT )
 				this._ObjectStyles[ element ] = true ;