Index: FCKeditor/trunk/_dev/releaser/fckreleaser.php
===================================================================
--- FCKeditor/trunk/_dev/releaser/fckreleaser.php	(revision 2270)
+++ FCKeditor/trunk/_dev/releaser/fckreleaser.php	(revision 2273)
@@ -1,7 +1,7 @@
-#!/usr/bin/php -q
+﻿#!/usr/bin/php -q
 <?php
 /*
  * FCKreleaser - FCKeditor Releaser - http://www.fckeditor.net
- * Copyright (C) 2003-2007 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
@@ -24,5 +24,5 @@
 echo( "\n" ) ;
 echo( 'FCKreleaser - FCKeditor Releaser' . "\n" ) ;
-echo( 'Copyright 2003-2007 Frederico Caldeira Knabben - All rights reserved' . "\n" ) ;
+echo( 'Copyright (C) 2003-2008 Frederico Caldeira Knabben - All rights reserved' . "\n" ) ;
 echo( "\n" ) ;
 
@@ -338,5 +338,5 @@
 }
 ?>
-﻿<?php
+<?php
 
 
@@ -514,6 +514,5 @@
 			$processed = $this->_ProcessVars( $processed, $this->_Parameters ) ;
 
-		// Match "var" declarations.
-		$numVarMatches = preg_match_all( '/\bvar\b\s+((?:({(?:(?>[^{}]*)|(?2))*})|[^;])+?)(?=(?:\bin\b)|;)/', $processed, $varsMatches ) ;
+		$numVarMatches = preg_match_all( '/\bvar\b\s+([\w_][\w\d_]+)/', $processed, $varsMatches ) ;
 
 		if ( $numVarMatches > 0 )
@@ -523,18 +522,5 @@
 			for ( $i = 0 ; $i < $numVarMatches ; $i++ )
 			{
-				$varsMatch = $varsMatches[1][$i];
-				
-				// Removed all (...), [...] and {...} blocks from the var
-				// statement to avoid problems with commas inside them.
-				$varsMatch = preg_replace( '/(\((?:(?>[^\(\)]*)|(?1))*\))+/', '', $varsMatch ) ;
-				$varsMatch = preg_replace( '/(\[(?:(?>[^\[\]]*)|(?1))*\])+/', '', $varsMatch ) ;
-				$varsMatch = preg_replace( '/({(?:(?>[^{}]*)|(?1))*})+/', '', $varsMatch ) ;
-				
-				$numVarNameMatches = preg_match_all( '/(?:^|,)\s*([^\s=,]+)/', $varsMatch, $varNameMatches ) ;
-				
-				for ( $j = 0 ; $j < $numVarNameMatches ; $j++ )
-				{
-					$vars[] = $varNameMatches[1][$j] ;
-				}
+				$vars[] = $varsMatches[1][$i] ;
 			}
 
@@ -550,5 +536,5 @@
 		{
 			if ( strlen( $var) > 1 )
-				$source = preg_replace( '/(?<!\w|\d|\.)' . preg_quote( $var ) . '(?!\w|\d)/', $this->_GetVarName(), $source ) ;
+				$source = preg_replace( '/(?<!\w|\d|\.)' . $var . '(?!\w|\d)/', $this->_GetVarName(), $source ) ;
 		}
 
@@ -566,5 +552,5 @@
 		$var = $this->_VarPrefix . $this->_VarChars[ $this->_LastCharIndex++ ] ;
 
-		if ( preg_match( '/(?<!\w|\d|\.)' . preg_quote( $var ) . '(?!\w|\d)/', $this->_Function ) )
+		if ( preg_match( '/(?<!\w|\d|\.)' . $var . '(?!\w|\d)/', $this->_Function ) )
 			return $this->_GetVarName() ;
 		else
@@ -589,5 +575,4 @@
 
 ?>
-
 <?php
 
@@ -710,29 +695,11 @@
 			$parameters = preg_split( '/\s*,\s*/', trim( $match[1] ) ) ;
 
-		$hasfuncProcessor = isset( $GLOBALS['funcProcessor'] ) ;
-
-		if ( $hasfuncProcessor != TRUE )
-			$GLOBALS['funcProcessor'] = new FCKFunctionProcessor( $match[0], $parameters, false ) ;
-		else
-		{
-			$GLOBALS['funcProcessor']->_Function = $match[0];
-			$GLOBALS['funcProcessor']->_Parameters = $parameters;
-		}
-
-		$processed = $GLOBALS['funcProcessor']->Process() ;
-		
-		$processed = substr_replace( $processed, '', 0, 8 ) ;
-
-		$processed = FCKJavaScriptCompressor::_ProcessFunctions( $processed ) ;
-
-		if ( $hasfuncProcessor != TRUE )
-			unset( $GLOBALS['funcProcessor'] ) ;
-		
-		return 'function'. $processed ;
-	}
-}
-
-?>
-
+		$funcProcessor = new FCKFunctionProcessor( $match[0], $parameters, false ) ;
+
+		return $funcProcessor->Process() ;
+	}
+}
+
+?>
 <?php
 
@@ -1094,5 +1061,4 @@
 
 ?>
-
 <?php
 
