Index: /CKEditor/branches/features/adobeair/.htaccess
===================================================================
--- /CKEditor/branches/features/adobeair/.htaccess (revision 5612)
+++ /CKEditor/branches/features/adobeair/.htaccess (revision 5613)
@@ -1,4 +1,4 @@
#
-# Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved.
+# Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
# For licensing, see LICENSE.html or http://ckeditor.com/license
#
Index: /CKEditor/branches/features/adobeair/CHANGES.html
===================================================================
--- /CKEditor/branches/features/adobeair/CHANGES.html (revision 5612)
+++ /CKEditor/branches/features/adobeair/CHANGES.html (revision 5613)
@@ -1,5 +1,5 @@
@@ -36,21 +36,465 @@
- CKEditor 3.1 (SVN)
+ CKEditor 3.3.2 (SVN)
+
+ New features:
+
+
+
+
+ Fixed issues:
+
+
+
+
+ CKEditor 3.3.1
+
+ Fixed issues:
+
+
#5780 : Text selection lost when opening some of the dialogs.
+
#5787 : Liststyle plugin wasn't packaged into the core (CKEDITOR.resourceManager.load exception).
+
#5637 : Fix wrong nesting that generated "<head> must be a child of <html>" warning in Webkit.
+
#5790 : Internal only attributes output on fullpage <html> tag.
+
#5761 : [IE] Color dialog matrix buttons are barely clickable in quirks mode.
+
#5759 : [IE] Clicking on the scrollbar and then on the host page causes error.
+
#5772 : List style dialog is missing tab page ids.
+
#5782 : [FF] Wysiwyg mode is broken by 'display' style changes on editor's parent DOM tree.
+
#5801 : [IE] contentEditable="false" doesn't apply in effect on inline-elements.
+
#5794 : Empty find matching twice results in JavaScript error.
+
#5732 : If it isn't possible to connect to the SCAYT servers the dialogs might hang in Firefox. Fix for Firefox>=3.6.
+
#5807 : [FF2] New page command results in uneditable document.
+
#5807 : [FF2] SCAYT plugin is disabled in Firefox2 due to selection interference.
+
#5772 : [IE] Some numbered list style types are not supported by IE6/7 and causes JavaScript error.
+
+
+ CKEditor 3.3
+
+ New features:
+
+
#635 : The properties dialog will now open when double clicking on objects.
+
#3893 : It's now possible to indent/outdent lists when selecting the first list item.
+
#4968 : The contentsLangDirection setting now has a default value 'ui' which inherit language direction from the editor UI language.
+
#4649 : The color picker dialog is now accessible.
+
#3593 : The editing area is now enabled by contentEditable="true" instead of designMode="on" to allow creating uneditable content elements in all browsers.
+
#4056 : Hidden fields will now be displayed as fake element just like in FCKeditor 2.
+
+
+ CKEditor 3.2.2
+
+ New features:
+
+
The SCAYT spell checker is now enabled by default through the autoStartup setting.
#4478 : Enable the SelectAll command in source mode.
+
#5150 : Allow names in the CKEDITOR.config.colorButton_colors setting.
+
#4810 : Adding configuration option for image dialog preview area filling text.
+
#536 : Object style now could be applied on any parent element of current selection.
+
#5290 : Unified stylesSet loading removing dependencies from the styles combo.
+ Now the configuration entry is named 'config.stylesSet' instead of config.stylesCombo_stylesSet and the default location
+ is under the 'styles' plugin instead of 'stylescombo'.
+
#5352 : Allow to define the stylesSet array in the config object for the editor.
+
+
+
+
+
+
Index: /CKEditor/branches/features/adobeair/_dev/docs_build/template/index.tmpl
===================================================================
--- /CKEditor/branches/features/adobeair/_dev/docs_build/template/index.tmpl (revision 5612)
+++ /CKEditor/branches/features/adobeair/_dev/docs_build/template/index.tmpl (revision 5613)
@@ -3,7 +3,7 @@
-
+
- CKEditor 3.0 JavaScript API Documentation
+ CKEditor 3 JavaScript API Documentation
Index: /CKEditor/branches/features/adobeair/_dev/docs_build/template/publish.js
===================================================================
--- /CKEditor/branches/features/adobeair/_dev/docs_build/template/publish.js (revision 5612)
+++ /CKEditor/branches/features/adobeair/_dev/docs_build/template/publish.js (revision 5613)
@@ -1,9 +1,10 @@
+/** Called automatically by JsDoc Toolkit. */
function publish(symbolSet) {
publish.conf = { // trailing slash expected for dirs
- ext: ".html",
- outDir: JSDOC.opt.d || SYS.pwd+"../out/jsdoc/",
- templatesDir: JSDOC.opt.t.replace( /\/+$/, '' ) + '/',
- symbolsDir: "symbols/",
- srcDir: "symbols/src/"
+ ext: ".html",
+ outDir: JSDOC.opt.d || SYS.pwd+"../out/jsdoc/",
+ templatesDir: ( JSDOC.opt.t && JSDOC.opt.t.replace( /\/+$/, '' ) + '/' ) || SYS.pwd+"../templates/jsdoc/",
+ symbolsDir: "symbols/",
+ srcDir: "symbols/src/"
};
if (!IO.exists(publish.conf.templatesDir)) {
@@ -11,4 +12,5 @@
}
+ // is source output is suppressed, just display the links to the source file
if (JSDOC.opt.s && defined(Link) && Link.prototype._makeSrcLink) {
Link.prototype._makeSrcLink = function(srcFilePath) {
@@ -17,9 +19,11 @@
}
+ // create the folders and subfolders to hold the output
IO.mkPath((publish.conf.outDir+"symbols/src").split("/"));
- // used to check the details of things being linked to
+ // used to allow Link to check the details of things being linked to
Link.symbolSet = symbolSet;
+ // create the required templates
try {
var classTemplate = new JSDOC.JsPlate(publish.conf.templatesDir+"class.tmpl");
@@ -27,15 +31,17 @@
}
catch(e) {
- print(e.message);
+ print("Couldn't create the required templates: "+e);
quit();
}
- // filters
+ // some ustility filters
function hasNoParent($) {return ($.memberOf == "")}
function isaFile($) {return ($.is("FILE"))}
function isaClass($) {return ($.is("CONSTRUCTOR") || $.isNamespace)}
+ // get an array version of the symbolset, useful for filtering
var symbols = symbolSet.toArray();
+ // create the hilited source code files
var files = JSDOC.opt.srcFiles;
for (var i = 0, l = files.length; i < l; i++) {
@@ -45,21 +51,45 @@
}
+ // get a list of all the classes in the symbolset
var classes = symbols.filter(isaClass).sort(makeSortby("alias"));
+ // create a filemap in which outfiles must be to be named uniquely, ignoring case
+ if (JSDOC.opt.u) {
+ var filemapCounts = {};
+ Link.filemap = {};
+ for (var i = 0, l = classes.length; i < l; i++) {
+ var lcAlias = classes[i].alias.toLowerCase();
+
+ if (!filemapCounts[lcAlias]) filemapCounts[lcAlias] = 1;
+ else filemapCounts[lcAlias]++;
+
+ Link.filemap[classes[i].alias] =
+ (filemapCounts[lcAlias] > 1)?
+ lcAlias+"_"+filemapCounts[lcAlias] : lcAlias;
+ }
+ }
+
+ // create a class index, displayed in the left-hand column of every class page
Link.base = "../";
publish.classesIndex = classesTemplate.process(classes); // kept in memory
+ // create each of the class pages
for (var i = 0, l = classes.length; i < l; i++) {
var symbol = classes[i];
+
+ symbol.events = symbol.getEvents(); // 1 order matters
+ symbol.methods = symbol.getMethods(); // 2
+
var output = "";
output = classTemplate.process(symbol);
- IO.saveFile(publish.conf.outDir+"symbols/", symbol.alias+publish.conf.ext, output);
- }
-
- // regenrate the index with different relative links
+ IO.saveFile(publish.conf.outDir+"symbols/", ((JSDOC.opt.u)? Link.filemap[symbol.alias] : symbol.alias) + publish.conf.ext, output);
+ }
+
+ // regenerate the index with different relative links, used in the index pages
Link.base = "";
publish.classesIndex = classesTemplate.process(classes);
+ // create the class index page
try {
var classesindexTemplate = new JSDOC.JsPlate(publish.conf.templatesDir+"index.tmpl");
@@ -71,4 +101,5 @@
classesindexTemplate = classesIndex = classes = null;
+ // create the file index page
try {
var fileindexTemplate = new JSDOC.JsPlate(publish.conf.templatesDir+"allfiles.tmpl");
@@ -76,6 +107,6 @@
catch(e) { print(e.message); quit(); }
- var documentedFiles = symbols.filter(isaFile);
- var allFiles = [];
+ var documentedFiles = symbols.filter(isaFile); // files that have file-level docs
+ var allFiles = []; // not all files have file-level docs, but we need to list every one
for (var i = 0; i < files.length; i++) {
@@ -96,4 +127,5 @@
allFiles = allFiles.sort( ckeditor_sortFiles );
+ // output the file index page
var filesIndex = fileindexTemplate.process(allFiles);
IO.saveFile(publish.conf.outDir, "files"+publish.conf.ext, filesIndex);
@@ -102,5 +134,5 @@
-/** Just the first sentence. Should not break on dotted variable names. */
+/** Just the first sentence (up to a full stop). Should not break on dotted variable names. */
function summarize(desc) {
if (typeof desc != "undefined")
@@ -108,5 +140,5 @@
}
-/** make a symbol sorter by some attribute */
+/** Make a symbol sorter by some attribute. */
function makeSortby(attribute) {
return function(a, b) {
@@ -121,4 +153,5 @@
}
+/** Pull in the contents of an external file at the given path. */
function include(path) {
var path = publish.conf.templatesDir+path;
@@ -126,4 +159,5 @@
}
+/** Turn a raw source file into a code-hilited page in the docs. */
function makeSrcFile(path, srcDir, name) {
if (JSDOC.opt.s) return;
@@ -145,4 +179,5 @@
}
+/** Build output for displaying function parameters. */
function makeSignature(params) {
if (!params) return "()";
Index: /CKEditor/branches/features/adobeair/_dev/docs_build/template/static/footer.html
===================================================================
--- /CKEditor/branches/features/adobeair/_dev/docs_build/template/static/footer.html (revision 5612)
+++ /CKEditor/branches/features/adobeair/_dev/docs_build/template/static/footer.html (revision 5613)
@@ -1,3 +1,3 @@
- This sample shows how to use the dialog API to customize dialogs whithout changing
- the original editor code. The following customizations are being done::
-
-
Add dialog pages ("My Tab" in the Link dialog).
-
Remove a dialog tab ("Target" tab from the Link dialog).
-
Add dialog fields ("My Custom Field" into the Link dialog).
-
Remove dialog fields ("Link Type" and "Browser Server" the Link dialog).
-
Set default values for dialog fields (for the "URL" field in the
- Link dialog).
-
Create a custom dialog ("My Dialog" button).
-
-
-
+
+
Index: /CKEditor/branches/features/adobeair/_samples/api_dialog/my_dialog.js
===================================================================
--- /CKEditor/branches/features/adobeair/_samples/api_dialog/my_dialog.js (revision 5612)
+++ /CKEditor/branches/features/adobeair/_samples/api_dialog/my_dialog.js (revision 5613)
@@ -1,4 +1,4 @@
-/*
-Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved.
+/*
+Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
*/
Index: /CKEditor/branches/features/adobeair/_samples/asp/advanced.asp
===================================================================
--- /CKEditor/branches/features/adobeair/_samples/asp/advanced.asp (revision 5613)
+++ /CKEditor/branches/features/adobeair/_samples/asp/advanced.asp (revision 5613)
@@ -0,0 +1,105 @@
+<%@ codepage="65001" language="VBScript" %>
+<% Option Explicit %>
+
+<%
+
+ ' You must set "Enable Parent Paths" on your web site
+ ' in order for the above relative include to work.
+ ' Or you can use #INCLUDE VIRTUAL="/full path/ckeditor.asp"
+
+%>
+
+
+
+
+ Sample - CKEditor
+
+
+
+
+
+ CKEditor Sample
+
+
+
+
+
+
+
+
+
+
Index: /CKEditor/branches/features/adobeair/_samples/asp/events.asp
===================================================================
--- /CKEditor/branches/features/adobeair/_samples/asp/events.asp (revision 5613)
+++ /CKEditor/branches/features/adobeair/_samples/asp/events.asp (revision 5613)
@@ -0,0 +1,136 @@
+<%@ codepage="65001" language="VBScript" %>
+<% Option Explicit %>
+
+<%
+
+ ' You must set "Enable Parent Paths" on your web site
+ ' in order for the above relative include to work.
+ ' Or you can use #INCLUDE VIRTUAL="/full path/ckeditor.asp"
+
+%>
+
+
+
+
+ Sample - CKEditor
+
+
+
+
+
The ckeditor.asp file provides a wrapper to ease the work of creating CKEditor instances from classic Asp.
+
To use it, you must first include it into your page:
+
+ <!-- #INCLUDE file="../../ckeditor.asp" -->
+
+ Of course, you should adjust the path to make it point to the correct location, and maybe use a full path (with virtual="" instead of file="")
+
+
After that script is included, you can use it in different ways, based on the following pattern:
+
+
+
+ Create an instance of the CKEditor class:
+
dim editor
+set editor = New CKEditor
+
+
+ Set the path to the folder where CKEditor has been installed, by default it will use /ckeditor/
+
editor.basePath = "../../"
+
+
+ Now use one of the three main methods to create the CKEditor instances:
+
+
+ Replace textarea with id (or name) "editor1".
+
editor.replaceInstance "editor1"
+
+
+ Replace all textareas with CKEditor.
+
editor.replaceAll empty
+
+
+ Create a textarea element and attach CKEditor to it.
+
editor.editor "editor1", initialValue
+
+
+
+
+
Before step 3 you can use a number of methods and properties to adjust the behavior of this class and the CKEditor instances
+that will be created:
+
+
returnOutput : if set to true, the functions won't dump the code with response.write, but instead they will return it so
+ you can do anything you want
+
basePath: location of the CKEditor scripts
+
initialized: if you set it to true, it means that you have already included the CKEditor.js file into the page and it
+ doesn't have to be generated again.
+
textareaAttributes: You can set here a Dictionary object with the attributes that you want to output in the call to the "editor" method.
+
+
config: Allows to set config values for all the instances from now on.
+
instanceConfig: Allows to set config values just for the next instance.
+
+
addEventHandler: Adds an event handler for all the instances from now on.
+
addInstanceEventHandler: Adds an event handler just for the next instance.
+
addGlobalEventHandler: Adds an event handler for the global CKEDITOR object.
+
+
clearEventHandlers: Removes one or all the event handlers from all the instances from now on.
+
clearInstanceEventHandlers: Removes one or all the event handlers from the next instance.
+
clearGlobalEventHandlers: Removes one or all the event handlers from the global CKEDITOR object.
+
+
+
Index: /CKEditor/branches/features/adobeair/_samples/asp/replace.asp
===================================================================
--- /CKEditor/branches/features/adobeair/_samples/asp/replace.asp (revision 5613)
+++ /CKEditor/branches/features/adobeair/_samples/asp/replace.asp (revision 5613)
@@ -0,0 +1,72 @@
+<%@ codepage="65001" language="VBScript" %>
+<% Option Explicit %>
+
+<%
+
+ ' You must set "Enable Parent Paths" on your web site
+ ' in order for the above relative include to work.
+ ' Or you can use #INCLUDE VIRTUAL="/full path/ckeditor.asp"
+
+%>
+
+
+
+
+ Sample - CKEditor
+
+
+
+
+
+ CKEditor Sample
+
+
+
+
+
+
+
+
+ <%
+ ' Create class instance.
+ dim editor
+ set editor = New CKEditor
+ ' Path to CKEditor directory, ideally instead of relative dir, use an absolute path:
+ ' editor.basePath = "/ckeditor/"
+ ' If not set, CKEditor will default to /ckeditor/
+ editor.basePath = "../../"
+ ' Replace textarea with id (or name) "editor1".
+ editor.replaceInstance "editor1"
+ %>
+
+
Index: /CKEditor/branches/features/adobeair/_samples/asp/replaceall.asp
===================================================================
--- /CKEditor/branches/features/adobeair/_samples/asp/replaceall.asp (revision 5613)
+++ /CKEditor/branches/features/adobeair/_samples/asp/replaceall.asp (revision 5613)
@@ -0,0 +1,77 @@
+<%@ codepage="65001" language="VBScript" %>
+<% Option Explicit %>
+
+<%
+
+ ' You must set "Enable Parent Paths" on your web site
+ ' in order for the above relative include to work.
+ ' Or you can use #INCLUDE VIRTUAL="/full path/ckeditor.asp"
+
+%>
+
+
+
+
+ Sample - CKEditor
+
+
+
+
+
+ CKEditor Sample
+
+
+
+
+
+
+
+
+ <%
+ ' Create class instance.
+ dim editor
+ set editor = New CKEditor
+ ' Path to CKEditor directory, ideally instead of relative dir, use an absolute path:
+ ' editor.basePath = "/ckeditor/"
+ ' If not set, CKEditor will default to /ckeditor/
+ editor.basePath = "../../"
+ ' Replace all textareas with CKEditor.
+ editor.replaceAll empty
+ %>
+
+
Index: /CKEditor/branches/features/adobeair/_samples/asp/sample_posteddata.asp
===================================================================
--- /CKEditor/branches/features/adobeair/_samples/asp/sample_posteddata.asp (revision 5613)
+++ /CKEditor/branches/features/adobeair/_samples/asp/sample_posteddata.asp (revision 5613)
@@ -0,0 +1,46 @@
+<%@ codepage="65001" language="VBScript" %>
+<% Option Explicit %>
+
+
+
+
+ Sample - CKEditor
+
+
+
+
+
+ CKEditor - Posted Data
+
+
+
+
+
+
Field Name
+
Value
+
+
+ <%
+ Dim sForm
+ For Each sForm in Request.Form
+ %>
+
+
<%=Server.HTMLEncode( sForm )%>
+
<%=Server.HTMLEncode( Request.Form(sForm) )%>
+
+ <% Next %>
+
+
+
+
Index: /CKEditor/branches/features/adobeair/_samples/asp/standalone.asp
===================================================================
--- /CKEditor/branches/features/adobeair/_samples/asp/standalone.asp (revision 5613)
+++ /CKEditor/branches/features/adobeair/_samples/asp/standalone.asp (revision 5613)
@@ -0,0 +1,72 @@
+<%@ codepage="65001" language="VBScript" %>
+<% Option Explicit %>
+
+<%
+
+ ' You must set "Enable Parent Paths" on your web site
+ ' in order for the above relative include to work.
+ ' Or you can use #INCLUDE VIRTUAL="/full path/ckeditor.asp"
+
+%>
+
+
+
+
+ Sample - CKEditor
+
+
+
+
+
+ Double-click on any of the following DIVs to transform them into editor instances.
+
+
+ Part 1
- Double-click on any of the following DIVs to transform them into editor instances.
-
-
- Part 1
-
- Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Cras et ipsum quis mi
- semper accumsan. Integer pretium dui id massa. Suspendisse in nisl sit amet urna
- rutrum imperdiet. Nulla eu tellus. Donec ante nisi, ullamcorper quis, fringilla
- nec, sagittis eleifend, pede. Nulla commodo interdum massa. Donec id metus. Fusce
- eu ipsum. Suspendisse auctor. Phasellus fermentum porttitor risus.
-
-
-
-
- Part 2
-
- Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Cras et ipsum quis mi
- semper accumsan. Integer pretium dui id massa. Suspendisse in nisl sit amet urna
- rutrum imperdiet. Nulla eu tellus. Donec ante nisi, ullamcorper quis, fringilla
- nec, sagittis eleifend, pede. Nulla commodo interdum massa. Donec id metus. Fusce
- eu ipsum. Suspendisse auctor. Phasellus fermentum porttitor risus.
-
-
- Donec velit. Mauris massa. Vestibulum non nulla. Nam suscipit arcu nec elit. Phasellus
- sollicitudin iaculis ante. Ut non mauris et sapien tincidunt adipiscing. Vestibulum
- vitae leo. Suspendisse nec mi tristique nulla laoreet vulputate.
-
-
-
-
- Part 3
-
- Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Cras et ipsum quis mi
- semper accumsan. Integer pretium dui id massa. Suspendisse in nisl sit amet urna
- rutrum imperdiet. Nulla eu tellus. Donec ante nisi, ullamcorper quis, fringilla
- nec, sagittis eleifend, pede. Nulla commodo interdum massa. Donec id metus. Fusce
- eu ipsum. Suspendisse auctor. Phasellus fermentum porttitor risus.
-
-
+ Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Cras et ipsum quis mi
+ semper accumsan. Integer pretium dui id massa. Suspendisse in nisl sit amet urna
+ rutrum imperdiet. Nulla eu tellus. Donec ante nisi, ullamcorper quis, fringilla
+ nec, sagittis eleifend, pede. Nulla commodo interdum massa. Donec id metus. Fusce
+ eu ipsum. Suspendisse auctor. Phasellus fermentum porttitor risus.
+
-
-
+
+
+ Part 2
+
+ Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Cras et ipsum quis mi
+ semper accumsan. Integer pretium dui id massa. Suspendisse in nisl sit amet urna
+ rutrum imperdiet. Nulla eu tellus. Donec ante nisi, ullamcorper quis, fringilla
+ nec, sagittis eleifend, pede. Nulla commodo interdum massa. Donec id metus. Fusce
+ eu ipsum. Suspendisse auctor. Phasellus fermentum porttitor risus.
+
+
+ Donec velit. Mauris massa. Vestibulum non nulla. Nam suscipit arcu nec elit. Phasellus
+ sollicitudin iaculis ante. Ut non mauris et sapien tincidunt adipiscing. Vestibulum
+ vitae leo. Suspendisse nec mi tristique nulla laoreet vulputate.
+
+
+
+
+ Part 3
+
+ Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Cras et ipsum quis mi
+ semper accumsan. Integer pretium dui id massa. Suspendisse in nisl sit amet urna
+ rutrum imperdiet. Nulla eu tellus. Donec ante nisi, ullamcorper quis, fringilla
+ nec, sagittis eleifend, pede. Nulla commodo interdum massa. Donec id metus. Fusce
+ eu ipsum. Suspendisse auctor. Phasellus fermentum porttitor risus.
+