Index: /FCKeditor/trunk/_dev/releaser/fckreleaser.php
===================================================================
--- /FCKeditor/trunk/_dev/releaser/fckreleaser.php (revision 2272)
+++ /FCKeditor/trunk/_dev/releaser/fckreleaser.php (revision 2273)
@@ -1,7 +1,7 @@
-#!/usr/bin/php -q
+#!/usr/bin/php -q
-_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( '/(?_GetVarName(), $source ) ;
+ $source = preg_replace( '/(?_GetVarName(), $source ) ;
}
@@ -566,5 +552,5 @@
$var = $this->_VarPrefix . $this->_VarChars[ $this->_LastCharIndex++ ] ;
- if ( preg_match( '/(?_Function ) )
+ if ( preg_match( '/(?_Function ) )
return $this->_GetVarName() ;
else
@@ -589,5 +575,4 @@
?>
-
_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() ;
+ }
+}
+
+?>
-
+
+
+ FCKeditor - Sample
+
+
+
+
+
+
+
+
+
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="