Index: FCKeditor/trunk/_samples/html/assets/sample06.config.js
===================================================================
--- FCKeditor/trunk/_samples/html/assets/sample06.config.js	(revision 2273)
+++ FCKeditor/trunk/_samples/html/assets/sample06.config.js	(revision 2273)
@@ -0,0 +1,49 @@
+﻿/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 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 ==
+ *
+ * Sample custom configuration settings used in the plugin sample page (sample06).
+ */
+
+// Set our sample toolbar.
+FCKConfig.ToolbarSets['PluginTest'] = [
+	['SourceSimple'],
+	['My_Find','My_Replace','-','Placeholder'],
+	['StyleSimple','FontFormatSimple','FontNameSimple','FontSizeSimple'],
+	['Table','-','TableInsertRowAfter','TableDeleteRows','TableInsertColumnAfter','TableDeleteColumns','TableInsertCellAfter','TableDeleteCells','TableMergeCells','TableHorizontalSplitCell','TableCellProp'],
+	['Bold','Italic','-','OrderedList','UnorderedList','-','Link','Unlink'],
+	'/',
+	['My_BigStyle','-','Smiley','-','About']
+] ;
+
+// Change the default plugin path.
+FCKConfig.PluginsPath = FCKConfig.BasePath.substr(0, FCKConfig.BasePath.length - 7) + '_samples/_plugins/' ;
+
+// Add our plugin to the plugins list.
+//		FCKConfig.Plugins.Add( pluginName, availableLanguages )
+//			pluginName: The plugin name. The plugin directory must match this name.
+//			availableLanguages: a list of available language files for the plugin (separated by a comma).
+FCKConfig.Plugins.Add( 'findreplace', 'en,fr,it' ) ;
+FCKConfig.Plugins.Add( 'samples' ) ;
+
+// If you want to use plugins found on other directories, just use the third parameter.
+var sOtherPluginPath = FCKConfig.BasePath.substr(0, FCKConfig.BasePath.length - 7) + 'editor/plugins/' ;
+FCKConfig.Plugins.Add( 'placeholder', 'de,en,es,fr,it,pl', sOtherPluginPath ) ;
+FCKConfig.Plugins.Add( 'tablecommands', null, sOtherPluginPath ) ;
+FCKConfig.Plugins.Add( 'simplecommands', null, sOtherPluginPath ) ;
Index: FCKeditor/trunk/_samples/html/assets/sample11_frame.html
===================================================================
--- FCKeditor/trunk/_samples/html/assets/sample11_frame.html	(revision 2273)
+++ FCKeditor/trunk/_samples/html/assets/sample11_frame.html	(revision 2273)
@@ -0,0 +1,69 @@
+<!--
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 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 ==
+ *
+ * Sample page.
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<title>FCKeditor - Sample</title>
+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+	<meta name="robots" content="noindex, nofollow" />
+	<link href="../sample.css" rel="stylesheet" type="text/css" />
+	<script type="text/javascript" src="../../../fckeditor.js"></script>
+</head>
+<body>
+	<form action="../../php/sampleposteddata.php" method="post" target="_blank">
+		Normal text field:<br />
+		<input name="NormaText" value="Plain Text" />
+		<br />
+		<br />
+		FCKeditor 1:
+		<script type="text/javascript">
+<!--
+// Automatically calculates the editor base path based on the _samples directory.
+// This is usefull only for these samples. A real application should use something like this:
+// oFCKeditor.BasePath = '/fckeditor/' ;	// '/fckeditor/' is the default value.
+var sBasePath = document.location.href.substring(0,document.location.href.lastIndexOf('_samples')) ;
+
+var oFCKeditor = new FCKeditor( 'FCKeditor_1' ) ;
+oFCKeditor.BasePath	= sBasePath ;
+oFCKeditor.Height = 100 ;
+oFCKeditor.Config[ 'ToolbarLocation' ] = 'Out:parent(xToolbar)' ;
+oFCKeditor.Value = '<p>This is some <strong>sample text<\/strong>. You are using <a href="http://www.fckeditor.net/">FCKeditor<\/a>.<\/p>' ;
+oFCKeditor.Create() ;
+//-->
+		</script>
+		<br />
+		FCKeditor 2:
+		<script type="text/javascript">
+<!--
+oFCKeditor = new FCKeditor( 'FCKeditor_2' ) ;
+oFCKeditor.BasePath	= sBasePath ;
+oFCKeditor.Height = 100 ;
+oFCKeditor.Config[ 'ToolbarLocation' ] = 'Out:parent(xToolbar)' ;
+oFCKeditor.Value = '<p>This is some <strong>sample text<\/strong>. You are using <a href="http://www.fckeditor.net/">FCKeditor<\/a>.<\/p>' ;
+oFCKeditor.Create() ;
+//-->
+		</script>
+		<br />
+		<input type="submit" value="Submit" />
+	</form>
+</body>
+</html>
Index: FCKeditor/trunk/_samples/html/assets/sample14.config.js
===================================================================
--- FCKeditor/trunk/_samples/html/assets/sample14.config.js	(revision 2273)
+++ FCKeditor/trunk/_samples/html/assets/sample14.config.js	(revision 2273)
@@ -0,0 +1,121 @@
+﻿/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 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 settings used by the XHTML 1.1 sample page (sample14.html).
+ */
+
+// Our intention is force all formatting features to use CSS classes or
+// semantic aware elements.
+
+// Load our custom CSS files for this sample.
+// We are using "BasePath" just for this sample convenience. In normal
+// situations it would be just pointed to the file directly,
+// like "/css/myfile.css".
+FCKConfig.EditorAreaCSS = FCKConfig.BasePath + '../_samples/html/assets/sample14.styles.css' ;
+
+/**
+ * Core styles.
+ */
+FCKConfig.CoreStyles.Bold			= { Element : 'span', Attributes : { 'class' : 'Bold' } } ;
+FCKConfig.CoreStyles.Italic			= { Element : 'span', Attributes : { 'class' : 'Italic' } } ;
+FCKConfig.CoreStyles.Underline		= { Element : 'span', Attributes : { 'class' : 'Underline' } } ;
+FCKConfig.CoreStyles.StrikeThrough	= { Element : 'span', Attributes : { 'class' : 'StrikeThrough' } } ;
+
+/**
+ * Font face
+ */
+// List of fonts available in the toolbar combo. Each font definition is
+// separated by a semi-colon (;). We are using class names here, so each font
+// is defined by {Class Name}/{Combo Label}.
+FCKConfig.FontNames = 'FontComic/Comic Sans MS;FontCourier/Courier New;FontTimes/Times New Roman' ;
+
+// Define the way font elements will be applied to the document. The "span"
+// element will be used. When a font is selected, the font name defined in the
+// above list is passed to this definition with the name "Font", being it
+// injected in the "class" attribute.
+// We must also instruct the editor to replace span elements that are used to
+// set the font (Overrides).
+FCKConfig.CoreStyles.FontFace =
+	{
+		Element		: 'span',
+		Attributes	: { 'class' : '#("Font")' },
+		Overrides	: [ { Element : 'span', Attributes : { 'class' : /^Font(?:Comic|Courier|Times)$/ } } ]
+	} ;
+
+/**
+ * Font sizes.
+ */
+FCKConfig.FontSizes		= 'FontSmaller/Smaller;FontLarger/Larger;FontSmall/8pt;FontBig/14pt;FontDouble/Double Size' ;
+FCKConfig.CoreStyles.Size =
+	{
+		Element		: 'span',
+		Attributes	: { 'class' : '#("Size")' },
+		Overrides	: [ { Element : 'span', Attributes : { 'class' : /^Font(?:Smaller|Larger|Small|Big|Double)$/ } } ]
+	} ;
+
+/**
+ * Font colors.
+ */
+FCKConfig.EnableMoreFontColors = false ;
+FCKConfig.FontColors = 'ff9900/FontColor1,0066cc/FontColor2,ff0000/FontColor3' ;
+FCKConfig.CoreStyles.Color =
+	{
+		Element		: 'span',
+		Attributes	: { 'class' : '#("Color")' },
+		Overrides	: [ { Element : 'span', Attributes : { 'class' : /^FontColor(?:1|2|3)$/ } } ]
+	} ;
+
+FCKConfig.CoreStyles.BackColor =
+	{
+		Element		: 'span',
+		Attributes	: { 'class' : '#("Color")BG' },
+		Overrides	: [ { Element : 'span', Attributes : { 'class' : /^FontColor(?:1|2|3)BG$/ } } ]
+	} ;
+
+/**
+ * Indentation.
+ */
+FCKConfig.IndentClasses = [ 'Indent1', 'Indent2', 'Indent3' ] ;
+
+/**
+ * Paragraph justification.
+ */
+FCKConfig.JustifyClasses = [ 'JustifyLeft', 'JustifyCenter', 'JustifyRight', 'JustifyFull' ] ;
+
+/**
+ * Styles combo.
+ */
+FCKConfig.StylesXmlPath = '' ;
+FCKConfig.CustomStyles =
+	{
+		'Strong Emphasis' : { Element : 'strong' },
+		'Emphasis' : { Element : 'em' },
+
+		'Computer Code' : { Element : 'code' },
+		'Keyboard Phrase' : { Element : 'kbd' },
+		'Sample Text' : { Element : 'samp' },
+		'Variable' : { Element : 'var' },
+
+		'Deleted Text' : { Element : 'del' },
+		'Inserted Text' : { Element : 'ins' },
+
+		'Cited Work' : { Element : 'cite' },
+		'Inline Quotation' : { Element : 'q' }
+	} ;
Index: FCKeditor/trunk/_samples/html/assets/sample14.styles.css
===================================================================
--- FCKeditor/trunk/_samples/html/assets/sample14.styles.css	(revision 2273)
+++ FCKeditor/trunk/_samples/html/assets/sample14.styles.css	(revision 2273)
@@ -0,0 +1,228 @@
+﻿/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 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 ==
+ *
+ * Styles used by the XHTML 1.1 sample page (sample14.html).
+ */
+
+/**
+ * Basic definitions for the editing area.
+ */
+body
+{
+	background-color: #ffffff;
+	padding: 5px 5px 5px 5px;
+	margin: 0px;
+}
+
+body, td
+{
+	font-family: Arial, Verdana, sans-serif;
+	font-size: 12px;
+}
+
+a[href]
+{
+	color: #0000FF !important; /* For Firefox... mark as important, otherwise it becomes black */
+}
+
+/**
+ * Core styles.
+ */
+
+.Bold
+{
+	font-weight: bold;
+}
+
+.Italic
+{
+	font-style: italic;
+}
+
+.Underline
+{
+	text-decoration: underline;
+}
+
+.StrikeThrough
+{
+	text-decoration: line-through;
+}
+
+.Subscript
+{
+	vertical-align: sub;
+	font-size: smaller;
+}
+
+.Superscript
+{
+	vertical-align: super;
+	font-size: smaller;
+}
+
+/**
+ * Font faces.
+ */
+
+.FontComic
+{
+	font-family: 'Comic Sans MS';
+}
+
+.FontCourier
+{
+	font-family: 'Courier New';
+}
+
+.FontTimes
+{
+	font-family: 'Times New Roman';
+}
+
+/**
+ * Font sizes.
+ */
+
+.FontSmaller
+{
+	font-size: smaller;
+}
+
+.FontLarger
+{
+	font-size: larger;
+}
+
+.FontSmall
+{
+	font-size: 8pt;
+}
+
+.FontBig
+{
+	font-size: 14pt;
+}
+
+.FontDouble
+{
+	font-size: 200%;
+}
+
+/**
+ * Font colors.
+ */
+.FontColor1
+{
+	color: #ff9900;
+}
+
+.FontColor2
+{
+	color: #0066cc;
+}
+
+.FontColor3
+{
+	color: #ff0000;
+}
+
+.FontColor1BG
+{
+	background-color: #ff9900;
+}
+
+.FontColor2BG
+{
+	background-color: #0066cc;
+}
+
+.FontColor3BG
+{
+	background-color: #ff0000;
+}
+
+/**
+ * Indentation.
+ */
+
+.Indent1
+{
+	margin-left: 40px;
+}
+
+.Indent2
+{
+	margin-left: 80px;
+}
+
+.Indent3
+{
+	margin-left: 120px;
+}
+
+/**
+ * Alignment.
+ */
+
+.JustifyLeft
+{
+	text-align: left;
+}
+
+.JustifyRight
+{
+	text-align: right;
+}
+
+.JustifyCenter
+{
+	text-align: center;
+}
+
+.JustifyFull
+{
+	text-align: justify;
+}
+
+/**
+ * Other.
+ */
+
+code
+{
+	font-family: courier, monospace;
+	background-color: #eeeeee;
+	padding-left: 1px;
+	padding-right: 1px;
+	border: #c0c0c0 1px solid;
+}
+
+kbd
+{
+	padding: 0px 1px 0px 1px;
+	border-width: 1px 2px 2px 1px;
+	border-style: solid;
+}
+
+blockquote
+{
+	color: #808080;
+}
Index: FCKeditor/trunk/_samples/html/assets/sample15.config.js
===================================================================
--- FCKeditor/trunk/_samples/html/assets/sample15.config.js	(revision 2273)
+++ FCKeditor/trunk/_samples/html/assets/sample15.config.js	(revision 2273)
@@ -0,0 +1,92 @@
+﻿/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 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 settings used by the XHTML 1.1 sample page (sample14.html).
+ */
+
+// Our intention is force all formatting features to use CSS classes or
+// semantic aware elements.
+
+/**
+ * Core styles.
+ */
+FCKConfig.CoreStyles.Bold			= { Element : 'b' } ;
+FCKConfig.CoreStyles.Italic			= { Element : 'i' } ;
+FCKConfig.CoreStyles.Underline		= { Element : 'u' } ;
+FCKConfig.CoreStyles.StrikeThrough	= { Element : 'strike' } ;
+
+/**
+ * Font face
+ */
+// Define the way font elements will be applied to the document. The "span"
+// element will be used. When a font is selected, the font name defined in the
+// above list is passed to this definition with the name "Font", being it
+// injected in the "class" attribute.
+// We must also instruct the editor to replace span elements that are used to
+// set the font (Overrides).
+FCKConfig.CoreStyles.FontFace =
+	{
+		Element		: 'font',
+		Attributes	: { 'face' : '#("Font")' }
+	} ;
+
+/**
+ * Font sizes.
+ */
+FCKConfig.FontSizes		= '1/xx-small;2/x-small;3/small;4/medium;5/large;6/x-large;7/xx-large' ;
+FCKConfig.CoreStyles.Size =
+	{
+		Element		: 'font',
+		Attributes	: { 'size' : '#("Size")' }
+	} ;
+
+/**
+ * Font colors.
+ */
+FCKConfig.EnableMoreFontColors = true ;
+FCKConfig.CoreStyles.Color =
+	{
+		Element		: 'font',
+		Attributes	: { 'color' : '#("Color")' }
+	} ;
+
+FCKConfig.CoreStyles.BackColor =
+	{
+		Element		: 'font',
+		Styles		: { 'background-color' : '#("Color","color")' }
+	} ;
+
+/**
+ * Styles combo.
+ */
+FCKConfig.StylesXmlPath = '' ;
+FCKConfig.CustomStyles =
+	{
+		'Computer Code' : { Element : 'code' },
+		'Keyboard Phrase' : { Element : 'kbd' },
+		'Sample Text' : { Element : 'samp' },
+		'Variable' : { Element : 'var' },
+
+		'Deleted Text' : { Element : 'del' },
+		'Inserted Text' : { Element : 'ins' },
+
+		'Cited Work' : { Element : 'cite' },
+		'Inline Quotation' : { Element : 'q' }
+	} ;
Index: FCKeditor/trunk/_samples/html/assets/sample16.config.js
===================================================================
--- FCKeditor/trunk/_samples/html/assets/sample16.config.js	(revision 2273)
+++ FCKeditor/trunk/_samples/html/assets/sample16.config.js	(revision 2273)
@@ -0,0 +1,92 @@
+﻿/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 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 settings used by the XHTML 1.1 sample page (sample14.html).
+ */
+
+// Our intention is force all formatting features to use CSS classes or
+// semantic aware elements.
+
+/**
+ * Core styles.
+ */
+FCKConfig.CoreStyles.Bold			= { Element : 'b' } ;
+FCKConfig.CoreStyles.Italic			= { Element : 'i' } ;
+FCKConfig.CoreStyles.Underline		= { Element : 'u' } ;
+
+/**
+ * Font face
+ */
+// Define the way font elements will be applied to the document. The "span"
+// element will be used. When a font is selected, the font name defined in the
+// above list is passed to this definition with the name "Font", being it
+// injected in the "class" attribute.
+// We must also instruct the editor to replace span elements that are used to
+// set the font (Overrides).
+FCKConfig.CoreStyles.FontFace =
+	{
+		Element		: 'font',
+		Attributes	: { 'face' : '#("Font")' }
+	} ;
+
+/**
+ * Font sizes.
+ * The CSS part of the font sizes isn't used by Flash, it is there to get the
+ * font rendered correctly in FCKeditor.
+ */
+FCKConfig.FontSizes		= '8/8px;9/9px;10/10px;11/11px;12/12px;14/14px;16/16px;18/18px;20/20px;22/22px;24/24px;26/26px;28/28px;36/36px;48/48px;72/72px' ;
+FCKConfig.CoreStyles.Size =
+	{
+		Element		: 'font',
+		Attributes	: { 'size' : '#("Size")' },
+		Styles		: { 'font-size' : '#("Size","fontSize")' }
+	} ;
+
+/**
+ * Font colors.
+ */
+FCKConfig.EnableMoreFontColors = true ;
+FCKConfig.CoreStyles.Color =
+	{
+		Element		: 'font',
+		Attributes	: { 'color' : '#("Color")' }
+	} ;
+/**
+ * Styles combo.
+ */
+FCKConfig.StylesXmlPath = '' ;
+FCKConfig.CustomStyles =
+	{
+	} ;
+
+/**
+ * Toolbar set for Flash HTML editing.
+ */
+FCKConfig.ToolbarSets['Flash'] = [
+	['Source','-','Bold','Italic','Underline','-','UnorderedList','-','Link','Unlink'],
+	['FontName','FontSize','-','About']
+] ;
+
+/**
+ * Flash specific formatting settings.
+ */
+FCKConfig.EditorAreaStyles = 'p, ol, ul {margin-top: 0px; margin-bottom: 0px;}' ;
+FCKConfig.FormatSource = false ;
+FCKConfig.FormatOutput = false ;
Index: FCKeditor/trunk/_samples/html/assets/swfobject.js
===================================================================
--- FCKeditor/trunk/_samples/html/assets/swfobject.js	(revision 2273)
+++ FCKeditor/trunk/_samples/html/assets/swfobject.js	(revision 2273)
@@ -0,0 +1,17 @@
+/**
+ * SWFObject v1.5: Flash Player detection and embed - http://blog.deconcept.com/swfobject/
+ *
+ * SWFObject is (c) 2007 Geoff Stearns and is released under the MIT License:
+ * http://www.opensource.org/licenses/mit-license.php
+ *
+ */
+/*
+Copyright (c) 2007 Geoff Stearns
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+if(typeof deconcept=="undefined"){var deconcept=new Object();}if(typeof deconcept.util=="undefined"){deconcept.util=new Object();}if(typeof deconcept.SWFObjectUtil=="undefined"){deconcept.SWFObjectUtil=new Object();}deconcept.SWFObject=function(_1,id,w,h,_5,c,_7,_8,_9,_a){if(!document.getElementById){return;}this.DETECT_KEY=_a?_a:"detectflash";this.skipDetect=deconcept.util.getRequestParameter(this.DETECT_KEY);this.params=new Object();this.variables=new Object();this.attributes=new Array();if(_1){this.setAttribute("swf",_1);}if(id){this.setAttribute("id",id);}if(w){this.setAttribute("width",w);}if(h){this.setAttribute("height",h);}if(_5){this.setAttribute("version",new deconcept.PlayerVersion(_5.toString().split(".")));}this.installedVer=deconcept.SWFObjectUtil.getPlayerVersion();if(!window.opera&&document.all&&this.installedVer.major>7){deconcept.SWFObject.doPrepUnload=true;}if(c){this.addParam("bgcolor",c);}var q=_7?_7:"high";this.addParam("quality",q);this.setAttribute("useExpressInstall",false);this.setAttribute("doExpressInstall",false);var _c=(_8)?_8:window.location;this.setAttribute("xiRedirectUrl",_c);this.setAttribute("redirectUrl","");if(_9){this.setAttribute("redirectUrl",_9);}};deconcept.SWFObject.prototype={useExpressInstall:function(_d){this.xiSWFPath=!_d?"expressinstall.swf":_d;this.setAttribute("useExpressInstall",true);},setAttribute:function(_e,_f){this.attributes[_e]=_f;},getAttribute:function(_10){return this.attributes[_10];},addParam:function(_11,_12){this.params[_11]=_12;},getParams:function(){return this.params;},addVariable:function(_13,_14){this.variables[_13]=_14;},getVariable:function(_15){return this.variables[_15];},getVariables:function(){return this.variables;},getVariablePairs:function(){var _16=new Array();var key;var _18=this.getVariables();for(key in _18){_16[_16.length]=key+"="+_18[key];}return _16;},getSWFHTML:function(){var _19="";if(navigator.plugins&&navigator.mimeTypes&&navigator.mimeTypes.length){if(this.getAttribute("doExpressInstall")){this.addVariable("MMplayerType","PlugIn");this.setAttribute("swf",this.xiSWFPath);}_19="<embed type=\"application/x-shockwave-flash\" src=\""+this.getAttribute("swf")+"\" width=\""+this.getAttribute("width")+"\" height=\""+this.getAttribute("height")+"\" style=\""+this.getAttribute("style")+"\"";_19+=" id=\""+this.getAttribute("id")+"\" name=\""+this.getAttribute("id")+"\" ";var _1a=this.getParams();for(var key in _1a){_19+=[key]+"=\""+_1a[key]+"\" ";}var _1c=this.getVariablePairs().join("&");if(_1c.length>0){_19+="flashvars=\""+_1c+"\"";}_19+="/>";}else{if(this.getAttribute("doExpressInstall")){this.addVariable("MMplayerType","ActiveX");this.setAttribute("swf",this.xiSWFPath);}_19="<object id=\""+this.getAttribute("id")+"\" classid=\"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000\" width=\""+this.getAttribute("width")+"\" height=\""+this.getAttribute("height")+"\" style=\""+this.getAttribute("style")+"\">";_19+="<param name=\"movie\" value=\""+this.getAttribute("swf")+"\" />";var _1d=this.getParams();for(var key in _1d){_19+="<param name=\""+key+"\" value=\""+_1d[key]+"\" />";}var _1f=this.getVariablePairs().join("&");if(_1f.length>0){_19+="<param name=\"flashvars\" value=\""+_1f+"\" />";}_19+="</object>";}return _19;},write:function(_20){if(this.getAttribute("useExpressInstall")){var _21=new deconcept.PlayerVersion([6,0,65]);if(this.installedVer.versionIsValid(_21)&&!this.installedVer.versionIsValid(this.getAttribute("version"))){this.setAttribute("doExpressInstall",true);this.addVariable("MMredirectURL",escape(this.getAttribute("xiRedirectUrl")));document.title=document.title.slice(0,47)+" - Flash Player Installation";this.addVariable("MMdoctitle",document.title);}}if(this.skipDetect||this.getAttribute("doExpressInstall")||this.installedVer.versionIsValid(this.getAttribute("version"))){var n=(typeof _20=="string")?document.getElementById(_20):_20;n.innerHTML=this.getSWFHTML();return true;}else{if(this.getAttribute("redirectUrl")!=""){document.location.replace(this.getAttribute("redirectUrl"));}}return false;}};deconcept.SWFObjectUtil.getPlayerVersion=function(){var _23=new deconcept.PlayerVersion([0,0,0]);if(navigator.plugins&&navigator.mimeTypes.length){var x=navigator.plugins["Shockwave Flash"];if(x&&x.description){_23=new deconcept.PlayerVersion(x.description.replace(/([a-zA-Z]|\s)+/,"").replace(/(\s+r|\s+b[0-9]+)/,".").split("."));}}else{if(navigator.userAgent&&navigator.userAgent.indexOf("Windows CE")>=0){var axo=1;var _26=3;while(axo){try{_26++;axo=new ActiveXObject("ShockwaveFlash.ShockwaveFlash."+_26);_23=new deconcept.PlayerVersion([_26,0,0]);}catch(e){axo=null;}}}else{try{var axo=new ActiveXObject("ShockwaveFlash.ShockwaveFlash.7");}catch(e){try{var axo=new ActiveXObject("ShockwaveFlash.ShockwaveFlash.6");_23=new deconcept.PlayerVersion([6,0,21]);axo.AllowScriptAccess="always";}catch(e){if(_23.major==6){return _23;}}try{axo=new ActiveXObject("ShockwaveFlash.ShockwaveFlash");}catch(e){}}if(axo!=null){_23=new deconcept.PlayerVersion(axo.GetVariable("$version").split(" ")[1].split(","));}}}return _23;};deconcept.PlayerVersion=function(_29){this.major=_29[0]!=null?parseInt(_29[0]):0;this.minor=_29[1]!=null?parseInt(_29[1]):0;this.rev=_29[2]!=null?parseInt(_29[2]):0;};deconcept.PlayerVersion.prototype.versionIsValid=function(fv){if(this.major<fv.major){return false;}if(this.major>fv.major){return true;}if(this.minor<fv.minor){return false;}if(this.minor>fv.minor){return true;}if(this.rev<fv.rev){return false;}return true;};deconcept.util={getRequestParameter:function(_2b){var q=document.location.search||document.location.hash;if(_2b==null){return q;}if(q){var _2d=q.substring(1).split("&");for(var i=0;i<_2d.length;i++){if(_2d[i].substring(0,_2d[i].indexOf("="))==_2b){return _2d[i].substring((_2d[i].indexOf("=")+1));}}}return "";}};deconcept.SWFObjectUtil.cleanupSWFs=function(){var _2f=document.getElementsByTagName("OBJECT");for(var i=_2f.length-1;i>=0;i--){_2f[i].style.display="none";for(var x in _2f[i]){if(typeof _2f[i][x]=="function"){_2f[i][x]=function(){};}}}};if(deconcept.SWFObject.doPrepUnload){if(!deconcept.unloadSet){deconcept.SWFObjectUtil.prepUnload=function(){__flash_unloadHandler=function(){};__flash_savedUnloadHandler=function(){};window.attachEvent("onunload",deconcept.SWFObjectUtil.cleanupSWFs);};window.attachEvent("onbeforeunload",deconcept.SWFObjectUtil.prepUnload);deconcept.unloadSet=true;}}if(!document.getElementById&&document.all){document.getElementById=function(id){return document.all[id];};}var getQueryParamValue=deconcept.util.getRequestParameter;var FlashObject=deconcept.SWFObject;var SWFObject=deconcept.SWFObject;
Index: FCKeditor/trunk/_samples/html/sample06.config.js
===================================================================
--- FCKeditor/trunk/_samples/html/sample06.config.js	(revision 2270)
+++ 	(revision )
@@ -1,49 +1,0 @@
-﻿/*
- * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 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 ==
- *
- * Sample custom configuration settings used in the plugin sample page (sample06).
- */
-
-// Set our sample toolbar.
-FCKConfig.ToolbarSets['PluginTest'] = [
-	['SourceSimple'],
-	['My_Find','My_Replace','-','Placeholder'],
-	['StyleSimple','FontFormatSimple','FontNameSimple','FontSizeSimple'],
-	['Table','-','TableInsertRowAfter','TableDeleteRows','TableInsertColumnAfter','TableDeleteColumns','TableInsertCellAfter','TableDeleteCells','TableMergeCells','TableHorizontalSplitCell','TableCellProp'],
-	['Bold','Italic','-','OrderedList','UnorderedList','-','Link','Unlink'],
-	'/',
-	['My_BigStyle','-','Smiley','-','About']
-] ;
-
-// Change the default plugin path.
-FCKConfig.PluginsPath = FCKConfig.BasePath.substr(0, FCKConfig.BasePath.length - 7) + '_samples/_plugins/' ;
-
-// Add our plugin to the plugins list.
-//		FCKConfig.Plugins.Add( pluginName, availableLanguages )
-//			pluginName: The plugin name. The plugin directory must match this name.
-//			availableLanguages: a list of available language files for the plugin (separated by a comma).
-FCKConfig.Plugins.Add( 'findreplace', 'en,fr,it' ) ;
-FCKConfig.Plugins.Add( 'samples' ) ;
-
-// If you want to use plugins found on other directories, just use the third parameter.
-var sOtherPluginPath = FCKConfig.BasePath.substr(0, FCKConfig.BasePath.length - 7) + 'editor/plugins/' ;
-FCKConfig.Plugins.Add( 'placeholder', 'de,en,es,fr,it,pl', sOtherPluginPath ) ;
-FCKConfig.Plugins.Add( 'tablecommands', null, sOtherPluginPath ) ;
-FCKConfig.Plugins.Add( 'simplecommands', null, sOtherPluginPath ) ;
Index: FCKeditor/trunk/_samples/html/sample06.html
===================================================================
--- FCKeditor/trunk/_samples/html/sample06.html	(revision 2270)
+++ FCKeditor/trunk/_samples/html/sample06.html	(revision 2273)
@@ -58,5 +58,5 @@
 
 // Set the custom configurations file path (in this way the original file is mantained).
-oFCKeditor.Config['CustomConfigurationsPath'] = sBasePath + '_samples/html/sample06.config.js' ;
+oFCKeditor.Config['CustomConfigurationsPath'] = sBasePath + '_samples/html/assets/sample06.config.js' ;
 
 // Let's use a custom toolbar for this sample.
Index: FCKeditor/trunk/_samples/html/sample11.html
===================================================================
--- FCKeditor/trunk/_samples/html/sample11.html	(revision 2270)
+++ FCKeditor/trunk/_samples/html/sample11.html	(revision 2273)
@@ -39,5 +39,5 @@
 	<div id="xToolbar"></div>
 	<hr />
-	<iframe src="sample11_frame.html" width="100%" height="300"></iframe>
+	<iframe src="assets/sample11_frame.html" width="100%" height="300"></iframe>
 </body>
 </html>
Index: FCKeditor/trunk/_samples/html/sample11_frame.html
===================================================================
--- FCKeditor/trunk/_samples/html/sample11_frame.html	(revision 2270)
+++ 	(revision )
@@ -1,69 +1,0 @@
-<!--
- * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 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 ==
- *
- * Sample page.
--->
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-	<title>FCKeditor - Sample</title>
-	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-	<meta name="robots" content="noindex, nofollow" />
-	<link href="../sample.css" rel="stylesheet" type="text/css" />
-	<script type="text/javascript" src="../../fckeditor.js"></script>
-</head>
-<body>
-	<form action="../php/sampleposteddata.php" method="post" target="_blank">
-		Normal text field:<br />
-		<input name="NormaText" value="Plain Text" />
-		<br />
-		<br />
-		FCKeditor 1:
-		<script type="text/javascript">
-<!--
-// Automatically calculates the editor base path based on the _samples directory.
-// This is usefull only for these samples. A real application should use something like this:
-// oFCKeditor.BasePath = '/fckeditor/' ;	// '/fckeditor/' is the default value.
-var sBasePath = document.location.href.substring(0,document.location.href.lastIndexOf('_samples')) ;
-
-var oFCKeditor = new FCKeditor( 'FCKeditor_1' ) ;
-oFCKeditor.BasePath	= sBasePath ;
-oFCKeditor.Height = 100 ;
-oFCKeditor.Config[ 'ToolbarLocation' ] = 'Out:parent(xToolbar)' ;
-oFCKeditor.Value = '<p>This is some <strong>sample text<\/strong>. You are using <a href="http://www.fckeditor.net/">FCKeditor<\/a>.<\/p>' ;
-oFCKeditor.Create() ;
-//-->
-		</script>
-		<br />
-		FCKeditor 2:
-		<script type="text/javascript">
-<!--
-oFCKeditor = new FCKeditor( 'FCKeditor_2' ) ;
-oFCKeditor.BasePath	= sBasePath ;
-oFCKeditor.Height = 100 ;
-oFCKeditor.Config[ 'ToolbarLocation' ] = 'Out:parent(xToolbar)' ;
-oFCKeditor.Value = '<p>This is some <strong>sample text<\/strong>. You are using <a href="http://www.fckeditor.net/">FCKeditor<\/a>.<\/p>' ;
-oFCKeditor.Create() ;
-//-->
-		</script>
-		<br />
-		<input type="submit" value="Submit" />
-	</form>
-</body>
-</html>
Index: FCKeditor/trunk/_samples/html/sample14.config.js
===================================================================
--- FCKeditor/trunk/_samples/html/sample14.config.js	(revision 2270)
+++ 	(revision )
@@ -1,121 +1,0 @@
-﻿/*
- * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 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 settings used by the XHTML 1.1 sample page (sample14.html).
- */
-
-// Our intention is force all formatting features to use CSS classes or
-// semantic aware elements.
-
-// Load our custom CSS files for this sample.
-// We are using "BasePath" just for this sample convenience. In normal
-// situations it would be just pointed to the file directly,
-// like "/css/myfile.css".
-FCKConfig.EditorAreaCSS = FCKConfig.BasePath + '../_samples/html/sample14.styles.css' ;
-
-/**
- * Core styles.
- */
-FCKConfig.CoreStyles.Bold			= { Element : 'span', Attributes : { 'class' : 'Bold' } } ;
-FCKConfig.CoreStyles.Italic			= { Element : 'span', Attributes : { 'class' : 'Italic' } } ;
-FCKConfig.CoreStyles.Underline		= { Element : 'span', Attributes : { 'class' : 'Underline' } } ;
-FCKConfig.CoreStyles.StrikeThrough	= { Element : 'span', Attributes : { 'class' : 'StrikeThrough' } } ;
-
-/**
- * Font face
- */
-// List of fonts available in the toolbar combo. Each font definition is
-// separated by a semi-colon (;). We are using class names here, so each font
-// is defined by {Class Name}/{Combo Label}.
-FCKConfig.FontNames = 'FontComic/Comic Sans MS;FontCourier/Courier New;FontTimes/Times New Roman' ;
-
-// Define the way font elements will be applied to the document. The "span"
-// element will be used. When a font is selected, the font name defined in the
-// above list is passed to this definition with the name "Font", being it
-// injected in the "class" attribute.
-// We must also instruct the editor to replace span elements that are used to
-// set the font (Overrides).
-FCKConfig.CoreStyles.FontFace =
-	{
-		Element		: 'span',
-		Attributes	: { 'class' : '#("Font")' },
-		Overrides	: [ { Element : 'span', Attributes : { 'class' : /^Font(?:Comic|Courier|Times)$/ } } ]
-	} ;
-
-/**
- * Font sizes.
- */
-FCKConfig.FontSizes		= 'FontSmaller/Smaller;FontLarger/Larger;FontSmall/8pt;FontBig/14pt;FontDouble/Double Size' ;
-FCKConfig.CoreStyles.Size =
-	{
-		Element		: 'span',
-		Attributes	: { 'class' : '#("Size")' },
-		Overrides	: [ { Element : 'span', Attributes : { 'class' : /^Font(?:Smaller|Larger|Small|Big|Double)$/ } } ]
-	} ;
-
-/**
- * Font colors.
- */
-FCKConfig.EnableMoreFontColors = false ;
-FCKConfig.FontColors = 'ff9900/FontColor1,0066cc/FontColor2,ff0000/FontColor3' ;
-FCKConfig.CoreStyles.Color =
-	{
-		Element		: 'span',
-		Attributes	: { 'class' : '#("Color")' },
-		Overrides	: [ { Element : 'span', Attributes : { 'class' : /^FontColor(?:1|2|3)$/ } } ]
-	} ;
-
-FCKConfig.CoreStyles.BackColor =
-	{
-		Element		: 'span',
-		Attributes	: { 'class' : '#("Color")BG' },
-		Overrides	: [ { Element : 'span', Attributes : { 'class' : /^FontColor(?:1|2|3)BG$/ } } ]
-	} ;
-
-/**
- * Indentation.
- */
-FCKConfig.IndentClasses = [ 'Indent1', 'Indent2', 'Indent3' ] ;
-
-/**
- * Paragraph justification.
- */
-FCKConfig.JustifyClasses = [ 'JustifyLeft', 'JustifyCenter', 'JustifyRight', 'JustifyFull' ] ;
-
-/**
- * Styles combo.
- */
-FCKConfig.StylesXmlPath = '' ;
-FCKConfig.CustomStyles =
-	{
-		'Strong Emphasis' : { Element : 'strong' },
-		'Emphasis' : { Element : 'em' },
-
-		'Computer Code' : { Element : 'code' },
-		'Keyboard Phrase' : { Element : 'kbd' },
-		'Sample Text' : { Element : 'samp' },
-		'Variable' : { Element : 'var' },
-
-		'Deleted Text' : { Element : 'del' },
-		'Inserted Text' : { Element : 'ins' },
-
-		'Cited Work' : { Element : 'cite' },
-		'Inline Quotation' : { Element : 'q' }
-	} ;
Index: FCKeditor/trunk/_samples/html/sample14.html
===================================================================
--- FCKeditor/trunk/_samples/html/sample14.html	(revision 2270)
+++ FCKeditor/trunk/_samples/html/sample14.html	(revision 2273)
@@ -53,5 +53,5 @@
 // Instruct the editor to load our configurations from a custom file, leaving the
 // original configuration file untouched.
-oFCKeditor.Config['CustomConfigurationsPath'] = sBasePath + '_samples/html/sample14.config.js' ;
+oFCKeditor.Config['CustomConfigurationsPath'] = sBasePath + '_samples/html/assets/sample14.config.js' ;
 
 oFCKeditor.Height = 300 ;
Index: FCKeditor/trunk/_samples/html/sample14.styles.css
===================================================================
--- FCKeditor/trunk/_samples/html/sample14.styles.css	(revision 2270)
+++ 	(revision )
@@ -1,228 +1,0 @@
-﻿/*
- * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 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 ==
- *
- * Styles used by the XHTML 1.1 sample page (sample14.html).
- */
-
-/**
- * Basic definitions for the editing area.
- */
-body
-{
-	background-color: #ffffff;
-	padding: 5px 5px 5px 5px;
-	margin: 0px;
-}
-
-body, td
-{
-	font-family: Arial, Verdana, sans-serif;
-	font-size: 12px;
-}
-
-a[href]
-{
-	color: #0000FF !important; /* For Firefox... mark as important, otherwise it becomes black */
-}
-
-/**
- * Core styles.
- */
-
-.Bold
-{
-	font-weight: bold;
-}
-
-.Italic
-{
-	font-style: italic;
-}
-
-.Underline
-{
-	text-decoration: underline;
-}
-
-.StrikeThrough
-{
-	text-decoration: line-through;
-}
-
-.Subscript
-{
-	vertical-align: sub;
-	font-size: smaller;
-}
-
-.Superscript
-{
-	vertical-align: super;
-	font-size: smaller;
-}
-
-/**
- * Font faces.
- */
-
-.FontComic
-{
-	font-family: 'Comic Sans MS';
-}
-
-.FontCourier
-{
-	font-family: 'Courier New';
-}
-
-.FontTimes
-{
-	font-family: 'Times New Roman';
-}
-
-/**
- * Font sizes.
- */
-
-.FontSmaller
-{
-	font-size: smaller;
-}
-
-.FontLarger
-{
-	font-size: larger;
-}
-
-.FontSmall
-{
-	font-size: 8pt;
-}
-
-.FontBig
-{
-	font-size: 14pt;
-}
-
-.FontDouble
-{
-	font-size: 200%;
-}
-
-/**
- * Font colors.
- */
-.FontColor1
-{
-	color: #ff9900;
-}
-
-.FontColor2
-{
-	color: #0066cc;
-}
-
-.FontColor3
-{
-	color: #ff0000;
-}
-
-.FontColor1BG
-{
-	background-color: #ff9900;
-}
-
-.FontColor2BG
-{
-	background-color: #0066cc;
-}
-
-.FontColor3BG
-{
-	background-color: #ff0000;
-}
-
-/**
- * Indentation.
- */
-
-.Indent1
-{
-	margin-left: 40px;
-}
-
-.Indent2
-{
-	margin-left: 80px;
-}
-
-.Indent3
-{
-	margin-left: 120px;
-}
-
-/**
- * Alignment.
- */
-
-.JustifyLeft
-{
-	text-align: left;
-}
-
-.JustifyRight
-{
-	text-align: right;
-}
-
-.JustifyCenter
-{
-	text-align: center;
-}
-
-.JustifyFull
-{
-	text-align: justify;
-}
-
-/**
- * Other.
- */
-
-code
-{
-	font-family: courier, monospace;
-	background-color: #eeeeee;
-	padding-left: 1px;
-	padding-right: 1px;
-	border: #c0c0c0 1px solid;
-}
-
-kbd
-{
-	padding: 0px 1px 0px 1px;
-	border-width: 1px 2px 2px 1px;
-	border-style: solid;
-}
-
-blockquote
-{
-	color: #808080;
-}
Index: FCKeditor/trunk/_samples/html/sample15.html
===================================================================
--- FCKeditor/trunk/_samples/html/sample15.html	(revision 2273)
+++ FCKeditor/trunk/_samples/html/sample15.html	(revision 2273)
@@ -0,0 +1,66 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!--
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 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 ==
+ *
+ * Sample page.
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<title>FCKeditor - Sample</title>
+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+	<meta name="robots" content="noindex, nofollow" />
+	<link href="../sample.css" rel="stylesheet" type="text/css" />
+	<script type="text/javascript" src="../../fckeditor.js"></script>
+</head>
+<body>
+	<h1>
+		FCKeditor - JavaScript - Sample 15
+	</h1>
+	<div>
+		This sample shows FCKeditor configured to produce a legacy HTML4 document. Traditional
+		HTML elements like &lt;b&gt;, &lt;i&gt;, and &lt;font&gt; are used in place of
+		&lt;strong&gt;, &lt;em&gt; and CSS styles.
+	</div>
+	<hr />
+	<form action="../php/sampleposteddata.php" method="post" target="_blank">
+		<script type="text/javascript">
+<!--
+// Automatically calculates the editor base path based on the _samples directory.
+// This is usefull only for these samples. A real application should use something like this:
+// oFCKeditor.BasePath = '/fckeditor/' ;	// '/fckeditor/' is the default value.
+var sBasePath = document.location.href.substring(0,document.location.href.lastIndexOf('_samples')) ;
+
+var oFCKeditor = new FCKeditor( 'FCKeditor1' ) ;
+oFCKeditor.BasePath	= sBasePath ;
+
+// Instruct the editor to load our configurations from a custom file, leaving the
+// original configuration file untouched.
+oFCKeditor.Config['CustomConfigurationsPath'] = sBasePath + '_samples/html/assets/sample15.config.js' ;
+
+oFCKeditor.Height = 300 ;
+oFCKeditor.Value = '<p>This is some <b>sample text<\/b>. You are using <a href="http://www.fckeditor.net/">FCKeditor<\/a>.<\/p>' ;
+oFCKeditor.Create() ;
+//-->
+		</script>
+		<br />
+		<input type="submit" value="Submit" />
+	</form>
+</body>
+</html>
Index: FCKeditor/trunk/_samples/html/sample16.html
===================================================================
--- FCKeditor/trunk/_samples/html/sample16.html	(revision 2273)
+++ FCKeditor/trunk/_samples/html/sample16.html	(revision 2273)
@@ -0,0 +1,91 @@
+﻿<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!--
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 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 ==
+ *
+ * Sample page.
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<title>FCKeditor - Sample</title>
+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+	<meta name="robots" content="noindex, nofollow" />
+	<link href="../sample.css" rel="stylesheet" type="text/css" />
+	<script type="text/javascript" src="../../fckeditor.js"></script>
+	<script type="text/javascript" src="assets/swfobject.js"></script>
+	<script type="text/javascript">
+function sendToFlash()
+{
+	var html = FCKeditorAPI.GetInstance( 'FCKeditor1' ).GetData() ;
+	var flash = document.getElementById( 'fckFlash' ) ;
+	flash.setData( html ) ;
+}
+
+function init()
+{
+	var so = new SWFObject("assets/sample16.swf", "fckFlash", "550", "400", "8", "#ffffff") ;
+	so.addParam("wmode", "transparent");
+	so.write("fckFlashContainer") ;
+}
+	</script>
+</head>
+<body onload="init();">
+	<h1>
+		FCKeditor - JavaScript - Sample 16
+	</h1>
+	<div>
+		This sample shows FCKeditor configured to produce HTML code that can be used with
+		<a href="http://kb.adobe.com/selfservice/viewContent.do?externalId=tn_14808#TextArea_Component">
+			Flash</a>.
+	</div>
+	<hr />
+	<table width="100%" cellpadding="0" cellspacing="0">
+		<tr>
+			<td style="width: 100%">
+				<script type="text/javascript">
+<!--
+if ( document.location.protocol == 'file:' )
+	alert( 'Warning: This samples does not work when loaded from local filesystem due to security restrictions implemented in Flash.'
+     			+ '\n\nPlease load the sample from a web server instead.') ;
+// Automatically calculates the editor base path based on the _samples directory.
+// This is usefull only for these samples. A real application should use something like this:
+// oFCKeditor.BasePath = '/fckeditor/' ;	// '/fckeditor/' is the default value.
+var sBasePath = document.location.href.substring(0,document.location.href.lastIndexOf('_samples')) ;
+
+var oFCKeditor = new FCKeditor( 'FCKeditor1' ) ;
+oFCKeditor.BasePath	= sBasePath ;
+
+// Instruct the editor to load our configurations from a custom file, leaving the
+// original configuration file untouched.
+oFCKeditor.Config['CustomConfigurationsPath'] = sBasePath + '_samples/html/assets/sample16.config.js' ;
+oFCKeditor.Height = 400 ;
+oFCKeditor.Width = '100%' ;
+oFCKeditor.ToolbarSet = 'Flash' ;
+oFCKeditor.Value = '<p>This is some <b>sample text<\/b>. You are using <a href="http://www.fckeditor.net/">FCKeditor<\/a>.<\/p>' ;
+oFCKeditor.Create() ;
+//-->
+				</script>
+				<input type="button" value="Send to Flash" onclick="sendToFlash();" />
+			</td>
+			<td valign="top" style="padding-left: 15px" id="fckFlashContainer">
+			</td>
+		</tr>
+	</table>
+</body>
+</html>
Index: FCKeditor/trunk/_samples/sampleslist.html
===================================================================
--- FCKeditor/trunk/_samples/sampleslist.html	(revision 2270)
+++ FCKeditor/trunk/_samples/sampleslist.html	(revision 2273)
@@ -65,4 +65,6 @@
 						<option value="html/sample13.html">JavaScript : Sample 13 : Dinamically switching with a Textarea</option>
 						<option value="html/sample14.html">JavaScript : Sample 14 : XHTML 1.1</option>
+						<option value="html/sample15.html">JavaScript : Sample 15 : Legacy HTML 4 tags</option>
+						<option value="html/sample16.html">JavaScript : Sample 16 : Flash content editor</option>
 						<option value=""></option>
 					</optgroup>
Index: FCKeditor/trunk/_whatsnew.html
===================================================================
--- FCKeditor/trunk/_whatsnew.html	(revision 2270)
+++ FCKeditor/trunk/_whatsnew.html	(revision 2273)
@@ -49,4 +49,6 @@
 		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2247">#2247</a>] The SHIFT+SPACE
 			keystroke will now produce a &amp;nbsp; character.</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2032">#2032</a>] Added HTML samples
+			for legacy HTML and Flash-embedded HTML code.</li>
 	</ul>
 	<p>
