+ CKEditor is a text editor to be used inside web pages. It's not a replacement
+ for desktop text editors like Word or OpenOffice, but a component to be used as
+ part of web applications and web sites.
+
+ Installation
+
+ Installing CKEditor is an easy task. Just follow these simple steps:
+
+
Download the latest version of the editor from our web site: http://ckeditor.com. You should have already completed
+ this step, but be sure you have the very latest version.
+
Extract (decompress) the downloaded file into the root of your
+ web site.
+
+
+ Note: CKEditor is by default installed in the "ckeditor"
+ folder. You can place the files in whichever you want though.
+
+ Checking Your Installation
+
+
+ The editor comes with a few sample pages that can be used to verify that installation
+ proceeded properly. Take a look at the _samples directory.
+
+ To test your installation, just call the following page at your web site:
+
+
+
Index: /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/README.txt
===================================================================
--- /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/README.txt (revision 4056)
+++ /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/README.txt (revision 4056)
@@ -0,0 +1,151 @@
+======================================================================
+
+DESCRIPTION:
+
+** NOTICE ** THIS VERSION OF THE SOFTWARE IS "BETA," MEANING IT IS IS
+NOT YET READY FOR USE IN A PRODUCTION ENVIRONEMNT. IT IS MADE
+AVAILABLE FOR PREVIEW AND TESTING PURPOSES ONLY.
+
+This is Version 2 of JsDoc Toolkit, an automatic documentation
+generation tool for JavaScript. It is written in JavaScript and is run
+from a command line (or terminal) using the Java runtime engine.
+
+Using this tool you can automatically turn JavaDoc-like comments in
+your JavaScript source code into published output files, such as HTML
+or XML.
+
+For more information, to report a bug, or to browse the technical
+documentation for this tool please visit the official JsDoc Toolkit
+project homepage at http://code.google.com/p/jsdoc-toolkit/
+
+For the most up-to-date documentation on Version 2 of JsDoc Toolkit
+see the Verion 2 wiki at http://jsdoctoolkit.org/wiki
+
+
+======================================================================
+
+REQUIREMENTS:
+
+JsDoc Toolkit is known to work with:
+java version "1.6.0_03"
+Java(TM) SE Runtime Environment (build 1.6.0_03-b05)
+on Windows XP,
+and java version "1.5.0_13"
+Java(TM) 2 Runtime Environment, Standard Edition (build 1.5.0_13-b05-241)
+on Mac OS X 10.4.
+
+Other versions of java may or may not work with JsDoc Toolkit.
+
+======================================================================
+
+USAGE:
+
+Running JsDoc Toolkit requires you to have Java installed on your
+computer. For more information see http://www.java.com/getjava/
+
+Before running the JsDoc Toolkit app you should change your current
+working directory to the jsdoc-toolkit folder. Then follow the
+examples below, or as shown on the project wiki.
+
+On a computer running Windows a valid command line to run JsDoc
+Toolkit might look like this:
+
+> java -jar jsrun.jar app\run.js -a -t=templates\jsdoc mycode.js
+
+On Mac OS X or Linux the same command would look like this:
+
+$ java -jar jsrun.jar app/run.js -a -t=templates/jsdoc mycode.js
+
+The above assumes your current working directory contains jsrun.jar,
+the "app" and "templates" subdirectories from the standard JsDoc
+Toolkit distribution and that the relative path to the code you wish
+to document is "mycode.js".
+
+The output documentation files will be saved to a new directory named
+"out" (by default) in the current directory, or if you specify a
+-d=somewhere_else option, to the somewhere_else directory.
+
+For help (usage notes) enter this on the command line:
+
+$ java -jar jsrun.jar app/run.js --help
+
+More information about the various command line options used by JsDoc
+Toolkit are available on the project wiki.
+
+======================================================================
+
+TESTING:
+
+To run the suite of unit tests included with JsDoc Toolkit enter this
+on the command line:
+
+$ java -jar jsrun.jar app/run.js -T
+
+To see a dump of the internal data structure that JsDoc Toolkit has
+built from your source files use this command:
+
+$ java -jar jsrun.jar app/run.js mycode.js -Z
+
+
+======================================================================
+
+LICENSE:
+
+JSDoc.pm
+
+This project is based on the JSDoc.pm tool, created by Michael
+Mathews and Gabriel Reid. More information on JsDoc.pm can
+be found on the JSDoc.pm homepage: http://jsdoc.sourceforge.net/
+
+Complete documentation on JsDoc Toolkit can be found on the project
+wiki at http://code.google.com/p/jsdoc-toolkit/w/list
+
+Rhino
+
+Rhino (JavaScript in Java) is open source and licensed by Mozilla
+under the MPL 1.1 or later/GPL 2.0 or later licenses, the text of
+which is available at http://www.mozilla.org/MPL/
+
+You can obtain the source code for Rhino from the Mozilla web site at
+http://www.mozilla.org/rhino/download.html
+
+JsDoc Toolkit is a larger work that uses the Rhino JavaScript engine
+but is not derived from it in any way. The Rhino library is used
+without modification and without any claims whatsoever.
+
+The Rhino Debugger
+
+You can obtain more information about the Rhino Debugger from the
+Mozilla web site at http://www.mozilla.org/rhino/debugger.html
+
+JsDoc Toolkit is a larger work that uses the Rhino Debugger but
+is not derived from it in any way. The Rhino Debugger is used
+without modification and without any claims whatsoever.
+
+JsDoc Toolkit
+
+All code specific to JsDoc Toolkit are free, open source and licensed
+for use under the X11/MIT License.
+
+JsDoc Toolkit is Copyright (c)2008 Michael Mathews
+
+This program is free software; you can redistribute it and/or
+modify it under the terms below.
+
+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 must 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.
Index: /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/frame.js
===================================================================
--- /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/frame.js (revision 4056)
+++ /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/frame.js (revision 4056)
@@ -0,0 +1,33 @@
+IO.include("frame/Opt.js");
+IO.include("frame/Chain.js");
+IO.include("frame/Link.js");
+IO.include("frame/String.js");
+IO.include("frame/Hash.js");
+IO.include("frame/Namespace.js");
+IO.include("frame/Reflection.js");
+
+/** A few helper functions to make life a little easier. */
+
+function defined(o) {
+ return (o !== undefined);
+}
+
+function copy(o) { // todo check for circular refs
+ if (o == null || typeof(o) != 'object') return o;
+ var c = new o.constructor();
+ for(var p in o) c[p] = copy(o[p]);
+ return c;
+}
+
+function isUnique(arr) {
+ var l = arr.length;
+ for(var i = 0; i < l; i++ ) {
+ if (arr.lastIndexOf(arr[i]) > i) return false;
+ }
+ return true;
+}
+
+/** Returns the given string with all regex meta characters backslashed. */
+RegExp.escapeMeta = function(str) {
+ return str.replace(/([$^\\\/()|?+*\[\]{}.-])/g, "\\$1");
+}
Index: /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/frame/Chain.js
===================================================================
--- /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/frame/Chain.js (revision 4056)
+++ /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/frame/Chain.js (revision 4056)
@@ -0,0 +1,102 @@
+/**@constructor*/
+function ChainNode(object, link) {
+ this.value = object;
+ this.link = link; // describes this node's relationship to the previous node
+}
+
+/**@constructor*/
+function Chain(valueLinks) {
+ this.nodes = [];
+ this.cursor = -1;
+
+ if (valueLinks && valueLinks.length > 0) {
+ this.push(valueLinks[0], "//");
+ for (var i = 1, l = valueLinks.length; i < l; i+=2) {
+ this.push(valueLinks[i+1], valueLinks[i]);
+ }
+ }
+}
+
+Chain.prototype.push = function(o, link) {
+ if (this.nodes.length > 0 && link) this.nodes.push(new ChainNode(o, link));
+ else this.nodes.push(new ChainNode(o));
+}
+
+Chain.prototype.unshift = function(o, link) {
+ if (this.nodes.length > 0 && link) this.nodes[0].link = link;
+ this.nodes.unshift(new ChainNode(o));
+ this.cursor++;
+}
+
+Chain.prototype.get = function() {
+ if (this.cursor < 0 || this.cursor > this.nodes.length-1) return null;
+ return this.nodes[this.cursor];
+}
+
+Chain.prototype.first = function() {
+ this.cursor = 0;
+ return this.get();
+}
+
+Chain.prototype.last = function() {
+ this.cursor = this.nodes.length-1;
+ return this.get();
+}
+
+Chain.prototype.next = function() {
+ this.cursor++;
+ return this.get();
+}
+
+Chain.prototype.prev = function() {
+ this.cursor--;
+ return this.get();
+}
+
+Chain.prototype.toString = function() {
+ var string = "";
+ for (var i = 0, l = this.nodes.length; i < l; i++) {
+ if (this.nodes[i].link) string += " -("+this.nodes[i].link+")-> ";
+ string += this.nodes[i].value.toString();
+ }
+ return string;
+}
+
+Chain.prototype.joinLeft = function() {
+ var result = "";
+ for (var i = 0, l = this.cursor; i < l; i++) {
+ if (result && this.nodes[i].link) result += this.nodes[i].link;
+ result += this.nodes[i].value.toString();
+ }
+ return result;
+}
+
+
+/* USAGE:
+
+var path = "one/two/three.four/five-six";
+var pathChain = new Chain(path.split(/([\/.-])/));
+print(pathChain);
+
+var lineage = new Chain();
+lineage.push("Port");
+lineage.push("Les", "son");
+lineage.push("Dawn", "daughter");
+lineage.unshift("Purdie", "son");
+
+print(lineage);
+
+// walk left
+for (var node = lineage.last(); node !== null; node = lineage.prev()) {
+ print("< "+node.value);
+}
+
+// walk right
+var node = lineage.first()
+while (node !== null) {
+ print(node.value);
+ node = lineage.next();
+ if (node && node.link) print("had a "+node.link+" named");
+}
+
+*/
Index: /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/frame/Dumper.js
===================================================================
--- /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/frame/Dumper.js (revision 4056)
+++ /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/frame/Dumper.js (revision 4056)
@@ -0,0 +1,144 @@
+/**
+ * @class
+
+This is a lightly modified version of Kevin Jones' JavaScript
+library Data.Dump. To download the original visit:
+ http://openjsan.org/doc/k/ke/kevinj/Data/Dump/
+
+AUTHORS
+
+The Data.Dump JavaScript module is written by Kevin Jones
+(kevinj@cpan.org), based on Data::Dump by Gisle Aas (gisle@aas.no),
+based on Data::Dumper by Gurusamy Sarathy (gsar@umich.edu).
+
+COPYRIGHT
+
+Copyright 2007 Kevin Jones. Copyright 1998-2000,2003-2004 Gisle Aas.
+Copyright 1996-1998 Gurusamy Sarathy.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the Perl Artistic License
+
+See http://www.perl.com/perl/misc/Artistic.html
+
+ * @static
+ */
+Dumper = {
+ /** @param [...] The objects to dump. */
+ dump: function () {
+ if (arguments.length > 1)
+ return this._dump(arguments);
+ else if (arguments.length == 1)
+ return this._dump(arguments[0]);
+ else
+ return "()";
+ },
+
+ _dump: function (obj) {
+ if (typeof obj == 'undefined') return 'undefined';
+ var out;
+ if (obj.serialize) { return obj.serialize(); }
+ var type = this._typeof(obj);
+ if (obj.circularReference) obj.circularReference++;
+ switch (type) {
+ case 'circular':
+ out = "{ //circularReference\n}";
+ break;
+ case 'object':
+ var pairs = new Array;
+
+ for (var prop in obj) {
+ if (prop != "circularReference" && obj.hasOwnProperty(prop)) { //hide inherited properties
+ pairs.push(prop + ': ' + this._dump(obj[prop]));
+ }
+ }
+
+ out = '{' + this._format_list(pairs) + '}';
+ break;
+
+ case 'string':
+ for (var prop in Dumper.ESC) {
+ if (Dumper.ESC.hasOwnProperty(prop)) {
+ obj = obj.replace(prop, Dumper.ESC[prop]);
+ }
+ }
+
+ // Escape UTF-8 Strings
+ if (obj.match(/^[\x00-\x7f]*$/)) {
+ out = '"' + obj.replace(/\"/g, "\\\"").replace(/([\n\r]+)/g, "\\$1") + '"';
+ }
+ else {
+ out = "unescape('"+escape(obj)+"')";
+ }
+ break;
+
+ case 'array':
+ var elems = new Array;
+
+ for (var i=0; i 60 ? '\n' : ' ';
+ return nl + list.join(',' + nl) + nl;
+ },
+
+ _typeof: function (obj) {
+ if (obj && obj.circularReference && obj.circularReference > 1) return 'circular';
+ if (Array.prototype.isPrototypeOf(obj)) return 'array';
+ if (Date.prototype.isPrototypeOf(obj)) return 'date';
+ if (typeof obj.nodeType != 'undefined') return 'element';
+ return typeof(obj);
+ },
+
+ _dump_dom: function (obj) {
+ return '"' + Dumper.nodeTypes[obj.nodeType] + '"';
+ }
+};
+
+Dumper.ESC = {
+ "\t": "\\t",
+ "\n": "\\n",
+ "\f": "\\f"
+};
+
+Dumper.nodeTypes = {
+ 1: "ELEMENT_NODE",
+ 2: "ATTRIBUTE_NODE",
+ 3: "TEXT_NODE",
+ 4: "CDATA_SECTION_NODE",
+ 5: "ENTITY_REFERENCE_NODE",
+ 6: "ENTITY_NODE",
+ 7: "PROCESSING_INSTRUCTION_NODE",
+ 8: "COMMENT_NODE",
+ 9: "DOCUMENT_NODE",
+ 10: "DOCUMENT_TYPE_NODE",
+ 11: "DOCUMENT_FRAGMENT_NODE",
+ 12: "NOTATION_NODE"
+};
Index: /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/frame/Hash.js
===================================================================
--- /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/frame/Hash.js (revision 4056)
+++ /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/frame/Hash.js (revision 4056)
@@ -0,0 +1,47 @@
+/**@constructor*/
+function Hash() {
+ this.reset();
+}
+
+Hash.prototype.reset = function() {
+ this.elements = {};
+}
+
+Hash.prototype.put = function() {
+ for (var i = 0, l = arguments.length; i < l; i++) {
+ this.elements[arguments[i]] = arguments[++i];
+ }
+}
+
+Hash.prototype.has = function(key) {
+ return this.elements.hasOwnProperty(key);
+}
+
+Hash.prototype.get = function(key) {
+ return (this.has(key)) ? this.elements[key] : undefined;
+}
+
+Hash.prototype.drop = function(key) {
+ if (this.has(key)) {
+ delete this.elements[key];
+ }
+}
+
+Hash.prototype.rename = function(oldKey, newKey) {
+ if (oldKey != newKey && this.has(oldKey)) {
+ this.elements[newKey] = this.elements[oldKey];
+ delete this.elements[oldKey];
+ }
+}
+
+Hash.prototype.keys = function() {
+ var keys = [];
+ for (var key in this.elements) if (this.has(key)) keys.push(key);
+ return keys;
+}
+
+Hash.prototype.values = function() {
+ var values = [];
+ for (var key in this.elements) if (this.has(key)) values.push(this.get(key));
+ return values;
+}
Index: /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/frame/Link.js
===================================================================
--- /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/frame/Link.js (revision 4056)
+++ /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/frame/Link.js (revision 4056)
@@ -0,0 +1,142 @@
+/** Handle the creation of HTML links to documented symbols.
+ @constructor
+*/
+function Link() {
+ this.alias = "";
+ this.src = "";
+ this.file = "";
+ this.text = "";
+ this.innerName = "";
+ this.classLink = false;
+ this.targetName = "";
+
+ this.target = function(targetName) {
+ if (defined(targetName)) this.targetName = targetName;
+ return this;
+ }
+ this.inner = function(inner) {
+ if (defined(inner)) this.innerName = inner;
+ return this;
+ }
+ this.withText = function(text) {
+ if (defined(text)) this.text = text;
+ return this;
+ }
+ this.toSrc = function(filename) {
+ if (defined(filename)) this.src = filename;
+ return this;
+ }
+ this.toSymbol = function(alias) {
+ if (defined(alias)) this.alias = new String(alias);
+ return this;
+ }
+ this.toClass = function(alias) {
+ this.classLink = true;
+ return this.toSymbol(alias);
+ }
+ this.toFile = function(file) {
+ if (defined(file)) this.file = file;
+ return this;
+ }
+
+ this.toString = function() {
+ var linkString;
+ var thisLink = this;
+
+ if (this.alias) {
+ linkString = this.alias.replace(/(^|[^a-z$0-9_#.:^-])([|a-z$0-9_#.:^-]+)($|[^a-z$0-9_#.:^-])/i,
+ function(match, prematch, symbolName, postmatch) {
+ var symbolNames = symbolName.split("|");
+ var links = [];
+ for (var i = 0, l = symbolNames.length; i < l; i++) {
+ thisLink.alias = symbolNames[i];
+ links.push(thisLink._makeSymbolLink(symbolNames[i]));
+ }
+ return prematch+links.join("|")+postmatch;
+ }
+ );
+ }
+ else if (this.src) {
+ linkString = thisLink._makeSrcLink(this.src);
+ }
+ else if (this.file) {
+ linkString = thisLink._makeFileLink(this.file);
+ }
+
+ return linkString;
+ }
+}
+
+/** prefixed for hashes */
+Link.hashPrefix = "";
+
+/** Appended to the front of relative link paths. */
+Link.base = "";
+
+Link.symbolNameToLinkName = function(symbol) {
+ var linker = "";
+ if (symbol.isStatic) linker = ".";
+ else if (symbol.isInner) linker = "-";
+
+ return Link.hashPrefix+linker+symbol.name;
+}
+
+/** Create a link to a snother symbol. */
+Link.prototype._makeSymbolLink = function(alias) {
+ var linkBase = Link.base+publish.conf.symbolsDir;
+ var linkTo = Link.symbolSet.getSymbol(alias);
+ var linkPath;
+ var target = (this.targetName)? " target=\""+this.targetName+"\"" : "";
+
+ // is it an internal link?
+ if (alias.charAt(0) == "#") var linkPath = alias;
+
+ // if there is no symbol by that name just return the name unaltered
+ else if (!linkTo) return this.text || alias;
+
+ // it's a symbol in another file
+ else {
+
+ if (!linkTo.is("CONSTRUCTOR") && !linkTo.isNamespace) { // it's a method or property
+ linkPath = escape(linkTo.memberOf) || "_global_";
+ linkPath += publish.conf.ext + "#" + Link.symbolNameToLinkName(linkTo);
+ }
+ else {
+ linkPath = escape(linkTo.alias);
+ linkPath += publish.conf.ext + (this.classLink? "":"#" + Link.hashPrefix + "constructor");
+ }
+ linkPath = linkBase + linkPath
+ }
+
+ var linkText = this.text || alias;
+
+ var link = {linkPath: linkPath, linkText: linkText};
+
+ if (typeof JSDOC.PluginManager != "undefined") {
+ JSDOC.PluginManager.run("onSymbolLink", link);
+ }
+
+ return ""+link.linkText+"";
+}
+
+/** Create a link to a source file. */
+Link.prototype._makeSrcLink = function(srcFilePath) {
+ var target = (this.targetName)? " target=\""+this.targetName+"\"" : "";
+
+ // transform filepath into a filename
+ var srcFile = srcFilePath.replace(/\.\.?[\\\/]/g, "").replace(/[:\\\/]/g, "_");
+ var outFilePath = Link.base + publish.conf.srcDir + srcFile + publish.conf.ext;
+
+ if (!this.text) this.text = FilePath.fileName(srcFilePath);
+ return ""+this.text+"";
+}
+
+/** Create a link to a source file. */
+Link.prototype._makeFileLink = function(filePath) {
+ var target = (this.targetName)? " target=\""+this.targetName+"\"" : "";
+
+ var outFilePath = Link.base + filePath;
+
+ if (!this.text) this.text = filePath;
+ return ""+this.text+"";
+}
Index: /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/frame/Namespace.js
===================================================================
--- /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/frame/Namespace.js (revision 4056)
+++ /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/frame/Namespace.js (revision 4056)
@@ -0,0 +1,10 @@
+_global_ = this;
+
+function Namespace(name, f) {
+ var n = name.split(".");
+ for (var o = _global_, i = 0, l = n.length; i < l; i++) {
+ o = o[n[i]] = o[n[i]] || {};
+ }
+
+ if (f) f();
+}
Index: /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/frame/Opt.js
===================================================================
--- /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/frame/Opt.js (revision 4056)
+++ /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/frame/Opt.js (revision 4056)
@@ -0,0 +1,134 @@
+/** @namespace */
+Opt = {
+ /**
+ * Get commandline option values.
+ * @param {Array} args Commandline arguments. Like ["-a=xml", "-b", "--class=new", "--debug"]
+ * @param {object} optNames Map short names to long names. Like {a:"accept", b:"backtrace", c:"class", d:"debug"}.
+ * @return {object} Short names and values. Like {a:"xml", b:true, c:"new", d:true}
+ */
+ get: function(args, optNames) {
+ var opt = {"_": []}; // the unnamed option allows multiple values
+ for (var i = 0; i < args.length; i++) {
+ var arg = new String(args[i]);
+ var name;
+ var value;
+ if (arg.charAt(0) == "-") {
+ if (arg.charAt(1) == "-") { // it's a longname like --foo
+ arg = arg.substring(2);
+ var m = arg.split("=");
+ name = m.shift();
+ value = m.shift();
+ if (typeof value == "undefined") value = true;
+
+ for (var n in optNames) { // convert it to a shortname
+ if (name == optNames[n]) {
+ name = n;
+ }
+ }
+ }
+ else { // it's a shortname like -f
+ arg = arg.substring(1);
+ var m = arg.split("=");
+ name = m.shift();
+ value = m.shift();
+ if (typeof value == "undefined") value = true;
+
+ for (var n in optNames) { // find the matching key
+ if (name == n || name+'[]' == n) {
+ name = n;
+ break;
+ }
+ }
+ }
+ if (name.match(/(.+)\[\]$/)) { // it's an array type like n[]
+ name = RegExp.$1;
+ if (!opt[name]) opt[name] = [];
+ }
+
+ if (opt[name] && opt[name].push) {
+ opt[name].push(value);
+ }
+ else {
+ opt[name] = value;
+ }
+ }
+ else { // not associated with any optname
+ opt._.push(args[i]);
+ }
+ }
+ return opt;
+ }
+}
+
+/*t:
+ plan(11, "Testing Opt.");
+
+ is(
+ typeof Opt,
+ "object",
+ "Opt is an object."
+ );
+
+ is(
+ typeof Opt.get,
+ "function",
+ "Opt.get is a function."
+ );
+
+ var optNames = {a:"accept", b:"backtrace", c:"class", d:"debug", "e[]":"exceptions"};
+ var t_options = Opt.get(["-a=xml", "-b", "--class=new", "--debug", "-e=one", "-e=two", "foo", "bar"], optNames);
+
+ is(
+ t_options.a,
+ "xml",
+ "an option defined with a short name can be accessed by its short name."
+ );
+
+ is(
+ t_options.b,
+ true,
+ "an option defined with a short name and no value are true."
+ );
+
+ is(
+ t_options.c,
+ "new",
+ "an option defined with a long name can be accessed by its short name."
+ );
+
+ is(
+ t_options.d,
+ true,
+ "an option defined with a long name and no value are true."
+ );
+
+ is(
+ typeof t_options.e,
+ "object",
+ "an option that can accept multiple values is defined."
+ );
+
+ is(
+ t_options.e.length,
+ 2,
+ "an option that can accept multiple values can have more than one value."
+ );
+
+ is(
+ t_options.e[1],
+ "two",
+ "an option that can accept multiple values can be accessed as an array."
+ );
+
+ is(
+ typeof t_options._,
+ "object",
+ "the property '_' is defined for unnamed options."
+ );
+
+ is(
+ t_options._[0],
+ "foo",
+ "the property '_' can be accessed as an array."
+ );
+ */
Index: /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/frame/Reflection.js
===================================================================
--- /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/frame/Reflection.js (revision 4056)
+++ /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/frame/Reflection.js (revision 4056)
@@ -0,0 +1,26 @@
+/**@constructor*/
+function Reflection(obj) {
+ this.obj = obj;
+}
+
+Reflection.prototype.getConstructorName = function() {
+ if (this.obj.constructor.name) return this.obj.constructor.name;
+ var src = this.obj.constructor.toSource();
+ var name = src.substring(name.indexOf("function")+8, src.indexOf('(')).replace(/ /g,'');
+ return name;
+}
+
+Reflection.prototype.getMethod = function(name) {
+ for (var p in this.obj) {
+ if (p == name && typeof(this.obj[p]) == "function") return this.obj[p];
+ }
+ return null;
+}
+
+Reflection.prototype.getParameterNames = function() {
+ var src = this.obj.toSource();
+ src = src.substring(
+ src.indexOf("(", 8)+1, src.indexOf(")")
+ );
+ return src.split(/, ?/);
+}
Index: /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/frame/String.js
===================================================================
--- /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/frame/String.js (revision 4056)
+++ /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/frame/String.js (revision 4056)
@@ -0,0 +1,93 @@
+/**
+ @name String
+ @class Additions to the core string object.
+*/
+
+/** @author Steven Levithan, released as public domain. */
+String.prototype.trim = function() {
+ var str = this.replace(/^\s+/, '');
+ for (var i = str.length - 1; i >= 0; i--) {
+ if (/\S/.test(str.charAt(i))) {
+ str = str.substring(0, i + 1);
+ break;
+ }
+ }
+ return str;
+}
+/*t:
+ plan(6, "Testing String.prototype.trim.");
+
+ var s = " a bc ".trim();
+ is(s, "a bc", "multiple spaces front and back are trimmed.");
+
+ s = "a bc\n\n".trim();
+ is(s, "a bc", "newlines only in back are trimmed.");
+
+ s = "\ta bc".trim();
+ is(s, "a bc", "tabs only in front are trimmed.");
+
+ s = "\n \t".trim();
+ is(s, "", "an all-space string is trimmed to empty.");
+
+ s = "a b\nc".trim();
+ is(s, "a b\nc", "a string with no spaces in front or back is trimmed to itself.");
+
+ s = "".trim();
+ is(s, "", "an empty string is trimmed to empty.");
+
+*/
+
+String.prototype.balance = function(open, close) {
+ var i = 0;
+ while (this.charAt(i) != open) {
+ if (i == this.length) return [-1, -1];
+ i++;
+ }
+
+ var j = i+1;
+ var balance = 1;
+ while (j < this.length) {
+ if (this.charAt(j) == open) balance++;
+ if (this.charAt(j) == close) balance--;
+ if (balance == 0) break;
+ j++;
+ if (j == this.length) return [-1, -1];
+ }
+
+ return [i, j];
+}
+/*t:
+ plan(16, "Testing String.prototype.balance.");
+
+ var s = "{abc}".balance("{","}");
+ is(s[0], 0, "opener in first is found.");
+ is(s[1], 4, "closer in last is found.");
+
+ s = "ab{c}de".balance("{","}");
+ is(s[0], 2, "opener in middle is found.");
+ is(s[1], 4, "closer in middle is found.");
+
+ s = "a{b{c}de}f".balance("{","}");
+ is(s[0], 1, "nested opener is found.");
+ is(s[1], 8, "nested closer is found.");
+
+ s = "{}".balance("{","}");
+ is(s[0], 0, "opener with no content is found.");
+ is(s[1], 1, "closer with no content is found.");
+
+ s = "".balance("{","}");
+ is(s[0], -1, "empty string opener is -1.");
+ is(s[1], -1, "empty string closer is -1.");
+
+ s = "{abc".balance("{","}");
+ is(s[0], -1, "opener with no closer returns -1.");
+ is(s[1], -1, "no closer returns -1.");
+
+ s = "abc".balance("{","}");
+ is(s[0], -1, "no opener or closer returns -1 for opener.");
+ is(s[1], -1, "no opener or closer returns -1 for closer.");
+
+ s = "aX11/MIT License
+ * (See the accompanying README file for full details.)
+ */
+
+/**
+ Yet another unit testing tool for JavaScript.
+ @author Michael Mathews micmath@gmail.com
+ @param {object} testCases Properties are testcase names, values are functions to execute as tests.
+*/
+function testrun(testCases) {
+ var ran = 0;
+ for (t in testCases) {
+ var result = testCases[t]();
+ ran++;
+ }
+
+ return testrun.reportOut+"-------------------------------\n"+((testrun.fails>0)? ":( Failed "+testrun.fails+"/" : ":) Passed all ")+testrun.count+" test"+((testrun.count == 1)? "":"s")+".\n";
+}
+
+
+testrun.count = 0;
+testrun.current = null;
+testrun.passes = 0;
+testrun.fails = 0;
+testrun.reportOut = "";
+
+/** @private */
+testrun.report = function(text) {
+ testrun.reportOut += text+"\n";
+}
+
+/**
+ Check if test evaluates to true.
+ @param {string} test To be evaluated.
+ @param {string} message Optional. To be displayed in the report.
+ @return {boolean} True if the string test evaluates to true.
+*/
+ok = function(test, message) {
+ testrun.count++;
+
+ var result;
+ try {
+ result = eval(test);
+
+ if (result) {
+ testrun.passes++;
+ testrun.report(" OK "+testrun.count+" - "+((message != null)? message : ""));
+ }
+ else {
+ testrun.fails++;
+ testrun.report("NOT OK "+testrun.count+" - "+((message != null)? message : ""));
+ }
+ }
+ catch(e) {
+ testrun.fails++
+ testrun.report("NOT OK "+testrun.count+" - "+((message != null)? message : ""));
+
+ }
+}
+
+/**
+ Check if test is same as expected.
+ @param {string} test To be evaluated.
+ @param {string} expected
+ @param {string} message Optional. To be displayed in the report.
+ @return {boolean} True if (test == expected). Note that the comparison is not a strict equality check.
+*/
+is = function(test, expected, message) {
+ testrun.count++;
+
+ var result;
+ try {
+ result = eval(test);
+
+ if (result == expected) {
+ testrun.passes++
+ testrun.report(" OK "+testrun.count+" - "+((message != null)? message : ""));
+ }
+ else {
+ testrun.fails++
+ testrun.report("NOT OK "+testrun.count+" - "+((message != null)? message : ""));
+ testrun.report("expected: "+expected);
+ testrun.report(" got: "+result);
+ }
+ }
+ catch(e) {
+ testrun.fails++
+ testrun.report("NOT OK "+testrun.count+" - "+((message != null)? message : ""));
+ testrun.report("expected: "+expected);
+ testrun.report(" got: "+result);}
+}
+
+/**
+ Check if test matches pattern.
+ @param {string} test To be evaluated.
+ @param {string} pattern Used to create a RegExp.
+ @param {string} message Optional. To be displayed in the report.
+ @return {boolean} True if test matches pattern.
+*/
+like = function(test, pattern, message) {
+ testrun.count++;
+
+ var result;
+ try {
+ result = eval(test);
+ var rgx = new RegExp(pattern);
+
+ if (rgx.test(result)) {
+ testrun.passes++
+ testrun.report(" OK "+testrun.count+" - "+((message != null)? message : ""));
+ }
+ else {
+ testrun.fails++
+ testrun.report("NOT OK "+testrun.count+" - "+((message != null)? message : ""));
+ testrun.report(" this: "+result);
+ testrun.report("is not like: "+pattern);
+ }
+ }
+ catch(e) {
+ testrun.fails++
+ testrun.report("NOT OK "+testrun.count+" - "+((message != null)? message : ""));
+ }
+}
Index: /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/handlers/FOODOC.js
===================================================================
--- /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/handlers/FOODOC.js (revision 4056)
+++ /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/handlers/FOODOC.js (revision 4056)
@@ -0,0 +1,26 @@
+/**
+ This is the main container for the FOODOC handler.
+ @namespace
+*/
+FOODOC = {
+};
+
+/** The current version string of this application. */
+FOODOC.VERSION = "1.0";
+
+FOODOC.handle = function(srcFile, src) {
+ LOG.inform("Handling file '" + srcFile + "'");
+
+ return [
+ new JSDOC.Symbol(
+ "foo",
+ [],
+ "VIRTUAL",
+ new JSDOC.DocComment("/** This is a foo. */")
+ )
+ ];
+};
+
+FOODOC.publish = function(symbolgroup) {
+ LOG.inform("Publishing symbolgroup.");
+};
Index: /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/handlers/XMLDOC.js
===================================================================
--- /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/handlers/XMLDOC.js (revision 4056)
+++ /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/handlers/XMLDOC.js (revision 4056)
@@ -0,0 +1,26 @@
+/**
+ * This is the main container for the XMLDOC handler.
+ * @namespace
+ * @author Brett Fattori (bfattori@fry.com)
+ * @version $Revision: 498 $
+ */
+XMLDOC = {
+
+};
+
+/** The current version string of this application. */
+XMLDOC.VERSION = "1.0";
+
+/** Include the library necessary to handle XML files */
+IO.includeDir("handlers/XMLDOC/");
+
+/**
+ * @type Symbol[]
+ */
+XMLDOC.handle = function(srcFile, src) {
+
+};
+
+XMLDOC.publish = function(symbolgroup) {
+
+}
Index: /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/handlers/XMLDOC/DomReader.js
===================================================================
--- /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/handlers/XMLDOC/DomReader.js (revision 4056)
+++ /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/handlers/XMLDOC/DomReader.js (revision 4056)
@@ -0,0 +1,159 @@
+LOG.inform("XMLDOC.DomReader loaded");
+
+XMLDOC.DomReader = function(root) {
+
+ this.dom = root;
+
+ /**
+ * The current node the reader is on
+ */
+ this.node = root;
+
+ /**
+ * Get the current node the reader is on
+ * @type XMLDOC.Parser.node
+ */
+ XMLDOC.DomReader.prototype.getNode = function() {
+ return this.node;
+ };
+
+ /**
+ * Set the node the reader should be positioned on.
+ * @param node {XMLDOC.Parser.node}
+ */
+ XMLDOC.DomReader.prototype.setNode = function(node) {
+ this.node = node;
+ };
+
+ /**
+ * A helper method to make sure the current node will
+ * never return null, unless null is passed as the root.
+ * @param step {String} An expression to evaluate - should return a node or null
+ */
+ XMLDOC.DomReader.prototype.navigate = function(step) {
+ var n;
+ if ((n = step) != null)
+ {
+ this.node = n;
+ return this.node;
+ }
+ return null;
+ };
+
+ /**
+ * Get the root node of the current node's document.
+ */
+ XMLDOC.DomReader.prototype.root = function() {
+ this.navigate(this.dom);
+ };
+
+ /**
+ * Get the parent of the current node.
+ */
+ XMLDOC.DomReader.prototype.parent = function() {
+ return this.navigate(this.node.parentNode());
+ };
+
+ /**
+ * Get the first child of the current node.
+ */
+ XMLDOC.DomReader.prototype.firstChild = function() {
+ return this.navigate(this.node.firstChild());
+ };
+
+ /**
+ * Get the last child of the current node.
+ */
+ XMLDOC.DomReader.prototype.lastChild = function() {
+ return this.navigate(this.node.lastChild());
+ };
+
+ /**
+ * Get the next sibling of the current node.
+ */
+ XMLDOC.DomReader.prototype.nextSibling = function() {
+ return this.navigate(this.node.nextSibling());
+ };
+
+ /**
+ * Get the previous sibling of the current node.
+ */
+ XMLDOC.DomReader.prototype.prevSibling = function() {
+ return this.navigate(this.node.prevSibling());
+ };
+
+ //===============================================================================================
+ // Support methods
+
+ /**
+ * Walk the tree starting with the current node, calling the plug-in for
+ * each node visited. Each time the plug-in is called, the DomReader
+ * is passed as the only parameter. Use the {@link XMLDOC.DomReader#getNode} method
+ * to access the current node. This method uses a depth first traversal pattern.
+ *
+ * @param srcFile {String} The source file being evaluated
+ */
+ XMLDOC.DomReader.prototype.getSymbols = function(srcFile)
+ {
+ XMLDOC.DomReader.symbols = [];
+ XMLDOC.DomReader.currentFile = srcFile;
+ JSDOC.Symbol.srcFile = (srcFile || "");
+
+ if (defined(JSDOC.PluginManager)) {
+ JSDOC.PluginManager.run("onDomGetSymbols", this);
+ }
+
+ return XMLDOC.DomReader.symbols;
+ };
+
+ /**
+ * Find the node with the given name using a depth first traversal.
+ * Does not modify the DomReader's current node.
+ *
+ * @param name {String} The name of the node to find
+ * @return the node that was found, or null if not found
+ */
+ XMLDOC.DomReader.prototype.findNode = function(name)
+ {
+ var findNode = null;
+
+ // Start at the current node and move into the subtree,
+ // looking for the node with the given name
+ function deeper(node, find)
+ {
+ var look = null;
+
+ if (node) {
+ if (node.name == find)
+ {
+ return node;
+ }
+
+ if (node.firstChild())
+ {
+ look = deeper(node.firstChild(), find);
+ }
+
+ if (!look && node.nextSibling())
+ {
+ look = deeper(node.nextSibling(), find);
+ }
+ }
+
+ return look;
+ }
+
+ return deeper(this.getNode().firstChild(), name);
+ };
+
+ /**
+ * Find the next node with the given name using a depth first traversal.
+ *
+ * @param name {String} The name of the node to find
+ */
+ XMLDOC.DomReader.prototype.findPreviousNode = function(name)
+ {
+ };
+
+};
+
Index: /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/handlers/XMLDOC/XMLDoc.js
===================================================================
--- /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/handlers/XMLDOC/XMLDoc.js (revision 4056)
+++ /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/handlers/XMLDOC/XMLDoc.js (revision 4056)
@@ -0,0 +1,16 @@
+LOG.inform("XMLDOC.symbolize loaded");
+
+/**
+ * Convert the source file to a set of symbols
+ */
+XMLDOC.symbolize = function(srcFile, src) {
+
+ LOG.inform("Symbolizing file '" + srcFile + "'");
+
+ // XML files already have a defined structure, so we don't need to
+ // do anything but parse them. The DOM reader can create a symbol
+ // table from the parsed XML.
+ var dr = new XMLDOC.DomReader(XMLDOC.Parser.parse(src));
+ return dr.getSymbols(srcFile);
+
+};
Index: /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/handlers/XMLDOC/XMLParse.js
===================================================================
--- /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/handlers/XMLDOC/XMLParse.js (revision 4056)
+++ /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/handlers/XMLDOC/XMLParse.js (revision 4056)
@@ -0,0 +1,292 @@
+LOG.inform("XMLDOC.Parser loaded");
+
+/**
+ * XML Parser object. Returns an {@link #XMLDOC.Parser.node} which is
+ * the root element of the parsed document.
+ *
+ * By default, this parser will only handle well formed XML. To
+ * allow the parser to handle HTML, set the XMLDOC.Parser.strictMode
+ * variable to false before calling XMLDOC.Parser.parse().
+ *
+ * Note: If you pass poorly formed XML, it will cause the parser to throw
+ * an exception.
+ *
+ * @author Brett Fattori (bfattori@fry.com)
+ * @author $Author: micmath $
+ * @version $Revision: 497 $
+ */
+XMLDOC.Parser = {};
+
+/**
+ * Strict mode setting. Setting this to false allows HTML-style source to
+ * be parsed. Normally, well formed XML has defined end tags, or empty tags
+ * are properly formed. Default: true
+ * @type Boolean
+ */
+XMLDOC.Parser.strictMode = true;
+
+/**
+ * A node in an XML Document. Node types are ROOT, ELEMENT, COMMENT, PI, and TEXT.
+ * @param parent {XMLDOC.Parser.node} The parent node
+ * @param name {String} The node name
+ * @param type {String} One of the types
+ */
+XMLDOC.Parser.node = function(parent, name, type)
+{
+ this.name = name;
+ this.type = type || "ELEMENT";
+ this.parent = parent;
+ this.charData = "";
+ this.attrs = {};
+ this.nodes = [];
+ this.cPtr = 0;
+
+ XMLDOC.Parser.node.prototype.getAttributeNames = function() {
+ var a = [];
+ for (var o in this.attrs)
+ {
+ a.push(o);
+ }
+
+ return a;
+ };
+
+ XMLDOC.Parser.node.prototype.getAttribute = function(attr) {
+ return this.attrs[attr];
+ };
+
+ XMLDOC.Parser.node.prototype.setAttribute = function(attr, val) {
+ this.attrs[attr] = val;
+ };
+
+ XMLDOC.Parser.node.prototype.getChild = function(idx) {
+ return this.nodes[idx];
+ };
+
+ XMLDOC.Parser.node.prototype.parentNode = function() {
+ return this.parent;
+ };
+
+ XMLDOC.Parser.node.prototype.firstChild = function() {
+ return this.nodes[0];
+ };
+
+ XMLDOC.Parser.node.prototype.lastChild = function() {
+ return this.nodes[this.nodes.length - 1];
+ };
+
+ XMLDOC.Parser.node.prototype.nextSibling = function() {
+ var p = this.parent;
+ if (p && (p.nodes.indexOf(this) + 1 != p.nodes.length))
+ {
+ return p.getChild(p.nodes.indexOf(this) + 1);
+ }
+ return null;
+ };
+
+ XMLDOC.Parser.node.prototype.prevSibling = function() {
+ var p = this.parent;
+ if (p && (p.nodes.indexOf(this) - 1 >= 0))
+ {
+ return p.getChild(p.nodes.indexOf(this) - 1);
+ }
+ return null;
+ };
+};
+
+/**
+ * Parse an XML Document from the specified source. The XML should be
+ * well formed, unless strict mode is disabled, then the parser will
+ * handle HTML-style XML documents.
+ * @param src {String} The source to parse
+ */
+XMLDOC.Parser.parse = function(src)
+{
+ var A = [];
+
+ // Normailize whitespace
+ A = src.split("\r\n");
+ src = A.join("\n");
+ A = src.split("\r");
+ src = A.join("\n");
+
+ // Remove XML and DOCTYPE specifier
+ src.replace(/<\?XML .*\?>/i, "");
+ src.replace(//i, "");
+
+ // The document is the root node and cannot be modified or removed
+ var doc = new XMLDOC.Parser.node(null, "ROOT", "DOCUMENT");
+
+ // Let's break it down
+ XMLDOC.Parser.eat(doc, src);
+
+ return doc;
+};
+
+/**
+ * The XML fragment processing routine. This method is private and should not be called
+ * directly.
+ * @param parentNode {XMLDOC.Parser.node} The node which is the parent of this fragment
+ * @param src {String} The source within the fragment to process
+ * @private
+ */
+XMLDOC.Parser.eat = function(parentNode, src)
+{
+ // A simple tag def
+ var reTag = new RegExp("<(!|)(\\?|--|)((.|\\s)*?)\\2>","g");
+
+ // Special tag types
+ var reCommentTag = //;
+ var rePITag = /<\?((.|\s)*?)\?>/;
+
+ // A start tag (with potential empty marker)
+ var reStartTag = /<(.*?)( +([\w_\-]*)=(\"|')(.*)\4)*(\/)?>/;
+
+ // An empty HTML style tag (not proper XML, but we'll accept it so we can process HTML)
+ var reHTMLEmptyTag = /<(.*?)( +([\w_\-]*)=(\"|')(.*)\4)*>/;
+
+ // Fully enclosing tag with nested tags
+ var reEnclosingTag = /<(.*?)( +([\w_\-]*)=(\"|')(.*?)\4)*>((.|\s)*?)<\/\1>/;
+
+ // Breaks down attributes
+ var reAttributes = new RegExp(" +([\\w_\\-]*)=(\"|')(.*?)\\2","g");
+
+ // Find us a tag
+ var tag;
+ while ((tag = reTag.exec(src)) != null)
+ {
+ if (tag.index > 0)
+ {
+ // The next tag has some text before it
+ var text = src.substring(0, tag.index).replace(/^[ \t\n]+((.|\n)*?)[ \t\n]+$/, "$1");
+
+ if (text.length > 0 && (text != "\n"))
+ {
+ var txtnode = new XMLDOC.Parser.node(parentNode, "", "TEXT");
+ txtnode.charData = text;
+
+ // Append the new text node
+ parentNode.nodes.push(txtnode);
+ }
+
+ // Reset the lastIndex of reTag
+ reTag.lastIndex -= src.substring(0, tag.index).length;
+
+ // Eat the text
+ src = src.substring(tag.index);
+ }
+
+ if (reCommentTag.test(tag[0]))
+ {
+ // Is this a comment?
+ var comment = new XMLDOC.Parser.node(parentNode, "", "COMMENT");
+ comment.charData = reCommentTag.exec(tag[0])[1];
+
+ // Append the comment
+ parentNode.nodes.push(comment);
+
+ // Move the lastIndex of reTag
+ reTag.lastIndex -= tag[0].length;
+
+ // Eat the tag
+ src = src.replace(reCommentTag, "");
+ }
+ else if (rePITag.test(tag[0]))
+ {
+ // Is this a processing instruction?
+ var pi = new XMLDOC.Parser.node(parentNode, "", "PI");
+ pi.charData = rePITag.exec(tag[0])[1];
+
+ // Append the processing instruction
+ parentNode.nodes.push(pi);
+
+ // Move the lastIndex of reTag
+ reTag.lastIndex -= tag[0].length;
+
+ // Eat the tag
+ src = src.replace(rePITag, "");
+ }
+ else if (reStartTag.test(tag[0]))
+ {
+ // Break it down
+ var e = reStartTag.exec(tag[0]);
+ var elem = new XMLDOC.Parser.node(parentNode, e[1], "ELEMENT");
+
+ // Get attributes from the tag
+ var a;
+ while ((a = reAttributes.exec(e[2])) != null )
+ {
+ elem.attrs[a[1]] = a[3];
+ }
+
+ // Is this an empty XML-style tag?
+ if (e[6] == "/")
+ {
+ // Append the empty element
+ parentNode.nodes.push(elem);
+
+ // Move the lastIndex of reTag (include the start tag length)
+ reTag.lastIndex -= e[0].length;
+
+ // Eat the tag
+ src = src.replace(reStartTag, "");
+ }
+ else
+ {
+ // Check for malformed XML tags
+ var htmlParsed = false;
+ var htmlStartTag = reHTMLEmptyTag.exec(src);
+
+ // See if there isn't an end tag within this block
+ var reHTMLEndTag = new RegExp("");
+ var htmlEndTag = reHTMLEndTag.exec(src);
+
+ if (XMLDOC.Parser.strictMode && htmlEndTag == null)
+ {
+ // Poorly formed XML fails in strict mode
+ var err = new Error("Malformed XML passed to XMLDOC.Parser... Error contains malformed 'src'");
+ err.src = src;
+ throw err;
+ }
+ else if (htmlEndTag == null)
+ {
+ // This is an HTML-style empty tag, store the element for it in non-strict mode
+ parentNode.nodes.push(elem);
+
+ // Eat the tag
+ src = src.replace(reHTMLEmptyTag, "");
+ htmlParsed = true;
+ }
+
+ // If we didn't parse HTML-style, it must be an enclosing tag
+ if (!htmlParsed)
+ {
+ var enc = reEnclosingTag.exec(src);
+
+ // Go deeper into the document
+ XMLDOC.Parser.eat(elem, enc[6]);
+
+ // Append the new element node
+ parentNode.nodes.push(elem);
+
+ // Eat the tag
+ src = src.replace(reEnclosingTag, "");
+ }
+ }
+
+ // Reset the lastIndex of reTag
+ reTag.lastIndex = 0;
+ }
+ }
+
+ // No tag was found... append the text if there is any
+ src = src.replace(/^[ \t\n]+((.|\n)*?)[ \t\n]+$/, "$1");
+ if (src.length > 0 && (src != "\n"))
+ {
+ var txtNode = new XMLDOC.Parser.node(parentNode, "", "TEXT");
+ txtNode.charData = src;
+
+ // Append the new text node
+ parentNode.nodes.push(txtNode);
+ }
+};
Index: /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/lib/JSDOC.js
===================================================================
--- /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/lib/JSDOC.js (revision 4056)
+++ /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/lib/JSDOC.js (revision 4056)
@@ -0,0 +1,98 @@
+/**
+ @overview
+ @date $Date: 2008-08-02 10:25:54 +0200 (Sat, 02 Aug 2008) $
+ @version $Revision: 668 $
+ @location $HeadURL: http://jsdoc-toolkit.googlecode.com/svn/tags/jsdoc_toolkit-2.0.2/jsdoc-toolkit/app/lib/JSDOC.js $
+ @name whateverFilename.js
+ */
+
+/**
+ This is the main container for the JSDOC application.
+ @namespace
+*/
+JSDOC = {
+};
+
+/**
+ @requires Opt
+ */
+if (typeof arguments == "undefined") arguments = [];
+JSDOC.opt = Opt.get(
+ arguments,
+ {
+ d: "directory",
+ c: "conf",
+ t: "template",
+ r: "recurse",
+ x: "ext",
+ p: "private",
+ a: "allfunctions",
+ e: "encoding",
+ n: "nocode",
+ o: "out",
+ s: "suppress",
+ T: "testmode",
+ h: "help",
+ v: "verbose",
+ "D[]": "define",
+ "H[]": "handler"
+ }
+);
+
+/** The current version string of this application. */
+JSDOC.VERSION = "2.0.2";
+
+/** Print out usage information and quit. */
+JSDOC.usage = function() {
+ print("USAGE: java -jar jsrun.jar app/run.js [OPTIONS] ...");
+ print("");
+ print("OPTIONS:");
+ print(" -a or --allfunctions\n Include all functions, even undocumented ones.\n");
+ print(" -c or --conf\n Load a configuration file.\n");
+ print(" -d= or --directory=\n Output to this directory (defaults to \"out\").\n");
+ print(" -D=\"myVar:My value\" or --define=\"myVar:My value\"\n Multiple. Define a variable, available in JsDoc as JSDOC.opt.D.myVar\n");
+ print(" -e= or --encoding=\n Use this encoding to read and write files.\n");
+ print(" -h or --help\n Show this message and exit.\n");
+ //print(" -H=ext:handler or --handler=ext:handler\n Multiple. Load handlers/handler.js to handle files with .ext names.\n");
+ print(" -n or --nocode\n Ignore all code, only document comments with @name tags.\n");
+ print(" -o= or --out=\n Print log messages to a file (defaults to stdout).\n");
+ print(" -p or --private\n Include symbols tagged as private, underscored and inner symbols.\n");
+ print(" -r= or --recurse=\n Descend into src directories.\n");
+ print(" -s or --suppress\n Suppress source code output.\n");
+ print(" -t= or --template=\n Required. Use this template to format the output.\n");
+ print(" -T or --test\n Run all unit tests and exit.\n");
+ print(" -v or --verbose\n Provide verbose feedback about what is happening.\n");
+ print(" -x=[,EXT]... or --ext=[,EXT]...\n Scan source files with the given extension/s (defaults to js).\n");
+
+ quit();
+}
+
+/*t:
+ plan(4, "Testing JSDOC namespace.");
+
+ is(
+ typeof JSDOC,
+ "object",
+ "JSDOC.usage is a function."
+ );
+
+ is(
+ typeof JSDOC.VERSION,
+ "string",
+ "JSDOC.VERSION is a string."
+ );
+
+ is(
+ typeof JSDOC.usage,
+ "function",
+ "JSDOC.usage is a function."
+ );
+
+ is(
+ typeof JSDOC.opt,
+ "object",
+ "JSDOC.opt is a object."
+ );
+ */
+
+if (this.IO) IO.includeDir("lib/JSDOC/");
Index: /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/lib/JSDOC/DocComment.js
===================================================================
--- /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/lib/JSDOC/DocComment.js (revision 4056)
+++ /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/lib/JSDOC/DocComment.js (revision 4056)
@@ -0,0 +1,200 @@
+if (typeof JSDOC == "undefined") JSDOC = {};
+
+/**
+ Create a new DocComment. This takes a raw documentation comment,
+ and wraps it in useful accessors.
+ @class Represents a documentation comment object.
+ */
+JSDOC.DocComment = function(/**String*/comment) {
+ this.init();
+ if (typeof comment != "undefined") {
+ this.parse(comment);
+ }
+}
+
+JSDOC.DocComment.prototype.init = function() {
+ this.isUserComment = true;
+ this.src = "";
+ this.meta = "";
+ this.tagTexts = [];
+ this.tags = [];
+}
+
+/**
+ @requires JSDOC.DocTag
+ */
+JSDOC.DocComment.prototype.parse = function(/**String*/comment) {
+ if (comment == "") {
+ comment = "/** @desc */";
+ this.isUserComment = false;
+ }
+
+ this.src = JSDOC.DocComment.unwrapComment(comment);
+
+ this.meta = "";
+ if (this.src.indexOf("#") == 0) {
+ this.src.match(/#(.+[+-])([\s\S]*)$/);
+ if (RegExp.$1) this.meta = RegExp.$1;
+ if (RegExp.$2) this.src = RegExp.$2;
+ }
+
+ this.fixDesc();
+
+ if (typeof JSDOC.PluginManager != "undefined") {
+ JSDOC.PluginManager.run("onDocCommentSrc", this);
+ }
+
+ this.src = JSDOC.DocComment.shared+"\n"+this.src;
+
+ this.tagTexts =
+ this.src
+ .split(/(^|[\r\n])\s*@/)
+ .filter(function($){return $.match(/\S/)});
+
+ /**
+ The tags found in the comment.
+ @type JSDOC.DocTag[]
+ */
+ this.tags = this.tagTexts.map(function($){return new JSDOC.DocTag($)});
+
+ if (typeof JSDOC.PluginManager != "undefined") {
+ JSDOC.PluginManager.run("onDocCommentTags", this);
+ }
+}
+
+/*t:
+ plan(5, "testing JSDOC.DocComment");
+ requires("../frame/String.js");
+ requires("../lib/JSDOC/DocTag.js");
+
+ var com = new JSDOC.DocComment("/**@foo some\n* comment here*"+"/");
+ is(com.tagTexts[0], "foo some\ncomment here", "first tag text is found.");
+ is(com.tags[0].title, "foo", "the title is found in a comment with one tag.");
+
+ var com = new JSDOC.DocComment("/** @foo first\n* @bar second*"+"/");
+ is(com.getTag("bar").length, 1, "getTag() returns one tag by that title.");
+
+ JSDOC.DocComment.shared = "@author John Smith";
+ var com = new JSDOC.DocComment("/**@foo some\n* comment here*"+"/");
+ is(com.tags[0].title, "author", "shared comment is added.");
+ is(com.tags[1].title, "foo", "shared comment is added to existing tag.");
+*/
+
+/**
+ If no @desc tag is provided, this function will add it.
+ */
+JSDOC.DocComment.prototype.fixDesc = function() {
+ if (this.meta && this.meta != "@+") return;
+ if (/^\s*[^@\s]/.test(this.src)) {
+ this.src = "@desc "+this.src;
+ }
+}
+
+/*t:
+ plan(5, "testing JSDOC.DocComment#fixDesc");
+
+ var com = new JSDOC.DocComment();
+
+ com.src = "this is a desc\n@author foo";
+ com.fixDesc();
+ is(com.src, "@desc this is a desc\n@author foo", "if no @desc tag is provided one is added.");
+
+ com.src = "x";
+ com.fixDesc();
+ is(com.src, "@desc x", "if no @desc tag is provided one is added to a single character.");
+
+ com.src = "\nx";
+ com.fixDesc();
+ is(com.src, "@desc \nx", "if no @desc tag is provided one is added to return and character.");
+
+ com.src = " ";
+ com.fixDesc();
+ is(com.src, " ", "if no @desc tag is provided one is not added to just whitespace.");
+
+ com.src = "";
+ com.fixDesc();
+ is(com.src, "", "if no @desc tag is provided one is not added to empty.");
+*/
+
+/**
+ Remove slash-star comment wrapper from a raw comment string.
+ @type String
+ */
+JSDOC.DocComment.unwrapComment = function(/**String*/comment) {
+ if (!comment) return "";
+ var unwrapped = comment.replace(/(^\/\*\*|\*\/$)/g, "").replace(/^\s*\* ?/gm, "");
+ return unwrapped;
+}
+
+/*t:
+ plan(5, "testing JSDOC.DocComment.unwrapComment");
+
+ var com = "/**x*"+"/";
+ var unwrapped = JSDOC.DocComment.unwrapComment(com);
+ is(unwrapped, "x", "a single character jsdoc is found.");
+
+ com = "/***x*"+"/";
+ unwrapped = JSDOC.DocComment.unwrapComment(com);
+ is(unwrapped, "x", "three stars are allowed in the opener.");
+
+ com = "/****x*"+"/";
+ unwrapped = JSDOC.DocComment.unwrapComment(com);
+ is(unwrapped, "*x", "fourth star in the opener is kept.");
+
+ com = "/**x\n * y\n*"+"/";
+ unwrapped = JSDOC.DocComment.unwrapComment(com);
+ is(unwrapped, "x\ny\n", "leading stars and spaces are trimmed.");
+
+ com = "/**x\n * y\n*"+"/";
+ unwrapped = JSDOC.DocComment.unwrapComment(com);
+ is(unwrapped, "x\n y\n", "only first space after leading stars are trimmed.");
+*/
+
+/**
+ Provides a printable version of the comment.
+ @type String
+ */
+JSDOC.DocComment.prototype.toString = function() {
+ return this.src;
+}
+
+/*t:
+ plan(1, "testing JSDOC.DocComment#fixDesc");
+ var com = new JSDOC.DocComment();
+ com.src = "foo";
+ is(""+com, "foo", "stringifying a comment returns the unwrapped src.");
+*/
+
+/**
+ Given the title of a tag, returns all tags that have that title.
+ @type JSDOC.DocTag[]
+ */
+JSDOC.DocComment.prototype.getTag = function(/**String*/tagTitle) {
+ return this.tags.filter(function($){return $.title == tagTitle});
+}
+
+/*t:
+ plan(1, "testing JSDOC.DocComment#getTag");
+ requires("../frame/String.js");
+ requires("../lib/JSDOC/DocTag.js");
+
+ var com = new JSDOC.DocComment("/**@foo some\n* @bar\n* @bar*"+"/");
+ is(com.getTag("bar").length, 2, "getTag returns expected number of tags.");
+*/
+
+/**
+ Used to store the currently shared tag text.
+*/
+JSDOC.DocComment.shared = "";
+
+/*t:
+ plan(2, "testing JSDOC.DocComment.shared");
+ requires("../frame/String.js");
+ requires("../lib/JSDOC/DocTag.js");
+
+ JSDOC.DocComment.shared = "@author Michael";
+
+ var com = new JSDOC.DocComment("/**@foo\n* @foo*"+"/");
+ is(com.getTag("author").length, 1, "getTag returns shared tag.");
+ is(com.getTag("foo").length, 2, "getTag returns unshared tags too.");
+*/
Index: /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/lib/JSDOC/DocTag.js
===================================================================
--- /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/lib/JSDOC/DocTag.js (revision 4056)
+++ /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/lib/JSDOC/DocTag.js (revision 4056)
@@ -0,0 +1,294 @@
+if (typeof JSDOC == "undefined") JSDOC = {};
+
+/**
+ @constructor
+ */
+JSDOC.DocTag = function(src) {
+ this.init();
+ if (typeof src != "undefined") {
+ this.parse(src);
+ }
+}
+
+/**
+ Create and initialize the properties of this.
+ */
+JSDOC.DocTag.prototype.init = function() {
+ this.title = "";
+ this.type = "";
+ this.name = "";
+ this.isOptional = false;
+ this.defaultValue = "";
+ this.desc = "";
+
+ return this;
+}
+
+/**
+ Populate the properties of this from the given tag src.
+ @param {string} src
+ */
+JSDOC.DocTag.prototype.parse = function(src) {
+ if (typeof src != "string") throw "src must be a string not "+(typeof src);
+
+ try {
+ src = this.nibbleTitle(src);
+ if (JSDOC.PluginManager) {
+ JSDOC.PluginManager.run("onDocTagSynonym", this);
+ }
+
+ src = this.nibbleType(src);
+
+ // only some tags are allowed to have names.
+ if (this.title == "param" || this.title == "property" || this.title == "config") { // @config is deprecated
+ src = this.nibbleName(src);
+ }
+ }
+ catch(e) {
+ if (LOG) LOG.warn(e);
+ else throw e;
+ }
+ this.desc = src; // whatever is left
+
+ // example tags need to have whitespace preserved
+ if (this.title != "example") this.desc = this.desc.trim();
+
+ if (JSDOC.PluginManager) {
+ JSDOC.PluginManager.run("onDocTag", this);
+ }
+}
+
+/**
+ Automatically called when this is stringified.
+ */
+JSDOC.DocTag.prototype.toString = function() {
+ return this.desc;
+}
+
+/*t:
+ plan(1, "testing JSDOC.DocTag#toString");
+
+ var tag = new JSDOC.DocTag("param {object} date A valid date.");
+ is(""+tag, "A valid date.", "stringifying a tag returns the desc.");
+ */
+
+/**
+ Find and shift off the title of a tag.
+ @param {string} src
+ @return src
+ */
+JSDOC.DocTag.prototype.nibbleTitle = function(src) {
+ if (typeof src != "string") throw "src must be a string not "+(typeof src);
+
+ var parts = src.match(/^\s*(\S+)(?:\s([\s\S]*))?$/);
+
+ if (parts && parts[1]) this.title = parts[1];
+ if (parts && parts[2]) src = parts[2];
+ else src = "";
+
+ return src;
+}
+
+/*t:
+ plan(8, "testing JSDOC.DocTag#nibbleTitle");
+
+ var tag = new JSDOC.DocTag();
+
+ tag.init().nibbleTitle("aTitleGoesHere");
+ is(tag.title, "aTitleGoesHere", "a title can be found in a single-word string.");
+
+ var src = tag.init().nibbleTitle("aTitleGoesHere and the rest");
+ is(tag.title, "aTitleGoesHere", "a title can be found in a multi-word string.");
+ is(src, "and the rest", "the rest is returned when the title is nibbled off.");
+
+ src = tag.init().nibbleTitle("");
+ is(tag.title, "", "given an empty string the title is empty.");
+ is(src, "", "the rest is empty when the tag is empty.");
+
+ var src = tag.init().nibbleTitle(" aTitleGoesHere\n a description");
+ is(tag.title, "aTitleGoesHere", "leading and trailing spaces are not part of the title.");
+ is(src, " a description", "leading spaces (less one) are part of the description.");
+
+ tag.init().nibbleTitle("a.Title::Goes_Here foo");
+ is(tag.title, "a.Title::Goes_Here", "titles with punctuation are allowed.");
+ */
+
+/**
+ Find and shift off the type of a tag.
+ @requires frame/String.js
+ @param {string} src
+ @return src
+ */
+JSDOC.DocTag.prototype.nibbleType = function(src) {
+ if (typeof src != "string") throw "src must be a string not "+(typeof src);
+
+ if (src.match(/^\s*\{/)) {
+ var typeRange = src.balance("{", "}");
+ if (typeRange[1] == -1) {
+ throw "Malformed comment tag ignored. Tag type requires an opening { and a closing }: "+src;
+ }
+ this.type = src.substring(typeRange[0]+1, typeRange[1]).trim();
+ this.type = this.type.replace(/\s*,\s*/g, "|"); // multiples can be separated by , or |
+ src = src.substring(typeRange[1]+1);
+ }
+
+ return src;
+}
+
+/*t:
+ plan(5, "testing JSDOC.DocTag.parser.nibbleType");
+ requires("../frame/String.js");
+
+ var tag = new JSDOC.DocTag();
+
+ tag.init().nibbleType("{String[]} aliases");
+ is(tag.type, "String[]", "type can have non-alpha characters.");
+
+ tag.init().nibbleType("{ aTypeGoesHere } etc etc");
+ is(tag.type, "aTypeGoesHere", "type is trimmed.");
+
+ tag.init().nibbleType("{ oneType, twoType ,\n threeType } etc etc");
+ is(tag.type, "oneType|twoType|threeType", "multiple types can be separated by commas.");
+
+ var error;
+ try { tag.init().nibbleType("{widget foo"); }
+ catch(e) { error = e; }
+ is(typeof error, "string", "malformed tag type throws error.");
+ isnt(error.indexOf("Malformed"), -1, "error message tells tag is malformed.");
+ */
+
+/**
+ Find and shift off the name of a tag.
+ @requires frame/String.js
+ @param {string} src
+ @return src
+ */
+JSDOC.DocTag.prototype.nibbleName = function(src) {
+ if (typeof src != "string") throw "src must be a string not "+(typeof src);
+
+ src = src.trim();
+
+ // is optional?
+ if (src.charAt(0) == "[") {
+ var nameRange = src.balance("[", "]");
+ if (nameRange[1] == -1) {
+ throw "Malformed comment tag ignored. Tag optional name requires an opening [ and a closing ]: "+src;
+ }
+ this.name = src.substring(nameRange[0]+1, nameRange[1]).trim();
+ this.isOptional = true;
+
+ src = src.substring(nameRange[1]+1);
+
+ // has default value?
+ var nameAndValue = this.name.split("=");
+ if (nameAndValue.length) {
+ this.name = nameAndValue.shift().trim();
+ this.defaultValue = nameAndValue.join("=");
+ }
+ }
+ else {
+ var parts = src.match(/^(\S+)(?:\s([\s\S]*))?$/);
+ if (parts) {
+ if (parts[1]) this.name = parts[1];
+ if (parts[2]) src = parts[2].trim();
+ else src = "";
+ }
+ }
+
+ return src;
+}
+
+/*t:
+ requires("../frame/String.js");
+ plan(9, "testing JSDOC.DocTag.parser.nibbleName");
+
+ var tag = new JSDOC.DocTag();
+
+ tag.init().nibbleName("[foo] This is a description.");
+ is(tag.isOptional, true, "isOptional syntax is detected.");
+ is(tag.name, "foo", "optional param name is found.");
+
+ tag.init().nibbleName("[foo] This is a description.");
+ is(tag.isOptional, true, "isOptional syntax is detected when no type.");
+ is(tag.name, "foo", "optional param name is found when no type.");
+
+ tag.init().nibbleName("[foo=7] This is a description.");
+ is(tag.name, "foo", "optional param name is found when default value.");
+ is(tag.defaultValue, 7, "optional param default value is found when default value.");
+
+ //tag.init().nibbleName("[foo= a value] This is a description.");
+ //is(tag.defaultValue, " a value", "optional param default value is found when default value has spaces (issue #112).");
+
+ tag.init().nibbleName("[foo=[]] This is a description.");
+ is(tag.defaultValue, "[]", "optional param default value is found when default value is [] (issue #95).");
+
+ tag.init().nibbleName("[foo=a=b] This is a description.");
+ is(tag.name, "foo", "optional param name is found when default value is a=b.");
+ is(tag.defaultValue, "a=b", "optional param default value is found when default value is a=b.")
+ */
+
+/*t:
+ plan(32, "Testing JSDOC.DocTag.parser.");
+ requires("../frame/String.js");
+
+ var tag = new JSDOC.DocTag();
+
+ is(typeof tag, "object", "JSDOC.DocTag.parser with an empty string returns an object.");
+ is(typeof tag.title, "string", "returned object has a string property 'title'.");
+ is(typeof tag.type, "string", "returned object has a string property 'type'.");
+ is(typeof tag.name, "string", "returned object has a string property 'name'.");
+ is(typeof tag.defaultValue, "string", "returned object has a string property 'defaultValue'.");
+ is(typeof tag.isOptional, "boolean", "returned object has a boolean property 'isOptional'.");
+ is(typeof tag.desc, "string", "returned object has a string property 'desc'.");
+
+ tag = new JSDOC.DocTag("param {widget} foo");
+ is(tag.title, "param", "param title is found.");
+ is(tag.name, "foo", "param name is found when desc is missing.");
+ is(tag.desc, "", "param desc is empty when missing.");
+
+ tag = new JSDOC.DocTag("param {object} date A valid date.");
+ is(tag.name, "date", "param name is found with a type.");
+ is(tag.type, "object", "param type is found.");
+ is(tag.desc, "A valid date.", "param desc is found with a type.");
+
+ tag = new JSDOC.DocTag("param aName a description goes\n here.");
+ is(tag.name, "aName", "param name is found without a type.");
+ is(tag.desc, "a description goes\n here.", "param desc is found without a type.");
+
+ tag = new JSDOC.DocTag("param {widget}");
+ is(tag.name, "", "param name is empty when it is not given.");
+
+ tag = new JSDOC.DocTag("param {widget} [foo] This is a description.");
+ is(tag.name, "foo", "optional param name is found.");
+
+ tag = new JSDOC.DocTag("return {aType} This is a description.");
+ is(tag.type, "aType", "when return tag has no name, type is found.");
+ is(tag.desc, "This is a description.", "when return tag has no name, desc is found.");
+
+ tag = new JSDOC.DocTag("author Joe Coder ");
+ is(tag.title, "author", "author tag has a title.");
+ is(tag.type, "", "the author tag has no type.");
+ is(tag.name, "", "the author tag has no name.");
+ is(tag.desc, "Joe Coder ", "author tag has desc.");
+
+ tag = new JSDOC.DocTag("private \t\n ");
+ is(tag.title, "private", "private tag has a title.");
+ is(tag.type, "", "the private tag has no type.");
+ is(tag.name, "", "the private tag has no name.");
+ is(tag.desc, "", "private tag has no desc.");
+
+ tag = new JSDOC.DocTag("example\n example(code);\n more();");
+ is(tag.desc, " example(code);\n more();", "leading whitespace (less one) in examples code is preserved.");
+
+ tag = new JSDOC.DocTag("param theName \n");
+ is(tag.name, "theName", "name only is found.");
+
+ tag = new JSDOC.DocTag("type theDesc \n");
+ is(tag.desc, "theDesc", "desc only is found.");
+
+ tag = new JSDOC.DocTag("type {theType} \n");
+ is(tag.type, "theType", "type only is found.");
+
+ tag = new JSDOC.DocTag("");
+ is(tag.title, "", "title is empty when tag is empty.");
+ */
Index: /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/lib/JSDOC/JsDoc.js
===================================================================
--- /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/lib/JSDOC/JsDoc.js (revision 4056)
+++ /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/lib/JSDOC/JsDoc.js (revision 4056)
@@ -0,0 +1,162 @@
+/**
+ @constructor
+ @param [opt] Used to override the commandline options. Useful for testing.
+ @version $Id: JsDoc.js 592 2008-05-09 07:43:33Z micmath $
+*/
+JSDOC.JsDoc = function(/**object*/ opt) {
+ if (opt) {
+ JSDOC.opt = opt;
+ }
+
+ // the -c option: use a configuration file
+ if (JSDOC.opt.c) {
+ eval("JSDOC.conf = " + IO.readFile(JSDOC.opt.c));
+
+ LOG.inform("Using configuration file at '"+JSDOC.opt.c+"'.");
+
+ for (var c in JSDOC.conf) {
+ if (c !== "D" && !defined(JSDOC.opt[c])) { // commandline overrules config file
+ JSDOC.opt[c] = JSDOC.conf[c];
+ }
+ }
+
+ if (typeof JSDOC.conf["_"] != "undefined") {
+ JSDOC.opt["_"] = JSDOC.opt["_"].concat(JSDOC.conf["_"]);
+ }
+
+ LOG.inform("With configuration: ");
+ for (var o in JSDOC.opt) {
+ LOG.inform(" "+o+": "+JSDOC.opt[o]);
+ }
+ }
+
+ if (JSDOC.opt.h) {
+ JSDOC.usage();
+ quit();
+ }
+
+ // defend against options that are not sane
+ if (JSDOC.opt._.length == 0) {
+ LOG.warn("No source files to work on. Nothing to do.");
+ quit();
+ }
+ if (JSDOC.opt.t === true || JSDOC.opt.d === true) {
+ JSDOC.usage();
+ }
+
+ if (typeof JSDOC.opt.d == "string") {
+ if (!JSDOC.opt.d.charAt(JSDOC.opt.d.length-1).match(/[\\\/]/)) {
+ JSDOC.opt.d = JSDOC.opt.d+"/";
+ }
+ LOG.inform("Output directory set to '"+JSDOC.opt.d+"'.");
+ IO.mkPath(JSDOC.opt.d);
+ }
+ if (JSDOC.opt.e) IO.setEncoding(JSDOC.opt.e);
+
+ // the -r option: scan source directories recursively
+ if (typeof JSDOC.opt.r == "boolean") JSDOC.opt.r = 10;
+ else if (!isNaN(parseInt(JSDOC.opt.r))) JSDOC.opt.r = parseInt(JSDOC.opt.r);
+ else JSDOC.opt.r = 1;
+
+ // the -D option: define user variables
+ var D = {};
+ if (JSDOC.opt.D) {
+ for (var i = 0; i < JSDOC.opt.D.length; i++) {
+ var defineParts = JSDOC.opt.D[i].split(":", 2);
+ if (defineParts) D[defineParts[0]] = defineParts[1];
+ }
+ }
+ JSDOC.opt.D = D;
+ // combine any conf file D options with the commandline D options
+ if (defined(JSDOC.conf)) for (var c in JSDOC.conf.D) {
+ if (!defined(JSDOC.opt.D[c])) {
+ JSDOC.opt.D[c] = JSDOC.conf.D[c];
+ }
+ }
+
+ // Load additional file handlers
+ // the -H option: filetype handlers
+ JSDOC.handlers = {};
+/*
+ if (JSDOC.opt.H) {
+ for (var i = 0; i < JSDOC.opt.H.length; i++) {
+ var handlerDef = JSDOC.opt.H[i].split(":");
+ LOG.inform("Adding '." + handlerDef[0] + "' content handler from handlers/" + handlerDef[1] + ".js");
+ IO.include("handlers/" + handlerDef[1] + ".js");
+ if (!eval("typeof "+handlerDef[1])) {
+ LOG.warn(handlerDef[1] + "is not defined in "+handlerDef[1] + ".js");
+ }
+ else {
+ JSDOC.handlers[handlerDef[0]] = eval(handlerDef[1]);
+ }
+ }
+ }
+*/
+ // Give plugins a chance to initialize
+ if (defined(JSDOC.PluginManager)) {
+ JSDOC.PluginManager.run("onInit", this);
+ }
+
+ JSDOC.opt.srcFiles = this._getSrcFiles();
+ this._parseSrcFiles();
+ //var handler = symbols.handler;
+ this.symbolSet = JSDOC.Parser.symbols;
+ //this.symbolGroup.handler = handler;
+}
+
+/**
+ Retrieve source file list.
+ @returns {String[]} The pathnames of the files to be parsed.
+ */
+JSDOC.JsDoc.prototype._getSrcFiles = function() {
+ this.srcFiles = [];
+
+ var ext = ["js"];
+ if (JSDOC.opt.x) {
+ ext = JSDOC.opt.x.split(",").map(function($) {return $.toLowerCase()});
+ }
+
+ for (var i = 0; i < JSDOC.opt._.length; i++) {
+ this.srcFiles = this.srcFiles.concat(
+ IO.ls(JSDOC.opt._[i], JSDOC.opt.r).filter(
+ function($) {
+ var thisExt = $.split(".").pop().toLowerCase();
+ return (ext.indexOf(thisExt) > -1 || thisExt in JSDOC.handlers); // we're only interested in files with certain extensions
+ }
+ )
+ );
+ }
+
+ return this.srcFiles;
+}
+
+JSDOC.JsDoc.prototype._parseSrcFiles = function() {
+ JSDOC.Parser.init();
+ for (var i = 0, l = this.srcFiles.length; i < l; i++) {
+ var srcFile = this.srcFiles[i];
+
+ try {
+ var src = IO.readFile(srcFile);
+ }
+ catch(e) {
+ LOG.warn("Can't read source file '"+srcFile+"': "+e.message);
+ }
+
+ // Check to see if there is a handler for this file type
+// var ext = FilePath.fileExtension(srcFile);
+// if (JSDOC.handlers[ext]) {
+// LOG.inform(" Using external handler for '" + ext + "'");
+//
+// symbols = symbols.concat(JSDOC.handlers[ext].handle(srcFile, src));
+// symbols.handler = JSDOC.handlers[ext];
+// }
+// else {
+ // The default (JSDOC) handler
+ var tr = new JSDOC.TokenReader();
+ var ts = new JSDOC.TokenStream(tr.tokenize(new JSDOC.TextStream(src)));
+
+ JSDOC.Parser.parse(ts, srcFile);
+// }
+ }
+ JSDOC.Parser.finish();
+}
Index: /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/lib/JSDOC/JsPlate.js
===================================================================
--- /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/lib/JSDOC/JsPlate.js (revision 4056)
+++ /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/lib/JSDOC/JsPlate.js (revision 4056)
@@ -0,0 +1,100 @@
+/**
+ @constructor
+*/
+JSDOC.JsPlate = function(templateFile) {
+ if (templateFile) this.template = IO.readFile(templateFile);
+
+ this.templateFile = templateFile;
+ this.code = "";
+ this.parse();
+}
+
+JSDOC.JsPlate.prototype.parse = function() {
+ this.template = this.template.replace(/\{#[\s\S]+?#\}/gi, "");
+ this.code = "var output=``"+this.template;
+
+ this.code = this.code.replace(
+ //gi,
+ function (match, eachName, inName) {
+ return "``;\rvar $"+eachName+"_keys = keys("+inName+");\rfor(var $"+eachName+"_i = 0; $"+eachName+"_i < $"+eachName+"_keys.length; $"+eachName+"_i++) {\rvar $"+eachName+"_last = ($"+eachName+"_i == $"+eachName+"_keys.length-1);\rvar $"+eachName+"_key = $"+eachName+"_keys[$"+eachName+"_i];\rvar "+eachName+" = "+inName+"[$"+eachName+"_key];\routput+=``";
+ }
+ );
+ this.code = this.code.replace(//g, "``;\rif ($1) { output+=``");
+ this.code = this.code.replace(//g, "``;}\relse if ($1) { output+=``");
+ this.code = this.code.replace(//g, "``;}\relse { output+=``");
+ this.code = this.code.replace(/<\/(if|for)>/g, "``;\r};\routput+=``");
+ this.code = this.code.replace(
+ /\{\+\s*([\s\S]+?)\s*\+\}/gi,
+ function (match, code) {
+ code = code.replace(/"/g, "``"); // prevent qoute-escaping of inline code
+ code = code.replace(/(\r?\n)/g, " ");
+ return "``+ ("+code+") +``";
+ }
+ );
+ this.code = this.code.replace(
+ /\{!\s*([\s\S]+?)\s*!\}/gi,
+ function (match, code) {
+ code = code.replace(/"/g, "``"); // prevent qoute-escaping of inline code
+ code = code.replace(/(\n)/g, " ");
+ return "``; "+code+";\routput+=``";
+ }
+ );
+ this.code = this.code+"``;";
+
+ this.code = this.code.replace(/(\r?\n)/g, "\\n");
+ this.code = this.code.replace(/"/g, "\\\"");
+ this.code = this.code.replace(/``/g, "\"");
+}
+
+JSDOC.JsPlate.prototype.toCode = function() {
+ return this.code;
+}
+
+JSDOC.JsPlate.keys = function(obj) {
+ var keys = [];
+ if (obj.constructor.toString().indexOf("Array") > -1) {
+ for (var i = 0; i < obj.length; i++) {
+ keys.push(i);
+ }
+ }
+ else {
+ for (var i in obj) {
+ keys.push(i);
+ }
+ }
+ return keys;
+};
+
+JSDOC.JsPlate.values = function(obj) {
+ var values = [];
+ if (obj.constructor.toString().indexOf("Array") > -1) {
+ for (var i = 0; i < obj.length; i++) {
+ values.push(obj[i]);
+ }
+ }
+ else {
+ for (var i in obj) {
+ values.push(obj[i]);
+ }
+ }
+ return values;
+};
+
+JSDOC.JsPlate.prototype.process = function(data) {
+ var keys = JSDOC.JsPlate.keys;
+ var values = JSDOC.JsPlate.values;
+
+ try {
+ eval(this.code);
+ }
+ catch (e) {
+ print(">> There was an error evaluating the compiled code from template: "+this.templateFile);
+ print(" The error was on line "+e.lineNumber+" "+e.name+": "+e.message);
+ var lines = this.code.split("\r");
+ if (e.lineNumber-2 >= 0) print("line "+(e.lineNumber-1)+": "+lines[e.lineNumber-2]);
+ print("line "+e.lineNumber+": "+lines[e.lineNumber-1]);
+ print("");
+ }
+ /*debug*///print(this.code);
+ return output;
+}
Index: /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/lib/JSDOC/Lang.js
===================================================================
--- /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/lib/JSDOC/Lang.js (revision 4056)
+++ /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/lib/JSDOC/Lang.js (revision 4056)
@@ -0,0 +1,144 @@
+/**
+ @namespace
+*/
+JSDOC.Lang = {
+}
+
+JSDOC.Lang.isBuiltin = function(name) {
+ return (JSDOC.Lang.isBuiltin.coreObjects.indexOf(name) > -1);
+}
+JSDOC.Lang.isBuiltin.coreObjects = ['_global_', 'Array', 'Boolean', 'Date', 'Function', 'Math', 'Number', 'Object', 'RegExp', 'String'];
+
+JSDOC.Lang.whitespace = function(ch) {
+ return JSDOC.Lang.whitespace.names[ch];
+}
+JSDOC.Lang.whitespace.names = {
+ " ": "SPACE",
+ "\f": "FORMFEED",
+ "\t": "TAB",
+ "\u0009": "UNICODE_TAB",
+ "\u000A": "UNICODE_NBR",
+ "\u0008": "VERTICAL_TAB"
+};
+
+JSDOC.Lang.newline = function(ch) {
+ return JSDOC.Lang.newline.names[ch];
+}
+JSDOC.Lang.newline.names = {
+ "\n": "NEWLINE",
+ "\r": "RETURN",
+ "\u000A": "UNICODE_LF",
+ "\u000D": "UNICODE_CR",
+ "\u2029": "UNICODE_PS",
+ "\u2028": "UNICODE_LS"
+};
+
+JSDOC.Lang.keyword = function(word) {
+ return JSDOC.Lang.keyword.names["="+word];
+}
+JSDOC.Lang.keyword.names = {
+ "=break": "BREAK",
+ "=case": "CASE",
+ "=catch": "CATCH",
+ "=const": "VAR",
+ "=continue": "CONTINUE",
+ "=default": "DEFAULT",
+ "=delete": "DELETE",
+ "=do": "DO",
+ "=else": "ELSE",
+ "=false": "FALSE",
+ "=finally": "FINALLY",
+ "=for": "FOR",
+ "=function": "FUNCTION",
+ "=if": "IF",
+ "=in": "IN",
+ "=instanceof": "INSTANCEOF",
+ "=new": "NEW",
+ "=null": "NULL",
+ "=return": "RETURN",
+ "=switch": "SWITCH",
+ "=this": "THIS",
+ "=throw": "THROW",
+ "=true": "TRUE",
+ "=try": "TRY",
+ "=typeof": "TYPEOF",
+ "=void": "VOID",
+ "=while": "WHILE",
+ "=with": "WITH",
+ "=var": "VAR"
+};
+
+JSDOC.Lang.punc = function(ch) {
+ return JSDOC.Lang.punc.names[ch];
+}
+JSDOC.Lang.punc.names = {
+ ";": "SEMICOLON",
+ ",": "COMMA",
+ "?": "HOOK",
+ ":": "COLON",
+ "||": "OR",
+ "&&": "AND",
+ "|": "BITWISE_OR",
+ "^": "BITWISE_XOR",
+ "&": "BITWISE_AND",
+ "===": "STRICT_EQ",
+ "==": "EQ",
+ "=": "ASSIGN",
+ "!==": "STRICT_NE",
+ "!=": "NE",
+ "<<": "LSH",
+ "<=": "LE",
+ "<": "LT",
+ ">>>": "URSH",
+ ">>": "RSH",
+ ">=": "GE",
+ ">": "GT",
+ "++": "INCREMENT",
+ "--": "DECREMENT",
+ "+": "PLUS",
+ "-": "MINUS",
+ "*": "MUL",
+ "/": "DIV",
+ "%": "MOD",
+ "!": "NOT",
+ "~": "BITWISE_NOT",
+ ".": "DOT",
+ "[": "LEFT_BRACKET",
+ "]": "RIGHT_BRACKET",
+ "{": "LEFT_CURLY",
+ "}": "RIGHT_CURLY",
+ "(": "LEFT_PAREN",
+ ")": "RIGHT_PAREN"
+};
+
+JSDOC.Lang.matching = function(name) {
+ return JSDOC.Lang.matching.names[name];
+}
+JSDOC.Lang.matching.names = {
+ "LEFT_PAREN": "RIGHT_PAREN",
+ "RIGHT_PAREN": "LEFT_PAREN",
+ "LEFT_CURLY": "RIGHT_CURLY",
+ "RIGHT_CURLY": "LEFT_CURLY",
+ "LEFT_BRACE": "RIGHT_BRACE",
+ "RIGHT_BRACE": "LEFT_BRACE"
+}
+
+JSDOC.Lang.isNumber = function(str) {
+ return /^(\.[0-9]|[0-9]+\.|[0-9])[0-9]*([eE][+-][0-9]+)?$/i.test(str);
+}
+
+JSDOC.Lang.isHexDec = function(str) {
+ return /^0x[0-9A-F]+$/i.test(str);
+}
+
+JSDOC.Lang.isWordChar = function(str) {
+ return /^[a-zA-Z0-9$_.]+$/.test(str);
+}
+
+JSDOC.Lang.isSpace = function(str) {
+ return (typeof JSDOC.Lang.whitespace(str) != "undefined");
+}
+
+JSDOC.Lang.isNewline = function(str) {
+ return (typeof JSDOC.Lang.newline(str) != "undefined");
+}
Index: /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/lib/JSDOC/Parser.js
===================================================================
--- /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/lib/JSDOC/Parser.js (revision 4056)
+++ /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/lib/JSDOC/Parser.js (revision 4056)
@@ -0,0 +1,109 @@
+if (typeof JSDOC == "undefined") JSDOC = {};
+
+/**
+ @namespace
+ @requires JSDOC.Walker
+ @requires JSDOC.Symbol
+ @requires JSDOC.DocComment
+*/
+JSDOC.Parser = {
+ conf: {
+ ignoreCode: JSDOC.opt.n,
+ ignoreAnonymous: true, // factory: true
+ treatUnderscoredAsPrivate: true, // factory: true
+ explain: false // factory: false
+ },
+
+ addSymbol: function(symbol) {
+ // if a symbol alias is documented more than once the last one with the user docs wins
+ if (JSDOC.Parser.symbols.hasSymbol(symbol.alias)) {
+ var oldSymbol = JSDOC.Parser.symbols.getSymbol(symbol.alias);
+
+ if (oldSymbol.comment.isUserComment) {
+ if (symbol.comment.isUserComment) { // old and new are both documented
+ LOG.warn("The symbol '"+symbol.alias+"' is documented more than once.");
+ }
+ else { // old is documented but new isn't
+ return;
+ }
+ }
+ }
+
+ // we don't document anonymous things
+ if (JSDOC.Parser.conf.ignoreAnonymous && symbol.name.match(/\$anonymous\b/)) return;
+
+ // uderscored things may be treated as if they were marked private, this cascades
+ if (JSDOC.Parser.conf.treatUnderscoredAsPrivate && symbol.name.match(/[.#-]_[^.#-]+$/)) {
+ if (!symbol.comment.getTag("public")) symbol.isPrivate = true;
+ }
+
+ // -p flag is required to document private things
+ if (!JSDOC.opt.p && symbol.isPrivate) return; // issue #161 fixed by mcbain.asm
+
+ // ignored things are not documented, this doesn't cascade
+ if (symbol.isIgnored) return;
+
+ JSDOC.Parser.symbols.addSymbol(symbol);
+ },
+
+ addBuiltin: function(name) {
+ var builtin = new JSDOC.Symbol(name, [], "CONSTRUCTOR", new JSDOC.DocComment(""));
+ builtin.isNamespace = true;
+ builtin.srcFile = "";
+ builtin.isPrivate = false;
+ JSDOC.Parser.addSymbol(builtin);
+ return builtin;
+ },
+
+ init: function() {
+ JSDOC.Parser.symbols = new JSDOC.SymbolSet();
+ JSDOC.Parser.walker = new JSDOC.Walker();
+ },
+
+ finish: function() {
+ JSDOC.Parser.symbols.relate();
+
+ // make a litle report about what was found
+ if (JSDOC.Parser.conf.explain) {
+ var symbols = JSDOC.Parser.symbols.toArray();
+ var srcFile = "";
+ for (var i = 0, l = symbols.length; i < l; i++) {
+ var symbol = symbols[i];
+ if (srcFile != symbol.srcFile) {
+ srcFile = symbol.srcFile;
+ print("\n"+srcFile+"\n-------------------");
+ }
+ print(i+":\n alias => "+symbol.alias + "\n name => "+symbol.name+ "\n isa => "+symbol.isa + "\n memberOf => " + symbol.memberOf + "\n isStatic => " + symbol.isStatic + ", isInner => " + symbol.isInner);
+ }
+ print("-------------------\n");
+ }
+ }
+}
+
+JSDOC.Parser.parse = function(/**JSDOC.TokenStream*/ts, /**String*/srcFile) {
+ JSDOC.Symbol.srcFile = (srcFile || "");
+ JSDOC.DocComment.shared = ""; // shared comments don't cross file boundaries
+
+ if (!JSDOC.Parser.walker) JSDOC.Parser.init();
+ JSDOC.Parser.walker.walk(ts); // adds to our symbols
+
+ // filter symbols by option
+ for (p in JSDOC.Parser.symbols._index) {
+ var symbol = JSDOC.Parser.symbols.getSymbol(p);
+
+ if (!symbol) continue;
+
+ if (symbol.is("FILE") || symbol.is("GLOBAL")) {
+ continue;
+ }
+ else if (!JSDOC.opt.a && !symbol.comment.isUserComment) {
+ JSDOC.Parser.symbols.deleteSymbol(symbol.alias);
+ }
+
+ if (/#$/.test(symbol.alias)) { // we don't document prototypes
+ JSDOC.Parser.symbols.deleteSymbol(symbol.alias);
+ }
+ }
+
+ return JSDOC.Parser.symbols.toArray();
+}
Index: /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/lib/JSDOC/PluginManager.js
===================================================================
--- /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/lib/JSDOC/PluginManager.js (revision 4056)
+++ /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/lib/JSDOC/PluginManager.js (revision 4056)
@@ -0,0 +1,33 @@
+/**
+ @namespace Holds functionality related to running plugins.
+*/
+JSDOC.PluginManager = {
+}
+
+/**
+ @param name A unique name that identifies that plugin.
+ @param handlers A collection of named functions. The names correspond to hooks in the core code.
+*/
+JSDOC.PluginManager.registerPlugin = function(/**String*/name, /**Object*/handlers) {
+ if (!defined(JSDOC.PluginManager.plugins))
+ /** The collection of all plugins. Requires a unique name for each.
+ */
+ JSDOC.PluginManager.plugins = {};
+
+
+ JSDOC.PluginManager.plugins[name] = handlers;
+}
+
+/**
+ @param hook The name of the hook that is being caught.
+ @param target Any object. This will be passed as the only argument to the handler whose
+ name matches the hook name. Handlers cannot return a value, so must modify the target
+ object to have an effect.
+*/
+JSDOC.PluginManager.run = function(/**String*/hook, /**Mixed*/target) {
+ for (var name in JSDOC.PluginManager.plugins) {
+ if (defined(JSDOC.PluginManager.plugins[name][hook])) {
+ JSDOC.PluginManager.plugins[name][hook](target);
+ }
+ }
+}
Index: /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/lib/JSDOC/Symbol.js
===================================================================
--- /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/lib/JSDOC/Symbol.js (revision 4056)
+++ /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/lib/JSDOC/Symbol.js (revision 4056)
@@ -0,0 +1,600 @@
+if (typeof JSDOC == "undefined") JSDOC = {};
+
+/**
+ Create a new Symbol.
+ @class Represents a symbol in the source code.
+ */
+JSDOC.Symbol = function() {
+ this.init();
+ if (arguments.length) this.populate.apply(this, arguments);
+}
+
+JSDOC.Symbol.prototype.init = function() {
+ this.$args = [];
+ this.addOn = "";
+ this.alias = "";
+ this.augments = [];
+ this.author = "";
+ this.classDesc = "";
+ this.comment = {};
+ this.defaultValue = undefined;
+ this.deprecated = "";
+ this.desc = "";
+ this.events = [];
+ this.example = [];
+ this.exceptions = [];
+ this.inherits = [];
+ this.inheritsFrom = [];
+ this.isa = "OBJECT";
+ this.isEvent = false;
+ this.isConstant = false;
+ this.isIgnored = false;
+ this.isInner = false;
+ this.isNamespace = false;
+ this.isPrivate = false;
+ this.isStatic = false;
+ this.memberOf = "";
+ this.methods = [];
+ this._name = "";
+ this._params = [];
+ this.properties = [];
+ this.requires = [];
+ this.returns = [];
+ this.see = [];
+ this.since = "";
+ this.srcFile = {};
+ this.type = "";
+ this.version = "";
+}
+
+JSDOC.Symbol.prototype.serialize = function() {
+ var keys = [];
+ for (var p in this) {
+ keys.push (p);
+ }
+ keys = keys.sort();
+
+ var out = "";
+ for (var i in keys) {
+ if (typeof this[keys[i]] == "function") continue;
+ out += keys[i]+" => "+Dumper.dump(this[keys[i]])+",\n";
+ }
+ return "\n{\n" + out + "}\n";
+}
+
+JSDOC.Symbol.prototype.clone = function() {
+ var clone = new JSDOC.Symbol();
+ clone.populate.apply(clone, this.$args); // repopulate using the original arguments
+ clone.srcFile = this.srcFile; // not the current srcFile, the one when the original was made
+ return clone;
+}
+
+JSDOC.Symbol.prototype.__defineSetter__("name",
+ function(n) { n = n.replace(/^_global_[.#-]/, ""); n = n.replace(/\.prototype\.?/g, '#'); this._name = n; }
+);
+JSDOC.Symbol.prototype.__defineGetter__("name",
+ function() { return this._name; }
+);
+JSDOC.Symbol.prototype.__defineSetter__("params",
+ function(v) {
+ for (var i = 0, l = v.length; i < l; i++) {
+ if (v[i].constructor != JSDOC.DocTag) { // may be a generic object parsed from signature, like {type:..., name:...}
+ this._params[i] = new JSDOC.DocTag("param"+((v[i].type)?" {"+v[i].type+"}":"")+" "+v[i].name);
+ }
+ else {
+ this._params[i] = v[i];
+ }
+ }
+ }
+);
+JSDOC.Symbol.prototype.__defineGetter__("params",
+ function() { return this._params; }
+);
+
+JSDOC.Symbol.prototype.populate = function(
+ /** String */ name,
+ /** Object[] */ params,
+ /** String */ isa,
+ /** JSDOC.DocComment */ comment
+) {
+ this.$args = arguments;
+
+ this.name = name;
+ this.alias = this.name;
+ this.params = params;
+ this.isa = (isa == "VIRTUAL")? "OBJECT":isa;
+ this.comment = comment || new JSDOC.DocComment("");
+ this.srcFile = JSDOC.Symbol.srcFile;
+
+ if (this.is("FILE") && !this.alias) this.alias = this.srcFile;
+
+ this.setTags();
+
+ if (typeof JSDOC.PluginManager != "undefined") {
+ JSDOC.PluginManager.run("onSymbol", this);
+ }
+}
+
+JSDOC.Symbol.prototype.setTags = function() {
+ // @author
+ var authors = this.comment.getTag("author");
+ if (authors.length) {
+ this.author = authors.map(function($){return $.desc;}).join(", ");
+ }
+
+ /*t:
+ plan(34, "testing JSDOC.Symbol");
+
+ requires("../lib/JSDOC/DocComment.js");
+ requires("../frame/String.js");
+ requires("../lib/JSDOC/DocTag.js");
+
+ var sym = new JSDOC.Symbol("foo", [], "OBJECT", new JSDOC.DocComment("/**@author Joe Smith*"+"/"));
+ is(sym.author, "Joe Smith", "@author tag, author is found.");
+ */
+
+ // @desc
+ var descs = this.comment.getTag("desc");
+ if (descs.length) {
+ this.desc = descs.map(function($){return $.desc;}).join("\n"); // multiple descriptions are concatenated into one
+ }
+
+ /*t:
+ var sym = new JSDOC.Symbol("foo", [], "OBJECT", new JSDOC.DocComment("/**@desc This is a description.*"+"/"));
+ is(sym.desc, "This is a description.", "@desc tag, description is found.");
+ */
+
+ // @overview
+ if (this.is("FILE")) {
+ if (!this.alias) this.alias = this.srcFile;
+
+ var overviews = this.comment.getTag("overview");
+ if (overviews.length) {
+ this.desc = [this.desc].concat(overviews.map(function($){return $.desc;})).join("\n");
+ }
+ }
+
+ /*t:
+ var sym = new JSDOC.Symbol("foo", [], "FILE", new JSDOC.DocComment("/**@overview This is an overview.*"+"/"));
+ is(sym.desc, "\nThis is an overview.", "@overview tag, description is found.");
+ */
+
+ // @since
+ var sinces = this.comment.getTag("since");
+ if (sinces.length) {
+ this.since = sinces.map(function($){return $.desc;}).join(", ");
+ }
+
+ /*t:
+ var sym = new JSDOC.Symbol("foo", [], "FILE", new JSDOC.DocComment("/**@since 1.01*"+"/"));
+ is(sym.since, "1.01", "@since tag, description is found.");
+ */
+
+ // @constant
+ if (this.comment.getTag("constant").length) {
+ this.isConstant = true;
+ }
+
+ /*t:
+ var sym = new JSDOC.Symbol("foo", [], "FILE", new JSDOC.DocComment("/**@constant*"+"/"));
+ is(sym.isConstant, true, "@constant tag, isConstant set.");
+ */
+
+ // @version
+ var versions = this.comment.getTag("version");
+ if (versions.length) {
+ this.version = versions.map(function($){return $.desc;}).join(", ");
+ }
+
+ /*t:
+ var sym = new JSDOC.Symbol("foo", [], "FILE", new JSDOC.DocComment("/**@version 2.0x*"+"/"));
+ is(sym.version, "2.0x", "@version tag, version is found.");
+ */
+
+ // @deprecated
+ var deprecateds = this.comment.getTag("deprecated");
+ if (deprecateds.length) {
+ this.deprecated = deprecateds.map(function($){return $.desc;}).join("\n");
+ }
+
+ /*t:
+ var sym = new JSDOC.Symbol("foo", [], "FILE", new JSDOC.DocComment("/**@deprecated Use other method.*"+"/"));
+ is(sym.deprecated, "Use other method.", "@deprecated tag, desc is found.");
+ */
+
+ // @example
+ var examples = this.comment.getTag("example");
+ if (examples.length) {
+ this.example = examples.map(
+ // trim trailing whitespace
+ function($) {
+ $.desc = $.desc.replace(/\s+$/, "");
+ return $;
+ }
+ );
+ }
+
+ /*t:
+ var sym = new JSDOC.Symbol("foo", [], "FILE", new JSDOC.DocComment("/**@example This\n is an example. \n*"+"/"));
+ isnt(typeof sym.example[0], "undefined", "@example tag, creates sym.example array.");
+ is(sym.example[0], "This\n is an example.", "@example tag, desc is found.");
+ */
+
+ // @see
+ var sees = this.comment.getTag("see");
+ if (sees.length) {
+ var thisSee = this.see;
+ sees.map(function($){thisSee.push($.desc);});
+ }
+
+ /*t:
+ var sym = new JSDOC.Symbol("foo", [], "FILE", new JSDOC.DocComment("/**@see The other thing.*"+"/"));
+ is(sym.see, "The other thing.", "@see tag, desc is found.");
+ */
+
+ // @class
+ var classes = this.comment.getTag("class");
+ if (classes.length) {
+ this.isa = "CONSTRUCTOR";
+ this.classDesc = classes[0].desc; // desc can't apply to the constructor as there is none.
+ }
+
+ /*t:
+ var sym = new JSDOC.Symbol("foo", [], "OBJECT", new JSDOC.DocComment("/**@class This describes the class.*"+"/"));
+ is(sym.isa, "CONSTRUCTOR", "@class tag, makes symbol a constructor.");
+ is(sym.classDesc, "This describes the class.", "@class tag, class description is found.");
+ */
+
+ // @namespace
+ var namespaces = this.comment.getTag("namespace");
+ if (namespaces.length) {
+ this.classDesc = namespaces[0].desc+"\n"+this.desc; // desc can't apply to the constructor as there is none.
+ this.isNamespace = true;
+ }
+
+ /*t:
+ var sym = new JSDOC.Symbol("foo", [], "OBJECT", new JSDOC.DocComment("/**@namespace This describes the namespace.*"+"/"));
+ is(sym.classDesc, "This describes the namespace.\n", "@namespace tag, class description is found.");
+ */
+
+ // @param
+ var params = this.comment.getTag("param");
+ if (params.length) {
+ // user-defined params overwrite those with same name defined by the parser
+ var thisParams = this.params;
+
+ if (thisParams.length == 0) { // none exist yet, so just bung all these user-defined params straight in
+ this.params = params;
+ }
+ else { // need to overlay these user-defined params on to existing parser-defined params
+ for (var i = 0, l = params.length; i < l; i++) {
+ if (thisParams[i]) {
+ if (params[i].type) thisParams[i].type = params[i].type;
+ thisParams[i].name = params[i].name;
+ thisParams[i].desc = params[i].desc;
+ thisParams[i].isOptional = params[i].isOptional;
+ thisParams[i].defaultValue = params[i].defaultValue;
+ }
+ else thisParams[i] = params[i];
+ }
+ }
+ }
+
+ /*t:
+ var sym = new JSDOC.Symbol("foo", [{type: "array", name: "pages"}], "FUNCTION", new JSDOC.DocComment("/**Description.*"+"/"));
+ is(sym.params.length, 1, "parser defined param is found.");
+
+ sym = new JSDOC.Symbol("foo", [], "FUNCTION", new JSDOC.DocComment("/**Description.\n@param {array} pages*"+"/"));
+ is(sym.params.length, 1, "user defined param is found.");
+ is(sym.params[0].type, "array", "user defined param type is found.");
+ is(sym.params[0].name, "pages", "user defined param name is found.");
+
+ sym = new JSDOC.Symbol("foo", [{type: "array", name: "pages"}], "FUNCTION", new JSDOC.DocComment("/**Description.\n@param {string} uid*"+"/"));
+ is(sym.params.length, 1, "user defined param overwrites parser defined param.");
+ is(sym.params[0].type, "string", "user defined param type overwrites parser defined param type.");
+ is(sym.params[0].name, "uid", "user defined param name overwrites parser defined param name.");
+
+ sym = new JSDOC.Symbol("foo", [{type: "array", name: "pages"}, {type: "number", name: "count"}], "FUNCTION", new JSDOC.DocComment("/**Description.\n@param {string} uid*"+"/"));
+ is(sym.params.length, 2, "user defined params overlay parser defined params.");
+ is(sym.params[1].type, "number", "user defined param type overlays parser defined param type.");
+ is(sym.params[1].name, "count", "user defined param name overlays parser defined param name.");
+
+ sym = new JSDOC.Symbol("foo", [], "FUNCTION", new JSDOC.DocComment("/**Description.\n@param {array} pages The pages description.*"+"/"));
+ is(sym.params.length, 1, "user defined param with description is found.");
+ is(sym.params[0].desc, "The pages description.", "user defined param description is found.");
+ */
+
+ // @constructor
+ if (this.comment.getTag("constructor").length) {
+ this.isa = "CONSTRUCTOR";
+ }
+
+ /*t:
+ var sym = new JSDOC.Symbol("foo", [], "OBJECT", new JSDOC.DocComment("/**@constructor*"+"/"));
+ is(sym.isa, "CONSTRUCTOR", "@constructor tag, makes symbol a constructor.");
+ */
+
+ // @static
+ if (this.comment.getTag("static").length) {
+ this.isStatic = true;
+ if (this.isa == "CONSTRUCTOR") {
+ this.isNamespace = true;
+ }
+ }
+
+ /*t:
+ var sym = new JSDOC.Symbol("foo", [], "OBJECT", new JSDOC.DocComment("/**@static\n@constructor*"+"/"));
+ is(sym.isStatic, true, "@static tag, makes isStatic true.");
+ is(sym.isNamespace, true, "@static and @constructor tag, makes isNamespace true.");
+ */
+
+ // @inner
+ if (this.comment.getTag("inner").length) {
+ this.isInner = true;
+ this.isStatic = false;
+ }
+
+ /*t:
+ var sym = new JSDOC.Symbol("foo", [], "OBJECT", new JSDOC.DocComment("/**@inner*"+"/"));
+ is(sym.isStatic, false, "@inner tag, makes isStatic false.");
+ is(sym.isInner, true, "@inner makes isInner true.");
+ */
+
+ // @field
+ if (this.comment.getTag("field").length) {
+ this.isa = "OBJECT";
+ }
+
+ /*t:
+ var sym = new JSDOC.Symbol("foo", [], "FUNCTION", new JSDOC.DocComment("/**@field*"+"/"));
+ is(sym.isa, "OBJECT", "@field tag, makes symbol an object.");
+ */
+
+ // @function
+ if (this.comment.getTag("function").length) {
+ this.isa = "FUNCTION";
+ }
+
+ /*t:
+ var sym = new JSDOC.Symbol("foo", [], "OBJECT", new JSDOC.DocComment("/**@function*"+"/"));
+ is(sym.isa, "FUNCTION", "@function tag, makes symbol a function.");
+ */
+
+ // @event
+ var events = this.comment.getTag("event");
+ if (events.length) {
+ this.isa = "FUNCTION";
+ this.isEvent = true;
+ }
+
+ /*t:
+ var sym = new JSDOC.Symbol("foo", [], "OBJECT", new JSDOC.DocComment("/**@event*"+"/"));
+ is(sym.isa, "FUNCTION", "@event tag, makes symbol a function.");
+ is(sym.isEvent, true, "@event makes isEvent true.");
+ */
+
+ // @name
+ var names = this.comment.getTag("name");
+ if (names.length) {
+ this.name = names[0].desc;
+ }
+
+ /*t:
+ // todo
+ */
+
+ // @property
+ var properties = this.comment.getTag("property");
+ if (properties.length) {
+ thisProperties = this.properties;
+ for (var i = 0; i < properties.length; i++) {
+ var property = new JSDOC.Symbol(this.alias+"#"+properties[i].name, [], "OBJECT", new JSDOC.DocComment("/**"+properties[i].desc+"\n@name "+properties[i].name+"\n@memberOf "+this.alias+"#*/"));
+ // TODO: shouldn't the following happen in the addProperty method of Symbol?
+ property.name = properties[i].name;
+ property.memberOf = this.alias;
+ if (properties[i].type) property.type = properties[i].type;
+ if (properties[i].defaultValue) property.defaultValue = properties[i].defaultValue;
+ this.addProperty(property);
+ JSDOC.Parser.addSymbol(property);
+ }
+ }
+
+ /*t:
+ // todo
+ */
+
+ // @return
+ var returns = this.comment.getTag("return");
+ if (returns.length) { // there can be many return tags in a single doclet
+ this.returns = returns;
+ this.type = returns.map(function($){return $.type}).join(", ");
+ }
+
+ /*t:
+ // todo
+ */
+
+ // @exception
+ this.exceptions = this.comment.getTag("throws");
+
+ /*t:
+ // todo
+ */
+
+ // @requires
+ var requires = this.comment.getTag("requires");
+ if (requires.length) {
+ this.requires = requires.map(function($){return $.desc});
+ }
+
+ /*t:
+ // todo
+ */
+
+ // @type
+ var types = this.comment.getTag("type");
+ if (types.length) {
+ this.type = types[0].desc; //multiple type tags are ignored
+ }
+
+ /*t:
+ // todo
+ */
+
+ // @private
+ if (this.comment.getTag("private").length || this.isInner) {
+ this.isPrivate = true;
+ }
+
+ // @ignore
+ if (this.comment.getTag("ignore").length) {
+ this.isIgnored = true;
+ }
+
+ /*t:
+ // todo
+ */
+
+ // @inherits ... as ...
+ var inherits = this.comment.getTag("inherits");
+ if (inherits.length) {
+ for (var i = 0; i < inherits.length; i++) {
+ if (/^\s*([a-z$0-9_.#-]+)(?:\s+as\s+([a-z$0-9_.#]+))?/i.test(inherits[i].desc)) {
+ var inAlias = RegExp.$1;
+ var inAs = RegExp.$2 || inAlias;
+
+ if (inAlias) inAlias = inAlias.replace(/\.prototype\.?/g, "#");
+
+ if (inAs) {
+ inAs = inAs.replace(/\.prototype\.?/g, "#");
+ inAs = inAs.replace(/^this\.?/, "#");
+ }
+
+ if (inAs.indexOf(inAlias) != 0) { //not a full namepath
+ var joiner = ".";
+ if (this.alias.charAt(this.alias.length-1) == "#" || inAs.charAt(0) == "#") {
+ joiner = "";
+ }
+ inAs = this.alias + joiner + inAs;
+ }
+ }
+ this.inherits.push({alias: inAlias, as: inAs});
+ }
+ }
+
+ /*t:
+ // todo
+ */
+
+ // @augments
+ this.augments = this.comment.getTag("augments");
+
+ // @default
+ var defaults = this.comment.getTag("default");
+ if (defaults.length) {
+ if (this.is("OBJECT")) {
+ this.defaultValue = defaults[0].desc;
+ }
+ }
+
+ /*t:
+ // todo
+ */
+
+ // @memberOf
+ var memberOfs = this.comment.getTag("memberOf");
+ if (memberOfs.length) {
+ this.memberOf = memberOfs[0].desc;
+ this.memberOf = this.memberOf.replace(/\.prototype\.?/g, "#");
+ }
+
+ /*t:
+ // todo
+ */
+
+ // @public
+ if (this.comment.getTag("public").length) {
+ this.isPrivate = false;
+ }
+
+ /*t:
+ // todo
+ */
+}
+
+JSDOC.Symbol.prototype.is = function(what) {
+ return this.isa === what;
+}
+
+JSDOC.Symbol.prototype.isBuiltin = function() {
+ return JSDOC.Lang.isBuiltin(this.alias);
+}
+
+JSDOC.Symbol.prototype.setType = function(/**String*/comment, /**Boolean*/overwrite) {
+ if (!overwrite && this.type) return;
+ var typeComment = JSDOC.DocComment.unwrapComment(comment);
+ this.type = typeComment;
+}
+
+JSDOC.Symbol.prototype.inherit = function(symbol) {
+ if (!this.hasMember(symbol.name) && !symbol.isInner) {
+ if (symbol.is("FUNCTION"))
+ this.methods.push(symbol);
+ else if (symbol.is("OBJECT"))
+ this.properties.push(symbol);
+ }
+}
+
+JSDOC.Symbol.prototype.hasMember = function(name) {
+ return (this.hasMethod(name) || this.hasProperty(name));
+}
+
+JSDOC.Symbol.prototype.addMember = function(symbol) {
+ if (symbol.is("FUNCTION")) { this.addMethod(symbol); }
+ else if (symbol.is("OBJECT")) { this.addProperty(symbol); }
+}
+
+JSDOC.Symbol.prototype.hasMethod = function(name) {
+ var thisMethods = this.methods;
+ for (var i = 0, l = thisMethods.length; i < l; i++) {
+ if (thisMethods[i].name == name) return true;
+ if (thisMethods[i].alias == name) return true;
+ }
+ return false;
+}
+
+JSDOC.Symbol.prototype.addMethod = function(symbol) {
+ var methodAlias = symbol.alias;
+ var thisMethods = this.methods;
+ for (var i = 0, l = thisMethods.length; i < l; i++) {
+ if (thisMethods[i].alias == methodAlias) {
+ thisMethods[i] = symbol; // overwriting previous method
+ return;
+ }
+ }
+ thisMethods.push(symbol); // new method with this alias
+}
+
+JSDOC.Symbol.prototype.hasProperty = function(name) {
+ var thisProperties = this.properties;
+ for (var i = 0, l = thisProperties.length; i < l; i++) {
+ if (thisProperties[i].name == name) return true;
+ if (thisProperties[i].alias == name) return true;
+ }
+ return false;
+}
+
+JSDOC.Symbol.prototype.addProperty = function(symbol) {
+ var propertyAlias = symbol.alias;
+ var thisProperties = this.properties;
+ for (var i = 0, l = thisProperties.length; i < l; i++) {
+ if (thisProperties[i].alias == propertyAlias) {
+ thisProperties[i] = symbol; // overwriting previous property
+ return;
+ }
+ }
+
+ thisProperties.push(symbol); // new property with this alias
+}
+
+JSDOC.Symbol.srcFile = ""; //running reference to the current file being parsed
Index: /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/lib/JSDOC/SymbolSet.js
===================================================================
--- /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/lib/JSDOC/SymbolSet.js (revision 4056)
+++ /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/lib/JSDOC/SymbolSet.js (revision 4056)
@@ -0,0 +1,220 @@
+if (typeof JSDOC == "undefined") JSDOC = {};
+
+/** @constructor */
+JSDOC.SymbolSet = function() {
+ this.init();
+}
+
+JSDOC.SymbolSet.prototype.init = function() {
+ this._index = {};
+}
+
+JSDOC.SymbolSet.prototype.keys = function() {
+ var found = [];
+ for (var p in this._index) {
+ found.push(p);
+ }
+ return found;
+}
+
+JSDOC.SymbolSet.prototype.hasSymbol = function(alias) {
+ return this._index.hasOwnProperty(alias);
+}
+
+JSDOC.SymbolSet.prototype.addSymbol = function(symbol) {
+ if (this.hasSymbol(symbol.alias)) {
+ LOG.warn("Overwriting symbol documentation for: "+symbol.alias + ".");
+ }
+ this._index[symbol.alias] = symbol;
+}
+
+JSDOC.SymbolSet.prototype.getSymbol = function(alias) {
+ if (this.hasSymbol(alias)) return this._index[alias];
+}
+
+JSDOC.SymbolSet.prototype.getSymbolByName = function(name) {
+ for (var p in this._index) {
+ var symbol = this.getSymbol(p);
+ if (symbol.name == name) return symbol;
+ }
+}
+
+JSDOC.SymbolSet.prototype.toArray = function() {
+ var found = [];
+ for (var p in this._index) {
+ found.push(this._index[p]);
+ }
+ return found;
+}
+
+JSDOC.SymbolSet.prototype.deleteSymbol = function(alias) {
+ if (!this.hasSymbol(alias)) return;
+ delete this._index[alias];
+}
+
+JSDOC.SymbolSet.prototype.renameSymbol = function(oldName, newName) {
+ // todo: should check if oldname or newname already exist
+ this._index[newName] = this._index[oldName];
+ this.deleteSymbol(oldName);
+ this._index[newName].alias = newName;
+ return newName;
+}
+
+JSDOC.SymbolSet.prototype.relate = function() {
+ this.resolveBorrows();
+ this.resolveMemberOf();
+ this.resolveAugments();
+}
+
+JSDOC.SymbolSet.prototype.resolveBorrows = function() {
+ for (p in this._index) {
+ var symbol = this._index[p];
+ if (symbol.is("FILE") || symbol.is("GLOBAL")) continue;
+
+ var borrows = symbol.inherits;
+ for (var i = 0; i < borrows.length; i++) {
+ var borrowed = this.getSymbol(borrows[i].alias);
+ if (!borrowed) {
+ LOG.warn("Can't borrow undocumented "+borrows[i].alias+".");
+ continue;
+ }
+
+ var borrowAsName = borrows[i].as;
+ var borrowAsAlias = borrowAsName;
+ if (!borrowAsName) {
+ LOG.warn("Malformed @borrow, 'as' is required.");
+ continue;
+ }
+
+ if (borrowAsName.length > symbol.alias.length && borrowAsName.indexOf(symbol.alias) == 0) {
+ borrowAsName = borrowAsName.replace(borrowed.alias, "")
+ }
+ else {
+ var joiner = "";
+ if (borrowAsName.charAt(0) != "#") joiner = ".";
+ borrowAsAlias = borrowed.alias + joiner + borrowAsName;
+ }
+
+ borrowAsName = borrowAsName.replace(/^[#.]/, "");
+
+ if (this.hasSymbol(borrowAsAlias)) continue;
+
+ var clone = borrowed.clone();
+ clone.name = borrowAsName;
+ clone.alias = borrowAsAlias;
+ this.addSymbol(clone);
+ }
+ }
+}
+
+JSDOC.SymbolSet.prototype.resolveMemberOf = function() {
+ for (var p in this._index) {
+ var symbol = this.getSymbol(p);
+
+ if (symbol.is("FILE") || symbol.is("GLOBAL")) continue;
+
+ // the memberOf value was provided in the @memberOf tag
+ else if (symbol.memberOf) {
+ var parts = symbol.alias.match(new RegExp("^("+symbol.memberOf+"[.#-])(.+)$"));
+
+ // like foo.bar is a memberOf foo
+ if (parts) {
+ symbol.memberOf = parts[1];
+ symbol.name = parts[2];
+ }
+ // like bar is a memberOf foo
+ else {
+ var joiner = symbol.memberOf.charAt(symbol.memberOf.length-1);
+ if (!/[.#-]/.test(joiner)) symbol.memberOf += ".";
+
+ this.renameSymbol(p, symbol.memberOf + symbol.name);
+ }
+ }
+ // the memberOf must be calculated
+ else {
+ var parts = symbol.alias.match(/^(.*[.#-])([^.#-]+)$/);
+ if (parts) {
+ symbol.memberOf = parts[1];
+ symbol.name = parts[2];
+ }
+ }
+
+ // set isStatic, isInner
+ if (symbol.memberOf) {
+ switch (symbol.memberOf.charAt(symbol.memberOf.length-1)) {
+ case '#' :
+ symbol.isStatic = false;
+ symbol.isInner = false;
+ break;
+ case '.' :
+ symbol.isStatic = true;
+ symbol.isInner = false;
+ break;
+ case '-' :
+ symbol.isStatic = false;
+ symbol.isInner = true;
+ break;
+ }
+ }
+
+ // unowned methods and fields belong to the global object
+ if (!symbol.is("CONSTRUCTOR") && !symbol.isNamespace && symbol.memberOf == "") {
+ symbol.memberOf = "_global_";
+ }
+
+ // clean up
+ if (symbol.memberOf.match(/[.#-]$/)) {
+ symbol.memberOf = symbol.memberOf.substr(0, symbol.memberOf.length-1);
+ }
+
+ // add to parent's methods or properties list
+ if (symbol.memberOf) {
+ var container = this.getSymbol(symbol.memberOf);
+ if (!container) {
+ if (JSDOC.Lang.isBuiltin(symbol.memberOf)) container = JSDOC.Parser.addBuiltin(symbol.memberOf);
+ else {
+ LOG.warn("Can't document "+symbol.name +" as a member of undocumented symbol "+symbol.memberOf+".");
+ }
+ }
+
+ if (container) container.addMember(symbol);
+ }
+ }
+}
+
+JSDOC.SymbolSet.prototype.resolveAugments = function() {
+ for (var p in this._index) {
+ var symbol = this.getSymbol(p);
+
+ if (symbol.alias == "_global_" || symbol.is("FILE")) continue;
+ JSDOC.SymbolSet.prototype.walk.apply(this, [symbol]);
+ }
+}
+
+JSDOC.SymbolSet.prototype.walk = function(symbol) {
+ var augments = symbol.augments;
+ for(var i = 0; i < augments.length; i++) {
+ var contributer = this.getSymbol(augments[i]);
+ if (contributer) {
+ if (contributer.augments.length) {
+ JSDOC.SymbolSet.prototype.walk.apply(this, [contributer]);
+ }
+
+ symbol.inheritsFrom.push(contributer.alias);
+ if (!isUnique(symbol.inheritsFrom)) {
+ //LOG.warn("Can't resolve augments: Circular reference: "+symbol.alias+" inherits from "+contributer.alias+" more than once.");
+ }
+ else {
+ var cmethods = contributer.methods;
+ var cproperties = contributer.properties;
+
+ for (var ci = 0, cl = cmethods.length; ci < cl; ci++)
+ symbol.inherit(cmethods[ci]);
+ for (var ci = 0, cl = cproperties.length; ci < cl; ci++)
+ symbol.inherit(cproperties[ci]);
+ }
+ }
+ else LOG.warn("Can't augment contributer: "+augments[i]+", not found.");
+ }
+}
+
Index: /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/lib/JSDOC/TextStream.js
===================================================================
--- /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/lib/JSDOC/TextStream.js (revision 4056)
+++ /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/lib/JSDOC/TextStream.js (revision 4056)
@@ -0,0 +1,41 @@
+
+/**
+ @constructor
+*/
+JSDOC.TextStream = function(text) {
+ if (typeof(text) == "undefined") text = "";
+ text = ""+text;
+ this.text = text;
+ this.cursor = 0;
+}
+
+JSDOC.TextStream.prototype.look = function(n) {
+ if (typeof n == "undefined") n = 0;
+
+ if (this.cursor+n < 0 || this.cursor+n >= this.text.length) {
+ var result = new String("");
+ result.eof = true;
+ return result;
+ }
+ return this.text.charAt(this.cursor+n);
+}
+
+JSDOC.TextStream.prototype.next = function(n) {
+ if (typeof n == "undefined") n = 1;
+ if (n < 1) return null;
+
+ var pulled = "";
+ for (var i = 0; i < n; i++) {
+ if (this.cursor+i < this.text.length) {
+ pulled += this.text.charAt(this.cursor+i);
+ }
+ else {
+ var result = new String("");
+ result.eof = true;
+ return result;
+ }
+ }
+
+ this.cursor += n;
+ return pulled;
+}
Index: /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/lib/JSDOC/Token.js
===================================================================
--- /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/lib/JSDOC/Token.js (revision 4056)
+++ /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/lib/JSDOC/Token.js (revision 4056)
@@ -0,0 +1,18 @@
+if (typeof JSDOC == "undefined") JSDOC = {};
+
+/**
+ @constructor
+*/
+JSDOC.Token = function(data, type, name) {
+ this.data = data;
+ this.type = type;
+ this.name = name;
+}
+
+JSDOC.Token.prototype.toString = function() {
+ return "<"+this.type+" name=\""+this.name+"\">"+this.data+"";
+}
+
+JSDOC.Token.prototype.is = function(what) {
+ return this.name === what || this.type === what;
+}
Index: /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/lib/JSDOC/TokenReader.js
===================================================================
--- /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/lib/JSDOC/TokenReader.js (revision 4056)
+++ /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/lib/JSDOC/TokenReader.js (revision 4056)
@@ -0,0 +1,332 @@
+if (typeof JSDOC == "undefined") JSDOC = {};
+
+/**
+ @class Search a {@link JSDOC.TextStream} for language tokens.
+*/
+JSDOC.TokenReader = function() {
+ this.keepDocs = true;
+ this.keepWhite = false;
+ this.keepComments = false;
+}
+
+/**
+ @type {JSDOC.Token[]}
+ */
+JSDOC.TokenReader.prototype.tokenize = function(/**JSDOC.TextStream*/stream) {
+ var tokens = [];
+ /**@ignore*/ tokens.last = function() { return tokens[tokens.length-1]; }
+ /**@ignore*/ tokens.lastSym = function() {
+ for (var i = tokens.length-1; i >= 0; i--) {
+ if (!(tokens[i].is("WHIT") || tokens[i].is("COMM"))) return tokens[i];
+ }
+ }
+
+ while (!stream.look().eof) {
+ if (this.read_mlcomment(stream, tokens)) continue;
+ if (this.read_slcomment(stream, tokens)) continue;
+ if (this.read_dbquote(stream, tokens)) continue;
+ if (this.read_snquote(stream, tokens)) continue;
+ if (this.read_regx(stream, tokens)) continue;
+ if (this.read_numb(stream, tokens)) continue;
+ if (this.read_punc(stream, tokens)) continue;
+ if (this.read_space(stream, tokens)) continue;
+ if (this.read_newline(stream, tokens)) continue;
+ if (this.read_word(stream, tokens)) continue;
+
+ // if execution reaches here then an error has happened
+ tokens.push(new JSDOC.Token(stream.next(), "TOKN", "UNKNOWN_TOKEN"));
+ }
+ return tokens;
+}
+
+/**
+ @returns {Boolean} Was the token found?
+ */
+JSDOC.TokenReader.prototype.read_word = function(/**JSDOC.TokenStream*/stream, tokens) {
+ var found = "";
+ while (!stream.look().eof && JSDOC.Lang.isWordChar(stream.look())) {
+ found += stream.next();
+ }
+
+ if (found === "") {
+ return false;
+ }
+ else {
+ var name;
+ if ((name = JSDOC.Lang.keyword(found))) tokens.push(new JSDOC.Token(found, "KEYW", name));
+ else tokens.push(new JSDOC.Token(found, "NAME", "NAME"));
+ return true;
+ }
+}
+
+/**
+ @returns {Boolean} Was the token found?
+ */
+JSDOC.TokenReader.prototype.read_punc = function(/**JSDOC.TokenStream*/stream, tokens) {
+ var found = "";
+ var name;
+ while (!stream.look().eof && JSDOC.Lang.punc(found+stream.look())) {
+ found += stream.next();
+ }
+
+ if (found === "") {
+ return false;
+ }
+ else {
+ tokens.push(new JSDOC.Token(found, "PUNC", JSDOC.Lang.punc(found)));
+ return true;
+ }
+}
+
+/**
+ @returns {Boolean} Was the token found?
+ */
+JSDOC.TokenReader.prototype.read_space = function(/**JSDOC.TokenStream*/stream, tokens) {
+ var found = "";
+
+ while (!stream.look().eof && JSDOC.Lang.isSpace(stream.look())) {
+ found += stream.next();
+ }
+
+ if (found === "") {
+ return false;
+ }
+ else {
+ if (this.collapseWhite) found = " ";
+ if (this.keepWhite) tokens.push(new JSDOC.Token(found, "WHIT", "SPACE"));
+ return true;
+ }
+}
+
+/**
+ @returns {Boolean} Was the token found?
+ */
+JSDOC.TokenReader.prototype.read_newline = function(/**JSDOC.TokenStream*/stream, tokens) {
+ var found = "";
+
+ while (!stream.look().eof && JSDOC.Lang.isNewline(stream.look())) {
+ found += stream.next();
+ }
+
+ if (found === "") {
+ return false;
+ }
+ else {
+ if (this.collapseWhite) found = "\n";
+ if (this.keepWhite) tokens.push(new JSDOC.Token(found, "WHIT", "NEWLINE"));
+ return true;
+ }
+}
+
+/**
+ @returns {Boolean} Was the token found?
+ */
+JSDOC.TokenReader.prototype.read_mlcomment = function(/**JSDOC.TokenStream*/stream, tokens) {
+ if (stream.look() == "/" && stream.look(1) == "*") {
+ var found = stream.next(2);
+
+ while (!stream.look().eof && !(stream.look(-1) == "/" && stream.look(-2) == "*")) {
+ found += stream.next();
+ }
+
+ // to start doclet we allow /** or /*** but not /**/ or /****
+ if (/^\/\*\*([^\/]|\*[^*])/.test(found) && this.keepDocs) tokens.push(new JSDOC.Token(found, "COMM", "JSDOC"));
+ else if (this.keepComments) tokens.push(new JSDOC.Token(found, "COMM", "MULTI_LINE_COMM"));
+ return true;
+ }
+ return false;
+}
+
+/**
+ @returns {Boolean} Was the token found?
+ */
+JSDOC.TokenReader.prototype.read_slcomment = function(/**JSDOC.TokenStream*/stream, tokens) {
+ var found;
+ if (
+ (stream.look() == "/" && stream.look(1) == "/" && (found=stream.next(2)))
+ ||
+ (stream.look() == "<" && stream.look(1) == "!" && stream.look(2) == "-" && stream.look(3) == "-" && (found=stream.next(4)))
+ ) {
+
+ while (!stream.look().eof && !JSDOC.Lang.isNewline(stream.look())) {
+ found += stream.next();
+ }
+
+ if (this.keepComments) {
+ tokens.push(new JSDOC.Token(found, "COMM", "SINGLE_LINE_COMM"));
+ }
+ return true;
+ }
+ return false;
+}
+
+/**
+ @returns {Boolean} Was the token found?
+ */
+JSDOC.TokenReader.prototype.read_dbquote = function(/**JSDOC.TokenStream*/stream, tokens) {
+ if (stream.look() == "\"") {
+ // find terminator
+ var string = stream.next();
+
+ while (!stream.look().eof) {
+ if (stream.look() == "\\") {
+ if (JSDOC.Lang.isNewline(stream.look(1))) {
+ do {
+ stream.next();
+ } while (!stream.look().eof && JSDOC.Lang.isNewline(stream.look()));
+ string += "\\\n";
+ }
+ else {
+ string += stream.next(2);
+ }
+ }
+ else if (stream.look() == "\"") {
+ string += stream.next();
+ tokens.push(new JSDOC.Token(string, "STRN", "DOUBLE_QUOTE"));
+ return true;
+ }
+ else {
+ string += stream.next();
+ }
+ }
+ }
+ return false; // error! unterminated string
+}
+
+/**
+ @returns {Boolean} Was the token found?
+ */
+JSDOC.TokenReader.prototype.read_snquote = function(/**JSDOC.TokenStream*/stream, tokens) {
+ if (stream.look() == "'") {
+ // find terminator
+ var string = stream.next();
+
+ while (!stream.look().eof) {
+ if (stream.look() == "\\") { // escape sequence
+ string += stream.next(2);
+ }
+ else if (stream.look() == "'") {
+ string += stream.next();
+ tokens.push(new JSDOC.Token(string, "STRN", "SINGLE_QUOTE"));
+ return true;
+ }
+ else {
+ string += stream.next();
+ }
+ }
+ }
+ return false; // error! unterminated string
+}
+
+/**
+ @returns {Boolean} Was the token found?
+ */
+JSDOC.TokenReader.prototype.read_numb = function(/**JSDOC.TokenStream*/stream, tokens) {
+ if (stream.look() === "0" && stream.look(1) == "x") {
+ return this.read_hex(stream, tokens);
+ }
+
+ var found = "";
+
+ while (!stream.look().eof && JSDOC.Lang.isNumber(found+stream.look())){
+ found += stream.next();
+ }
+
+ if (found === "") {
+ return false;
+ }
+ else {
+ if (/^0[0-7]/.test(found)) tokens.push(new JSDOC.Token(found, "NUMB", "OCTAL"));
+ else tokens.push(new JSDOC.Token(found, "NUMB", "DECIMAL"));
+ return true;
+ }
+}
+/*t:
+ requires("../lib/JSDOC/TextStream.js");
+ requires("../lib/JSDOC/Token.js");
+ requires("../lib/JSDOC/Lang.js");
+
+ plan(3, "testing JSDOC.TokenReader.prototype.read_numb");
+
+ //// setup
+ var src = "function foo(num){while (num+8.0 >= 0x20 && num < 0777){}}";
+ var tr = new JSDOC.TokenReader();
+ var tokens = tr.tokenize(new JSDOC.TextStream(src));
+
+ var hexToken, octToken, decToken;
+ for (var i = 0; i < tokens.length; i++) {
+ if (tokens[i].name == "HEX_DEC") hexToken = tokens[i];
+ if (tokens[i].name == "OCTAL") octToken = tokens[i];
+ if (tokens[i].name == "DECIMAL") decToken = tokens[i];
+ }
+ ////
+
+ is(decToken.data, "8.0", "decimal number is found in source.");
+ is(hexToken.data, "0x20", "hexdec number is found in source (issue #99).");
+ is(octToken.data, "0777", "octal number is found in source.");
+*/
+
+/**
+ @returns {Boolean} Was the token found?
+ */
+JSDOC.TokenReader.prototype.read_hex = function(/**JSDOC.TokenStream*/stream, tokens) {
+ var found = stream.next(2);
+
+ while (!stream.look().eof) {
+ if (JSDOC.Lang.isHexDec(found) && !JSDOC.Lang.isHexDec(found+stream.look())) { // done
+ tokens.push(new JSDOC.Token(found, "NUMB", "HEX_DEC"));
+ return true;
+ }
+ else {
+ found += stream.next();
+ }
+ }
+ return false;
+}
+
+/**
+ @returns {Boolean} Was the token found?
+ */
+JSDOC.TokenReader.prototype.read_regx = function(/**JSDOC.TokenStream*/stream, tokens) {
+ var last;
+ if (
+ stream.look() == "/"
+ &&
+ (
+
+ (
+ !(last = tokens.lastSym()) // there is no last, the regex is the first symbol
+ ||
+ (
+ !last.is("NUMB")
+ && !last.is("NAME")
+ && !last.is("RIGHT_PAREN")
+ && !last.is("RIGHT_BRACKET")
+ )
+ )
+ )
+ ) {
+ var regex = stream.next();
+
+ while (!stream.look().eof) {
+ if (stream.look() == "\\") { // escape sequence
+ regex += stream.next(2);
+ }
+ else if (stream.look() == "/") {
+ regex += stream.next();
+
+ while (/[gmi]/.test(stream.look())) {
+ regex += stream.next();
+ }
+
+ tokens.push(new JSDOC.Token(regex, "REGX", "REGX"));
+ return true;
+ }
+ else {
+ regex += stream.next();
+ }
+ }
+ // error: unterminated regex
+ }
+ return false;
+}
Index: /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/lib/JSDOC/TokenStream.js
===================================================================
--- /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/lib/JSDOC/TokenStream.js (revision 4056)
+++ /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/lib/JSDOC/TokenStream.js (revision 4056)
@@ -0,0 +1,133 @@
+if (typeof JSDOC == "undefined") JSDOC = {};
+
+/**
+ @constructor
+*/
+JSDOC.TokenStream = function(tokens) {
+ this.tokens = (tokens || []);
+ this.rewind();
+}
+
+/**
+ @constructor
+ @private
+*/
+function VoidToken(/**String*/type) {
+ this.toString = function() {return ""};
+ this.is = function(){return false;}
+}
+
+JSDOC.TokenStream.prototype.rewind = function() {
+ this.cursor = -1;
+}
+
+/**
+ @type JSDOC.Token
+*/
+JSDOC.TokenStream.prototype.look = function(/**Number*/n, /**Boolean*/considerWhitespace) {
+ if (typeof n == "undefined") n = 0;
+
+ if (considerWhitespace == true) {
+ if (this.cursor+n < 0 || this.cursor+n > this.tokens.length) return {};
+ return this.tokens[this.cursor+n];
+ }
+ else {
+ var count = 0;
+ var i = this.cursor;
+
+ while (true) {
+ if (i < 0) return new JSDOC.Token("", "VOID", "START_OF_STREAM");
+ else if (i > this.tokens.length) return new JSDOC.Token("", "VOID", "END_OF_STREAM");
+
+ if (i != this.cursor && (this.tokens[i] === undefined || this.tokens[i].is("WHIT"))) {
+ if (n < 0) i--; else i++;
+ continue;
+ }
+
+ if (count == Math.abs(n)) {
+ return this.tokens[i];
+ }
+ count++;
+ (n < 0)? i-- : i++;
+ }
+
+ return new JSDOC.Token("", "VOID", "STREAM_ERROR"); // because null isn't an object and caller always expects an object
+ }
+}
+
+/**
+ @type JSDOC.Token|JSDOC.Token[]
+*/
+JSDOC.TokenStream.prototype.next = function(/**Number*/howMany) {
+ if (typeof howMany == "undefined") howMany = 1;
+ if (howMany < 1) return null;
+ var got = [];
+
+ for (var i = 1; i <= howMany; i++) {
+ if (this.cursor+i >= this.tokens.length) {
+ return null;
+ }
+ got.push(this.tokens[this.cursor+i]);
+ }
+ this.cursor += howMany;
+
+ if (howMany == 1) {
+ return got[0];
+ }
+ else return got;
+}
+
+/**
+ @type JSDOC.Token[]
+*/
+JSDOC.TokenStream.prototype.balance = function(/**String*/start, /**String*/stop) {
+ if (!stop) stop = JSDOC.Lang.matching(start);
+
+ var depth = 0;
+ var got = [];
+ var started = false;
+
+ while ((token = this.look())) {
+ if (token.is(start)) {
+ depth++;
+ started = true;
+ }
+
+ if (started) {
+ got.push(token);
+ }
+
+ if (token.is(stop)) {
+ depth--;
+ if (depth == 0) return got;
+ }
+ if (!this.next()) break;
+ }
+}
+
+JSDOC.TokenStream.prototype.getMatchingToken = function(/**String*/start, /**String*/stop) {
+ var depth = 0;
+ var cursor = this.cursor;
+
+ if (!start) {
+ start = JSDOC.Lang.matching(stop);
+ depth = 1;
+ }
+ if (!stop) stop = JSDOC.Lang.matching(start);
+
+ while ((token = this.tokens[cursor])) {
+ if (token.is(start)) {
+ depth++;
+ }
+
+ if (token.is(stop) && cursor) {
+ depth--;
+ if (depth == 0) return this.tokens[cursor];
+ }
+ cursor++;
+ }
+}
+
+JSDOC.TokenStream.prototype.insertAhead = function(/**JSDOC.Token*/token) {
+ this.tokens.splice(this.cursor+1, 0, token);
+}
Index: /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/lib/JSDOC/Util.js
===================================================================
--- /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/lib/JSDOC/Util.js (revision 4056)
+++ /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/lib/JSDOC/Util.js (revision 4056)
@@ -0,0 +1,32 @@
+/**
+ * @namespace
+ * @deprecated Use {@link FilePath} instead.
+ */
+JSDOC.Util = {
+}
+
+/**
+ * @deprecated Use {@link FilePath.fileName} instead.
+ */
+JSDOC.Util.fileName = function(path) {
+ LOG.warn("JSDOC.Util.fileName is deprecated. Use FilePath.fileName instead.");
+ var nameStart = Math.max(path.lastIndexOf("/")+1, path.lastIndexOf("\\")+1, 0);
+ return path.substring(nameStart);
+}
+
+/**
+ * @deprecated Use {@link FilePath.fileExtension} instead.
+ */
+JSDOC.Util.fileExtension = function(filename) {
+ LOG.warn("JSDOC.Util.fileExtension is deprecated. Use FilePath.fileExtension instead.");
+ return filename.split(".").pop().toLowerCase();
+};
+
+/**
+ * @deprecated Use {@link FilePath.dir} instead.
+ */
+JSDOC.Util.dir = function(path) {
+ LOG.warn("JSDOC.Util.dir is deprecated. Use FilePath.dir instead.");
+ var nameStart = Math.max(path.lastIndexOf("/")+1, path.lastIndexOf("\\")+1, 0);
+ return path.substring(0, nameStart-1);
+}
Index: /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/lib/JSDOC/Walker.js
===================================================================
--- /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/lib/JSDOC/Walker.js (revision 4056)
+++ /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/lib/JSDOC/Walker.js (revision 4056)
@@ -0,0 +1,416 @@
+if (typeof JSDOC == "undefined") JSDOC = {};
+
+/** @constructor */
+JSDOC.Walker = function(/**JSDOC.TokenStream*/ts) {
+ this.init();
+ if (typeof ts != "undefined") {
+ this.walk(ts);
+ }
+}
+
+JSDOC.Walker.prototype.init = function() {
+ this.ts = null;
+
+ var globalSymbol = new JSDOC.Symbol("_global_", [], "GLOBAL", new JSDOC.DocComment(""));
+ globalSymbol.isNamespace = true;
+ globalSymbol.srcFile = "";
+ globalSymbol.isPrivate = false;
+ JSDOC.Parser.addSymbol(globalSymbol);
+ this.lastDoc = null;
+ this.token = null;
+
+ /**
+ The chain of symbols under which we are currently nested.
+ @type Array
+ */
+ this.namescope = [globalSymbol];
+ this.namescope.last = function(n){ if (!n) n = 0; return this[this.length-(1+n)] || "" };
+}
+
+JSDOC.Walker.prototype.walk = function(/**JSDOC.TokenStream*/ts) {
+ this.ts = ts;
+ while (this.token = this.ts.look()) {
+ if (this.token.popNamescope) {
+
+ var symbol = this.namescope.pop();
+ if (symbol.is("FUNCTION")) {
+ if (this.ts.look(1).is("LEFT_PAREN") && symbol.comment.getTag("function").length == 0) {
+ symbol.isa = "OBJECT";
+ }
+ }
+ }
+ this.step();
+ if (!this.ts.next()) break;
+ }
+}
+
+JSDOC.Walker.prototype.step = function() {
+ if (this.token.is("JSDOC")) { // it's a doc comment
+
+ var doc = new JSDOC.DocComment(this.token.data);
+
+ if (doc.getTag("lends").length > 0) { // it's a new namescope
+ var lends = doc.getTag("lends")[0];
+
+ var name = lends.desc
+ if (!name) throw "@lends tag requires a value.";
+
+ var symbol = new JSDOC.Symbol(name, [], "OBJECT", doc);
+
+ this.namescope.push(symbol);
+
+ var matching = this.ts.getMatchingToken("LEFT_CURLY");
+ if (matching) matching.popNamescope = name;
+ else LOG.warn("Mismatched } character. Can't parse code.");
+
+ this.lastDoc = null;
+ return true;
+ }
+ else if (doc.getTag("name").length > 0 && doc.getTag("overview").length == 0) { // it's a virtual symbol
+ var virtualName = doc.getTag("name")[0].desc;
+ if (!virtualName) throw "@name tag requires a value.";
+
+ var symbol = new JSDOC.Symbol(virtualName, [], "VIRTUAL", doc);
+
+ JSDOC.Parser.addSymbol(symbol);
+
+ this.lastDoc = null;
+ return true;
+ }
+ else if (doc.meta) { // it's a meta doclet
+ if (doc.meta == "@+") JSDOC.DocComment.shared = doc.src;
+ else if (doc.meta == "@-") JSDOC.DocComment.shared = "";
+ else if (doc.meta == "nocode+") JSDOC.Parser.conf.ignoreCode = true;
+ else if (doc.meta == "nocode-") JSDOC.Parser.conf.ignoreCode = JSDOC.opt.n;
+ else throw "Unrecognized meta comment: "+doc.meta;
+
+ this.lastDoc = null;
+ return true;
+ }
+ else if (doc.getTag("overview").length > 0) { // it's a file overview
+ symbol = new JSDOC.Symbol("", [], "FILE", doc);
+
+ JSDOC.Parser.addSymbol(symbol);
+
+ this.lastDoc = null;
+ return true;
+ }
+ else {
+ this.lastDoc = doc;
+ return false;
+ }
+ }
+ else if (!JSDOC.Parser.conf.ignoreCode) { // it's code
+ if (this.token.is("NAME")) {
+ var symbol;
+ var name = this.token.data;
+ var doc = null; if (this.lastDoc) doc = this.lastDoc;
+ var params = [];
+
+ // it's inside an anonymous object
+ if (this.ts.look(1).is("COLON") && this.ts.look(-1).is("LEFT_CURLY") && !(this.ts.look(-2).is("JSDOC") || this.namescope.last().comment.getTag("lends").length || this.ts.look(-2).is("ASSIGN") || this.ts.look(-2).is("COLON"))) {
+ name = "$anonymous";
+ name = this.namescope.last().alias+"-"+name
+
+ params = [];
+
+ symbol = new JSDOC.Symbol(name, params, "OBJECT", doc);
+
+ JSDOC.Parser.addSymbol(symbol);
+
+ this.namescope.push(symbol);
+
+ var matching = this.ts.getMatchingToken(null, "RIGHT_CURLY");
+ if (matching) matching.popNamescope = name;
+ else LOG.warn("Mismatched } character. Can't parse code.");
+ }
+ // function foo() {}
+ else if (this.ts.look(-1).is("FUNCTION") && this.ts.look(1).is("LEFT_PAREN")) {
+ var isInner;
+
+ if (this.lastDoc) doc = this.lastDoc;
+ name = this.namescope.last().alias+"-"+name;
+ if (!this.namescope.last().is("GLOBAL")) isInner = true;
+
+ params = JSDOC.Walker.onParamList(this.ts.balance("LEFT_PAREN"));
+
+ symbol = new JSDOC.Symbol(name, params, "FUNCTION", doc);
+ if (isInner) symbol.isInner = true;
+
+
+ JSDOC.Parser.addSymbol(symbol);
+
+ this.namescope.push(symbol);
+
+ var matching = this.ts.getMatchingToken("LEFT_CURLY");
+ if (matching) matching.popNamescope = name;
+ else LOG.warn("Mismatched } character. Can't parse code.");
+ }
+ // foo = function() {}
+ else if (this.ts.look(1).is("ASSIGN") && this.ts.look(2).is("FUNCTION")) {
+ var isInner;
+ if (this.ts.look(-1).is("VAR") || this.isInner) {
+ name = this.namescope.last().alias+"-"+name
+ if (!this.namescope.last().is("GLOBAL")) isInner = true;
+ }
+ else if (name.indexOf("this.") == 0) {
+ name = this.resolveThis(name);
+ }
+
+ if (this.lastDoc) doc = this.lastDoc;
+ params = JSDOC.Walker.onParamList(this.ts.balance("LEFT_PAREN"));
+
+ symbol = new JSDOC.Symbol(name, params, "FUNCTION", doc);
+ if (isInner) symbol.isInner = true;
+
+ JSDOC.Parser.addSymbol(symbol);
+
+ this.namescope.push(symbol);
+
+ var matching = this.ts.getMatchingToken("LEFT_CURLY");
+ if (matching) matching.popNamescope = name;
+ else LOG.warn("Mismatched } character. Can't parse code.");
+ }
+ // foo = new function() {}
+ else if (this.ts.look(1).is("ASSIGN") && this.ts.look(2).is("NEW") && this.ts.look(3).is("FUNCTION")) {
+ var isInner;
+ if (this.ts.look(-1).is("VAR") || this.isInner) {
+ name = this.namescope.last().alias+"-"+name
+ if (!this.namescope.last().is("GLOBAL")) isInner = true;
+ }
+ else if (name.indexOf("this.") == 0) {
+ name = this.resolveThis(name);
+ }
+
+ if (this.lastDoc) doc = this.lastDoc;
+ params = JSDOC.Walker.onParamList(this.ts.balance("LEFT_PAREN"));
+
+ symbol = new JSDOC.Symbol(name, params, "OBJECT", doc);
+ if (isInner) symbol.isInner = true;
+
+
+ JSDOC.Parser.addSymbol(symbol);
+
+ symbol.scopeType = "INSTANCE";
+ this.namescope.push(symbol);
+
+ var matching = this.ts.getMatchingToken("LEFT_CURLY");
+ if (matching) matching.popNamescope = name;
+ else LOG.warn("Mismatched } character. Can't parse code.");
+ }
+ // foo: function() {}
+ else if (this.ts.look(1).is("COLON") && this.ts.look(2).is("FUNCTION")) {
+ name = (this.namescope.last().alias+"."+name).replace("#.", "#");
+
+ if (this.lastDoc) doc = this.lastDoc;
+ params = JSDOC.Walker.onParamList(this.ts.balance("LEFT_PAREN"));
+
+ if (doc && doc.getTag("constructs").length) {
+ name = name.replace(/\.prototype(\.|$)/, "#");
+
+ if (name.indexOf("#") > -1) name = name.match(/(^[^#]+)/)[0];
+ else name = this.namescope.last().alias;
+
+ symbol = new JSDOC.Symbol(name, params, "CONSTRUCTOR", doc);
+ }
+ else {
+ symbol = new JSDOC.Symbol(name, params, "FUNCTION", doc);
+ }
+
+
+ JSDOC.Parser.addSymbol(symbol);
+
+ this.namescope.push(symbol);
+
+ var matching = this.ts.getMatchingToken("LEFT_CURLY");
+ if (matching) matching.popNamescope = name;
+ else LOG.warn("Mismatched } character. Can't parse code.");
+ }
+ // foo = {}
+ else if (this.ts.look(1).is("ASSIGN") && this.ts.look(2).is("LEFT_CURLY")) {
+ var isInner;
+ if (this.ts.look(-1).is("VAR") || this.isInner) {
+ name = this.namescope.last().alias+"-"+name
+ if (!this.namescope.last().is("GLOBAL")) isInner = true;
+ }
+ else if (name.indexOf("this.") == 0) {
+ name = this.resolveThis(name);
+ }
+
+ if (this.lastDoc) doc = this.lastDoc;
+
+ symbol = new JSDOC.Symbol(name, params, "OBJECT", doc);
+ if (isInner) symbol.isInner = true;
+
+
+ if (doc) JSDOC.Parser.addSymbol(symbol);
+
+ this.namescope.push(symbol);
+
+ var matching = this.ts.getMatchingToken("LEFT_CURLY");
+ if (matching) matching.popNamescope = name;
+ else LOG.warn("Mismatched } character. Can't parse code.");
+ }
+ // foo = x
+ else if (this.ts.look(1).is("ASSIGN")) {
+
+ var isInner;
+ if (this.ts.look(-1).is("VAR") || this.isInner) {
+ name = this.namescope.last().alias+"-"+name
+ if (!this.namescope.last().is("GLOBAL")) isInner = true;
+ }
+ else if (name.indexOf("this.") == 0) {
+ name = this.resolveThis(name);
+ }
+
+ if (this.lastDoc) doc = this.lastDoc;
+
+ symbol = new JSDOC.Symbol(name, params, "OBJECT", doc);
+ if (isInner) symbol.isInner = true;
+
+
+ if (doc) JSDOC.Parser.addSymbol(symbol);
+ }
+ // foo: {}
+ else if (this.ts.look(1).is("COLON") && this.ts.look(2).is("LEFT_CURLY")) {
+ name = (this.namescope.last().alias+"."+name).replace("#.", "#");
+
+ if (this.lastDoc) doc = this.lastDoc;
+
+ symbol = new JSDOC.Symbol(name, params, "OBJECT", doc);
+
+
+ if (doc) JSDOC.Parser.addSymbol(symbol);
+
+ this.namescope.push(symbol);
+
+ var matching = this.ts.getMatchingToken("LEFT_CURLY");
+ if (matching) matching.popNamescope = name;
+ else LOG.warn("Mismatched } character. Can't parse code.");
+ }
+ // foo: x
+ else if (this.ts.look(1).is("COLON")) {
+ name = (this.namescope.last().alias+"."+name).replace("#.", "#");;
+
+ if (this.lastDoc) doc = this.lastDoc;
+
+ symbol = new JSDOC.Symbol(name, params, "OBJECT", doc);
+
+
+ if (doc) JSDOC.Parser.addSymbol(symbol);
+ }
+ // foo(...)
+ else if (this.ts.look(1).is("LEFT_PAREN")) {
+ var functionCall = {name: name};
+ if (!this.ts.look(2).is("RIGHT_PAREN")) functionCall.arg1 = this.ts.look(2).data;
+
+ if (typeof JSDOC.PluginManager != "undefined") {
+ JSDOC.PluginManager.run("onFunctionCall", functionCall);
+ if (functionCall.doc) {
+ this.ts.insertAhead(new JSDOC.Token(functionCall.doc, "COMM", "JSDOC"));
+ }
+ }
+ }
+ this.lastDoc = null;
+ }
+ else if (this.token.is("FUNCTION")) { // it's an anonymous function
+ if (
+ (!this.ts.look(-1).is("COLON") || !this.ts.look(-1).is("ASSIGN"))
+ && !this.ts.look(1).is("NAME")
+ ) {
+ if (this.lastDoc) doc = this.lastDoc;
+
+ name = "$anonymous";
+ name = this.namescope.last().alias+"-"+name
+
+ params = JSDOC.Walker.onParamList(this.ts.balance("LEFT_PAREN"));
+
+ symbol = new JSDOC.Symbol(name, params, "FUNCTION", doc);
+
+
+ JSDOC.Parser.addSymbol(symbol);
+
+ this.namescope.push(symbol);
+
+ var matching = this.ts.getMatchingToken("LEFT_CURLY");
+ if (matching) matching.popNamescope = name;
+ else LOG.warn("Mismatched } character. Can't parse code.");
+ }
+ }
+ }
+ return true;
+}
+
+/**
+ Resolves what "this." means when it appears in a name.
+ @param name The name that starts with "this.".
+ @returns The name with "this." resolved.
+ */
+JSDOC.Walker.prototype.resolveThis = function(name) {
+ name.match(/^this\.(.+)$/)
+ var nameFragment = RegExp.$1;
+ if (!nameFragment) return name;
+
+ var symbol = this.namescope.last();
+ var scopeType = symbol.scopeType || symbol.isa;
+
+ // if we are in a constructor function, `this` means the instance
+ if (scopeType == "CONSTRUCTOR") {
+ name = symbol.alias+"#"+nameFragment;
+ }
+
+ // if we are in an anonymous constructor function, `this` means the instance
+ else if (scopeType == "INSTANCE") {
+ name = symbol.alias+"."+nameFragment;
+ }
+
+ // if we are in a function, `this` means the container (possibly the global)
+ else if (scopeType == "FUNCTION") {
+ // in a method of a prototype, so `this` means the constructor
+ if (symbol.alias.match(/(^.*)[#.-][^#.-]+/)) {
+ var parentName = RegExp.$1;
+ var parent = JSDOC.Parser.symbols.getSymbol(parentName);
+
+ if (!parent) {
+ if (JSDOC.Lang.isBuiltin(parentName)) parent = JSDOC.Parser.addBuiltin(parentName);
+ else {
+ if (symbol.alias.indexOf("$anonymous") < 0) // these will be ignored eventually
+ LOG.warn("Can't document "+symbol.alias+" without first documenting "+parentName+".");
+ }
+ }
+ if (parent) name = parentName+(parent.is("CONSTRUCTOR")?"#":".")+nameFragment;
+ }
+ else {
+ parent = this.namescope.last(1);
+ name = parent.alias+(parent.is("CONSTRUCTOR")?"#":".")+nameFragment;
+ }
+ }
+ // otherwise it means the global
+ else {
+ name = nameFragment;
+ }
+
+ return name;
+}
+
+JSDOC.Walker.onParamList = function(/**Array*/paramTokens) {
+ if (!paramTokens) {
+ LOG.warn("Malformed parameter list. Can't parse code.");
+ return [];
+ }
+ var params = [];
+ for (var i = 0, l = paramTokens.length; i < l; i++) {
+ if (paramTokens[i].is("JSDOC")) {
+ var paramType = paramTokens[i].data.replace(/(^\/\*\* *| *\*\/$)/g, "");
+
+ if (paramTokens[i+1] && paramTokens[i+1].is("NAME")) {
+ i++;
+ params.push({type: paramType, name: paramTokens[i].data});
+ }
+ }
+ else if (paramTokens[i].is("NAME")) {
+ params.push({name: paramTokens[i].data});
+ }
+ }
+ return params;
+}
Index: /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/main.js
===================================================================
--- /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/main.js (revision 4056)
+++ /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/main.js (revision 4056)
@@ -0,0 +1,74 @@
+/**
+ * @version $Id: main.js 570 2008-04-07 23:54:50Z micmath $
+ */
+
+function main() {
+ IO.include("lib/JSDOC.js");
+ IO.includeDir("plugins/");
+
+ if (JSDOC.opt.v) LOG.verbose = true;
+ if (JSDOC.opt.o) LOG.out = IO.open(JSDOC.opt.o);
+
+ if (JSDOC.opt.T) {
+ LOG.inform("JsDoc Toolkit running in test mode at "+new Date()+".");
+ IO.include("frame/Testrun.js");
+ IO.include("test.js");
+ }
+ else {
+ LOG.inform("JsDoc Toolkit main() running at "+new Date()+".");
+ LOG.inform("With options: ");
+ for (var o in JSDOC.opt) {
+ LOG.inform(" "+o+": "+JSDOC.opt[o]);
+ }
+
+ var jsdoc = new JSDOC.JsDoc();
+
+ if (JSDOC.opt.Z) { // secret debugging option
+ LOG.warn("So you want to see the data structure, eh? This might hang if you have circular refs...");
+ IO.include("frame/Dumper.js");
+ var symbols = jsdoc.symbolSet.toArray();
+ for (var i = 0, l = symbols.length; i < l; i++) {
+ var symbol = symbols[i];
+ print("// symbol: " + symbol.alias);
+ print(symbol.serialize());
+ }
+ }
+ else {
+ var template = JSDOC.opt.t || System.getProperty("jsdoc.template.dir");
+
+ var handler = jsdoc.symbolSet.handler;
+ if (handler && handler.publish) {
+ handler.publish(jsdoc.symbolSet);
+ }
+ else {
+ if (typeof template != "undefined") {
+ try {
+ load(template+"/publish.js");
+ if (!publish) {
+ LOG.warn("No publish() function is defined in that template so nothing to do.");
+ }
+ else {
+ publish(jsdoc.symbolSet);
+ }
+ }
+ catch(e) {
+ LOG.warn("Sorry, that doesn't seem to be a valid template: "+template+"/publish.js : "+e);
+ }
+ }
+ else {
+ LOG.warn("No template or handlers given. Might as well read the usage notes.");
+ JSDOC.usage();
+ }
+ }
+ }
+ }
+
+ if (LOG.warnings.length) {
+ print(LOG.warnings.length+" warning"+(LOG.warnings.length != 1? "s":"")+".");
+ }
+
+ if (LOG.out) {
+ LOG.out.flush();
+ LOG.out.close();
+ }
+}
Index: /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/plugins/commentSrcJson.js
===================================================================
--- /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/plugins/commentSrcJson.js (revision 4056)
+++ /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/plugins/commentSrcJson.js (revision 4056)
@@ -0,0 +1,19 @@
+JSDOC.PluginManager.registerPlugin(
+ "JSDOC.commentSrcJson",
+ {
+ onDocCommentSrc: function(commentSrc) {
+ var json;
+ if (/^\s*@json\b/.test(commentSrc)) {
+ commentSrc = commentSrc.replace("@json", "");
+ eval("json = "+commentSrc);
+ var tagged = "";
+ for (var i in json) {
+ var tag = json[i];
+ // todo handle cases where tag is an object
+ tagged += "@"+i+" "+tag+"\n";
+ }
+ return tagged;
+ }
+ }
+ }
+);
Index: /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/plugins/frameworkPrototype.js
===================================================================
--- /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/plugins/frameworkPrototype.js (revision 4056)
+++ /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/plugins/frameworkPrototype.js (revision 4056)
@@ -0,0 +1,16 @@
+JSDOC.PluginManager.registerPlugin(
+ "JSDOC.frameworkPrototype",
+ {
+ onPrototypeClassCreate: function(classCreator) {
+ var desc = "";
+ if (classCreator.comment) {
+ desc = classCreator.comment;
+ }
+ var insert = desc+"/** @name "+classCreator.name+"\n@constructor\n@scope "+classCreator.name+".prototype */"
+
+ insert = insert.replace(/\*\/\/\*\*/g, "\n");
+ /*DEBUG*///print("insert is "+insert);
+ classCreator.addComment.data = insert;
+ }
+ }
+);
Index: /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/plugins/functionCall.js
===================================================================
--- /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/plugins/functionCall.js (revision 4056)
+++ /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/plugins/functionCall.js (revision 4056)
@@ -0,0 +1,10 @@
+JSDOC.PluginManager.registerPlugin(
+ "JSDOC.functionCall",
+ {
+ onFunctionCall: function(functionCall) {
+ if (functionCall.name == "dojo.define" && functionCall.arg1) {
+ functionCall.doc = "/** @lends "+eval(functionCall.arg1)+".prototype */";
+ }
+ }
+ }
+);
Index: /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/plugins/publishSrcHilite.js
===================================================================
--- /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/plugins/publishSrcHilite.js (revision 4056)
+++ /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/plugins/publishSrcHilite.js (revision 4056)
@@ -0,0 +1,62 @@
+JSDOC.PluginManager.registerPlugin(
+ "JSDOC.publishSrcHilite",
+ {
+ onPublishSrc: function(src) {
+ if (src.path in JsHilite.cache) {
+ return; // already generated src code
+ }
+ else JsHilite.cache[src.path] = true;
+
+ try {
+ var sourceCode = IO.readFile(src.path);
+ }
+ catch(e) {
+ print(e.message);
+ quit();
+ }
+
+ var hiliter = new JsHilite(sourceCode, src.charset);
+ src.hilited = hiliter.hilite();
+ }
+ }
+);
+
+function JsHilite(src, charset) {
+
+ var tr = new JSDOC.TokenReader();
+
+ tr.keepComments = true;
+ tr.keepDocs = true;
+ tr.keepWhite = true;
+
+ this.tokens = tr.tokenize(new JSDOC.TextStream(src));
+
+ // TODO is redefining toString() the best way?
+ JSDOC.Token.prototype.toString = function() {
+ return ""+this.data.replace(/";
+ }
+
+ if (!charset) charset = "utf-8";
+
+ this.header = ' '+
+ "
";
+ this.footer = "
";
+ this.showLinenumbers = true;
+}
+
+JsHilite.cache = {};
+
+JsHilite.prototype.hilite = function() {
+ var hilited = this.tokens.join("");
+ var line = 1;
+ if (this.showLinenumbers) hilited = hilited.replace(/(^|\n)/g, function(m){return m+""+((line<10)? " ":"")+((line<100)? " ":"")+(line++)+" "});
+
+ return this.header+hilited+this.footer;
+}
Index: /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/plugins/symbolLink.js
===================================================================
--- /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/plugins/symbolLink.js (revision 4056)
+++ /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/plugins/symbolLink.js (revision 4056)
@@ -0,0 +1,9 @@
+JSDOC.PluginManager.registerPlugin(
+ "JSDOC.symbolLink",
+ {
+ onSymbolLink: function(link) {
+ // modify link.linkPath
+ // or link.linkText here
+ }
+ }
+);
Index: /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/plugins/tagParamConfig.js
===================================================================
--- /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/plugins/tagParamConfig.js (revision 4056)
+++ /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/plugins/tagParamConfig.js (revision 4056)
@@ -0,0 +1,31 @@
+JSDOC.PluginManager.registerPlugin(
+ "JSDOC.tagParamConfig",
+ {
+ onDocCommentTags: function(comment) {
+ var currentParam = null;
+ var tags = comment.tags;
+ for (var i = 0, l = tags.length; i < l; i++) {
+
+ if (tags[i].title == "param") {
+ if (tags[i].name.indexOf(".") == -1) {
+ currentParam = i;
+ }
+ }
+ else if (tags[i].title == "config") {
+ tags[i].title = "param";
+ if (currentParam == null) {
+ tags[i].name = "arguments"+"."+tags[i].name;
+ }
+ else if (tags[i].name.indexOf(tags[currentParam].name+".") != 0) {
+ tags[i].name = tags[currentParam].name+"."+tags[i].name;
+ }
+ currentParam != null
+ //tags[currentParam].properties.push(tags[i]);
+ }
+ else {
+ currentParam = null;
+ }
+ }
+ }
+ }
+);
Index: /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/plugins/tagSynonyms.js
===================================================================
--- /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/plugins/tagSynonyms.js (revision 4056)
+++ /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/plugins/tagSynonyms.js (revision 4056)
@@ -0,0 +1,43 @@
+JSDOC.PluginManager.registerPlugin(
+ "JSDOC.tagSynonyms",
+ {
+ onDocCommentSrc: function(comment) {
+ comment.src = comment.src.replace(/@methodOf\b/i, "@function\n@memberOf");
+ comment.src = comment.src.replace(/@fieldOf\b/i, "@field\n@memberOf");
+ },
+
+ onDocCommentTags: function(comment) {
+ for (var i = 0, l = comment.tags.length; i < l; i++) {
+ var title = comment.tags[i].title.toLowerCase();
+ var syn;
+ if ((syn = JSDOC.tagSynonyms.synonyms["="+title])) {
+ comment.tags[i].title = syn;
+ }
+ }
+ }
+ }
+);
+
+new Namespace(
+ "JSDOC.tagSynonyms",
+ function() {
+ JSDOC.tagSynonyms.synonyms = {
+ "=member": "memberOf",
+ "=memberof": "memberOf",
+ "=description": "desc",
+ "=exception": "throws",
+ "=argument": "param",
+ "=returns": "return",
+ "=classdescription": "class",
+ "=fileoverview": "overview",
+ "=extends": "augments",
+ "=base": "augments",
+ "=projectdescription": "overview",
+ "=classdescription": "class",
+ "=link": "see",
+ "=borrows": "inherits",
+ "=scope": "lends",
+ "=construct": "constructor"
+ }
+ }
+);
Index: /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/run.js
===================================================================
--- /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/run.js (revision 4056)
+++ /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/run.js (revision 4056)
@@ -0,0 +1,346 @@
+/**
+ * @fileOverview
+ * A bootstrap script that creates some basic required objects
+ * for loading other scripts.
+ * @author Michael Mathews, micmath@gmail.com
+ * @version $Id: run.js 554 2008-04-01 00:12:25Z micmath $
+ */
+
+/**
+ * @namespace Keep track of any messages from the running script.
+ */
+LOG = {
+ warn: function(msg, e) {
+ if (e) msg = e.fileName+", line "+e.lineNumber+": "+msg;
+
+ msg = ">> WARNING: "+msg;
+ LOG.warnings.push(msg);
+ if (LOG.out) LOG.out.write(msg+"\n");
+ else print(msg);
+ },
+
+ inform: function(msg) {
+ msg = " > "+msg;
+ if (LOG.out) LOG.out.write(msg+"\n");
+ else if (typeof LOG.verbose != "undefined" && LOG.verbose) print(msg);
+ }
+};
+LOG.warnings = [];
+LOG.verbose = false
+LOG.out = undefined;
+
+/**
+ * @class Manipulate a filepath.
+ */
+function FilePath(absPath, separator) {
+ this.slash = separator || "/";
+ this.root = this.slash;
+ this.path = [];
+ this.file = "";
+
+ var parts = absPath.split(/[\\\/]/);
+ if (parts) {
+ if (parts.length) this.root = parts.shift() + this.slash;
+ if (parts.length) this.file = parts.pop()
+ if (parts.length) this.path = parts;
+ }
+
+ this.path = this.resolvePath();
+}
+
+/** Collapse any dot-dot or dot items in a filepath. */
+FilePath.prototype.resolvePath = function() {
+ var resolvedPath = [];
+ for (var i = 0; i < this.path.length; i++) {
+ if (this.path[i] == "..") resolvedPath.pop();
+ else if (this.path[i] != ".") resolvedPath.push(this.path[i]);
+ }
+ return resolvedPath;
+}
+
+/** Trim off the filename. */
+FilePath.prototype.toDir = function() {
+ if (this.file) this.file = "";
+ return this;
+}
+
+/** Go up a directory. */
+FilePath.prototype.upDir = function() {
+ this.toDir();
+ if (this.path.length) this.path.pop();
+ return this;
+}
+
+FilePath.prototype.toString = function() {
+ return this.root
+ + this.path.join(this.slash)
+ + ((this.path.length > 0)? this.slash : "")
+ + this.file;
+}
+
+/**
+ * Turn a path into just the name of the file.
+ */
+FilePath.fileName = function(path) {
+ var nameStart = Math.max(path.lastIndexOf("/")+1, path.lastIndexOf("\\")+1, 0);
+ return path.substring(nameStart);
+}
+
+/**
+ * Get the extension of a filename
+ */
+FilePath.fileExtension = function(filename) {
+ return filename.split(".").pop().toLowerCase();
+};
+
+/**
+ * Turn a path into just the directory part.
+ */
+FilePath.dir = function(path) {
+ var nameStart = Math.max(path.lastIndexOf("/")+1, path.lastIndexOf("\\")+1, 0);
+ return path.substring(0, nameStart-1);
+}
+
+
+importClass(java.lang.System);
+
+/**
+ * @namespace A collection of information about your system.
+ */
+SYS = {
+ /**
+ * Information about your operating system: arch, name, version.
+ * @type string
+ */
+ os: [
+ new String(System.getProperty("os.arch")),
+ new String(System.getProperty("os.name")),
+ new String(System.getProperty("os.version"))
+ ].join(", "),
+
+ /**
+ * Which way does your slash lean.
+ * @type string
+ */
+ slash: System.getProperty("file.separator")||"/",
+
+ /**
+ * The path to the working directory where you ran java.
+ * @type string
+ */
+ userDir: new String(System.getProperty("user.dir")),
+
+ /**
+ * Where is Java's home folder.
+ * @type string
+ */
+ javaHome: new String(System.getProperty("java.home")),
+
+ /**
+ * The absolute path to the directory containing this script.
+ * @type string
+ */
+ pwd: undefined
+};
+
+// jsrun appends an argument, with the path to here.
+if (arguments[arguments.length-1].match(/^-j=(.+)/)) {
+ if (RegExp.$1.charAt(0) == SYS.slash || RegExp.$1.charAt(1) == ":") { // absolute path to here
+ SYS.pwd = new FilePath(RegExp.$1).toDir().toString();
+ }
+ else { // relative path to here
+ SYS.pwd = new FilePath(SYS.userDir + SYS.slash + RegExp.$1).toDir().toString();
+ }
+ arguments.pop();
+}
+else {
+ print("The run.js script requires you use jsrun.jar.");
+ quit();
+}
+
+// shortcut
+var File = Packages.java.io.File;
+
+/**
+ * @namespace A collection of functions that deal with reading a writing to disk.
+ */
+IO = {
+
+ /**
+ * Create a new file in the given directory, with the given name and contents.
+ */
+ saveFile: function(/**string*/ outDir, /**string*/ fileName, /**string*/ content) {
+ var out = new Packages.java.io.PrintWriter(
+ new Packages.java.io.OutputStreamWriter(
+ new Packages.java.io.FileOutputStream(outDir+SYS.slash+fileName),
+ IO.encoding
+ )
+ );
+ out.write(content);
+ out.flush();
+ out.close();
+ },
+
+ /**
+ * @type string
+ */
+ readFile: function(/**string*/ path) {
+ if (!IO.exists(path)) {
+ throw "File doesn't exist there: "+path;
+ }
+ return readFile(path, IO.encoding);
+ },
+
+ /**
+ * @param inFile
+ * @param outDir
+ * @param [fileName=The original filename]
+ */
+ copyFile: function(/**string*/ inFile, /**string*/ outDir, /**string*/ fileName) {
+ if (fileName == null) fileName = FilePath.fileName(inFile);
+
+ var inFile = new File(inFile);
+ var outFile = new File(outDir+SYS.slash+fileName);
+
+ var bis = new Packages.java.io.BufferedInputStream(new Packages.java.io.FileInputStream(inFile), 4096);
+ var bos = new Packages.java.io.BufferedOutputStream(new Packages.java.io.FileOutputStream(outFile), 4096);
+ var theChar;
+ while ((theChar = bis.read()) != -1) {
+ bos.write(theChar);
+ }
+ bos.close();
+ bis.close();
+ },
+
+ /**
+ * Creates a series of nested directories.
+ */
+ mkPath: function(/**Array*/ path) {
+ if (path.constructor != Array) path = path.split(/[\\\/]/);
+ var make = "";
+ for (var i = 0, l = path.length; i < l; i++) {
+ make += path[i] + SYS.slash;
+ if (! IO.exists(make)) {
+ IO.makeDir(make);
+ }
+ }
+ },
+
+ /**
+ * Creates a directory at the given path.
+ */
+ makeDir: function(/**string*/ path) {
+ (new File(path)).mkdir();
+ },
+
+ /**
+ * @type string[]
+ * @param dir The starting directory to look in.
+ * @param [recurse=1] How many levels deep to scan.
+ * @returns An array of all the paths to files in the given dir.
+ */
+ ls: function(/**string*/ dir, /**number*/ recurse, _allFiles, _path) {
+ if (_path === undefined) { // initially
+ var _allFiles = [];
+ var _path = [dir];
+ }
+ if (_path.length == 0) return _allFiles;
+ if (recurse === undefined) recurse = 1;
+
+ dir = new File(dir);
+ if (!dir.directory) return [String(dir)];
+ var files = dir.list();
+
+ for (var f = 0; f < files.length; f++) {
+ var file = String(files[f]);
+ if (file.match(/^\.[^\.\/\\]/)) continue; // skip dot files
+
+ if ((new File(_path.join(SYS.slash)+SYS.slash+file)).list()) { // it's a directory
+ _path.push(file);
+ if (_path.length-1 < recurse) IO.ls(_path.join(SYS.slash), recurse, _allFiles, _path);
+ _path.pop();
+ }
+ else {
+ _allFiles.push((_path.join(SYS.slash)+SYS.slash+file).replace(SYS.slash+SYS.slash, SYS.slash));
+ }
+ }
+
+ return _allFiles;
+ },
+
+ /**
+ * @type boolean
+ */
+ exists: function(/**string*/ path) {
+ file = new File(path);
+
+ if (file.isDirectory()){
+ return true;
+ }
+ if (!file.exists()){
+ return false;
+ }
+ if (!file.canRead()){
+ return false;
+ }
+ return true;
+ },
+
+ /**
+ *
+ */
+ open: function(/**string*/ path, /**string*/ append) {
+ var append = true;
+ var outFile = new File(path);
+ var out = new Packages.java.io.PrintWriter(
+ new Packages.java.io.OutputStreamWriter(
+ new Packages.java.io.FileOutputStream(outFile, append),
+ IO.encoding
+ )
+ );
+ return out;
+ },
+
+ /**
+ * Sets {@link IO.encoding}.
+ * Encoding is used when reading and writing text to files,
+ * and in the meta tags of HTML output.
+ */
+ setEncoding: function(/**string*/ encoding) {
+ if (/ISO-8859-([0-9]+)/i.test(encoding)) {
+ IO.encoding = "ISO8859_"+RegExp.$1;
+ }
+ else {
+ IO.encoding = encoding;
+ }
+ },
+
+ /**
+ * @default "utf-8"
+ * @private
+ */
+ encoding: "utf-8",
+
+ /**
+ * Load the given script.
+ */
+ include: function(relativePath) {
+ load(SYS.pwd+relativePath);
+ },
+
+ /**
+ * Loads all scripts from the given directory path.
+ */
+ includeDir: function(path) {
+ if (!path) return;
+
+ for (var lib = IO.ls(SYS.pwd+path), i = 0; i < lib.length; i++)
+ load(lib[i]);
+ }
+}
+
+// now run the application
+IO.include("frame.js");
+IO.include("main.js");
+
+main();
Index: /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/t/TestDoc.js
===================================================================
--- /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/t/TestDoc.js (revision 4056)
+++ /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/t/TestDoc.js (revision 4056)
@@ -0,0 +1,144 @@
+var TestDoc = {
+ fails: 0,
+ plans: 0,
+ passes: 0,
+ results: []
+};
+
+TestDoc.record = function(result) {
+ TestDoc.results.push(result);
+ if (typeof result.verdict == "boolean") {
+ if (result.verdict === false) TestDoc.fails++;
+ if (result.verdict === true) TestDoc.passes++;
+ }
+}
+
+TestDoc.prove = function(filePath) {
+ if (typeof document != "undefined" && typeof document.write != "undefined") {
+ if (TestDoc.console) print = function(s) { TestDoc.console.appendChild(document.createTextNode(s+"\n")); }
+ else print = function(s) { document.write(s+" "); }
+ }
+ TestDoc.run(TestDoc.readFile(filePath));
+}
+
+TestDoc.run = function(src) {
+ try { eval(src); } catch(e) { print("# ERROR! "+e); }
+
+ var chunks = src.split(/\/\*t:/);
+
+ var run = function(chunk) {
+ // local shortcuts
+ var is = TestDoc.assertEquals;
+ var isnt = TestDoc.assertNotEquals;
+ var plan = TestDoc.plan;
+ var requires = TestDoc.requires;
+
+ try { eval(chunk); } catch(e) { print("# ERROR! "+e); }
+ }
+ for (var start = -1, end = 0; (start = src.indexOf("/*t:", end)) > end; start = end) {
+ run(
+ src.substring(
+ start+4,
+ (end = src.indexOf("*/", start))
+ )
+ );
+ }
+}
+
+TestDoc.Result = function(verdict, message) {
+ this.verdict = verdict;
+ this.message = message;
+}
+
+TestDoc.Result.prototype.toString = function() {
+ if (typeof this.verdict == "boolean") {
+ return (this.verdict? "ok" : "not ok") + " " + (++TestDoc.report.counter) + " - " + this.message;
+ }
+
+ return "# " + this.message;
+}
+
+TestDoc.requires = function(file) {
+ if (!TestDoc.requires.loaded[file]) {
+ load(file);
+ TestDoc.requires.loaded[file] = true;
+ }
+}
+TestDoc.requires.loaded = {};
+
+TestDoc.report = function() {
+ TestDoc.report.counter = 0;
+ print("1.."+TestDoc.plans);
+ for (var i = 0; i < TestDoc.results.length; i++) {
+ print(TestDoc.results[i]);
+ }
+ print("----------------------------------------");
+ if (TestDoc.fails == 0 && TestDoc.passes == TestDoc.plans) {
+ print("All tests successful.");
+ }
+ else {
+ print("Failed " + TestDoc.fails + "/" + TestDoc.plans + " tests, "+((TestDoc.plans == 0)? 0 : Math.round(TestDoc.passes/(TestDoc.passes+TestDoc.fails)*10000)/100)+"% okay. Planned to run "+TestDoc.plans+", did run "+(TestDoc.passes+TestDoc.fails)+".")
+ }
+}
+
+TestDoc.plan = function(n, message) {
+ TestDoc.plans += n;
+ TestDoc.record(new TestDoc.Result(null, message+" ("+n+" tests)"));
+}
+
+TestDoc.assertEquals = function(a, b, message) {
+ var result = (a == b);
+ if (!result) message += "\n#\n# " + a + " does not equal " + b + "\n#";
+ TestDoc.record(new TestDoc.Result(result, message));
+}
+
+TestDoc.assertNotEquals = function(a, b, message) {
+ var result = (a != b);
+ if (!result) message += "\n#\n# " + a + " equals " + b + "\n#";
+ TestDoc.record(new TestDoc.Result(result, message));
+}
+
+TestDoc.readFile = (function(){
+ // rhino
+ if (typeof readFile == "function") {
+ return function(url) {
+ var text = readFile(url);
+ return text || "";
+ }
+ }
+
+ // a web browser
+ else {
+ return function(url) {
+ var httpRequest;
+
+ if (window.XMLHttpRequest) { // Mozilla, Safari, etc
+ httpRequest = new XMLHttpRequest();
+ }
+ else if (window.ActiveXObject) { // IE
+ try {
+ httpRequest = new ActiveXObject("Msxml2.XMLHTTP");
+ }
+ catch (e) {
+ try {
+ httpRequest = new ActiveXObject("Microsoft.XMLHTTP");
+ }
+ catch (e) {
+ }
+ }
+ }
+
+ if (!httpRequest) { throw "Cannot create HTTP Request."; }
+
+ httpRequest.open('GET', url, false);
+ httpRequest.send('');
+ if (httpRequest.readyState == 4) {
+ if (httpRequest.status >= 400) {
+ throw "The HTTP Request returned an error code: "+httpRequest.status;
+ }
+ }
+
+ return httpRequest.responseText || "";
+ }
+ }
+})();
Index: /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/t/runner.js
===================================================================
--- /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/t/runner.js (revision 4056)
+++ /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/t/runner.js (revision 4056)
@@ -0,0 +1,13 @@
+// try: java -jar ../../jsrun.jar runner.js
+
+load("TestDoc.js");
+
+TestDoc.prove("../frame/Opt.js");
+TestDoc.prove("../lib/JSDOC.js");
+TestDoc.prove("../frame/String.js");
+TestDoc.prove("../lib/JSDOC/DocTag.js");
+TestDoc.prove("../lib/JSDOC/DocComment.js");
+TestDoc.prove("../lib/JSDOC/TokenReader.js");
+TestDoc.prove("../lib/JSDOC/Symbol.js");
+
+TestDoc.report();
Index: /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/test.js
===================================================================
--- /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/test.js (revision 4056)
+++ /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/test.js (revision 4056)
@@ -0,0 +1,304 @@
+load("app/frame/Dumper.js");
+function symbolize(opt) {
+ symbols = null;
+ jsdoc = new JSDOC.JsDoc(opt);
+ symbols = jsdoc.symbolSet;
+}
+
+
+var testCases = [
+ function() {
+ symbolize({a:true, p:true, _: [SYS.pwd+"test/overview.js"]});
+ //print(Dumper.dump(symbols));
+ is('symbols.getSymbolByName("My Cool Library").name', 'My Cool Library', 'File overview can be found by alias.');
+ }
+ ,
+ function() {
+ symbolize({_: [SYS.pwd+"test/name.js"]});
+
+ is('symbols.getSymbol("Response").name', "Response", 'Virtual class name is found.');
+ is('symbols.getSymbol("Response#text").alias', "Response#text", 'Virtual method name is found.');
+ is('symbols.getSymbol("Response#text").memberOf', "Response", 'Virtual method parent name is found.');
+ }
+ ,
+ function() {
+ symbolize({a:true, p:true, _: [SYS.pwd+"test/prototype.js"]});
+
+ is('symbols.getSymbol("Article").name', "Article", 'Function set to constructor prototype with inner constructor name is found.');
+ is('symbols.getSymbol("Article").hasMethod("init")', true, 'The initializer method name of prototype function is correct.');
+ is('symbols.getSymbol("Article").hasMember("counter")', true, 'A static property set in the prototype definition is found.');
+ is('symbols.getSymbol("Article").hasMember("title")', true, 'An instance property set in the prototype is found.');
+ is('symbols.getSymbol("Article#title").isStatic', false, 'An instance property has isStatic set to false.');
+ is('symbols.getSymbol("Article.counter").name', "counter", 'A static property set in the initializer has the name set correctly.');
+ is('symbols.getSymbol("Article.counter").memberOf', "Article", 'A static property set in the initializer has the memberOf set correctly.');
+ is('symbols.getSymbol("Article.counter").isStatic', true, 'A static property set in the initializer has isStatic set to true.');
+ }
+ ,
+ function() {
+ symbolize({a:true, _: [SYS.pwd+"test/prototype_oblit.js"]});
+
+ is('symbols.getSymbol("Article").name', "Article", 'Oblit set to constructor prototype name is found.');
+ is('typeof symbols.getSymbol("Article.prototype")', "undefined", 'The prototype oblit is not a symbol.');
+ is('symbols.getSymbol("Article#getTitle").name', "getTitle", 'The nonstatic method name of prototype oblit is correct.');
+ is('symbols.getSymbol("Article#getTitle").alias', "Article#getTitle", 'The alias of non-static method of prototype oblit is correct.');
+ is('symbols.getSymbol("Article#getTitle").isStatic', false, 'The isStatic of a nonstatic method of prototype oblit is correct.');
+ is('symbols.getSymbol("Article.getTitle").name', "getTitle", 'The static method name of prototype oblit is correct.');
+ is('symbols.getSymbol("Article.getTitle").isStatic', true, 'The isStatic of a static method of prototype oblit is correct.');
+ is('symbols.getSymbol("Article#getTitle").isa', "FUNCTION", 'The isa of non-static method of prototype oblit is correct.');
+ is('symbols.getSymbol("Article.getTitle").alias', "Article.getTitle", 'The alias of a static method of prototype oblit is correct.');
+ is('symbols.getSymbol("Article.getTitle").isa', "FUNCTION", 'The isa of static method of prototype oblit is correct.');
+ }
+ ,
+ function() {
+ symbolize({a:true, p:true, _: [SYS.pwd+"test/prototype_oblit_constructor.js"]});
+
+ is('symbols.getSymbol("Article").name', "Article", 'Oblit set to constructor prototype with inner constructor name is found.');
+ is('symbols.getSymbol("Article#init").name', "init", 'The initializer method name of prototype oblit is correct.');
+ is('symbols.getSymbol("Article").hasMember("pages")', true, 'Property set by initializer method "this" is on the outer constructor.');
+ is('symbols.getSymbol("Article#Title").name', "Title", 'Name of the inner constructor name is found.');
+ is('symbols.getSymbol("Article#Title").memberOf', "Article", 'The memberOf of the inner constructor name is found.');
+ is('symbols.getSymbol("Article#Title").isa', "CONSTRUCTOR", 'The isa of the inner constructor name is constructor.');
+ is('symbols.getSymbol("Article#Title").hasMember("title")', true, 'A property set on the inner constructor "this" is on the inner constructor.');
+ }
+ ,
+ function() {
+ symbolize({a:true, p:true, _: [SYS.pwd+"test/inner.js"]});
+
+ is('symbols.getSymbol("Outer").name', "Outer", 'Outer constructor prototype name is found.');
+ is('symbols.getSymbol("Outer").methods.length', 1, 'Inner function doesnt appear as a method of the outer.');
+ is('symbols.getSymbol("Outer").hasMethod("open")', true, 'Outer constructors methods arent affected by inner function.');
+ is('symbols.getSymbol("Outer-Inner").alias', "Outer-Inner", 'Alias of inner function is found.');
+ is('symbols.getSymbol("Outer-Inner").isa', "CONSTRUCTOR", 'isa of inner function constructor is found.');
+ is('symbols.getSymbol("Outer-Inner").memberOf', "Outer", 'The memberOf of inner function is found.');
+ is('symbols.getSymbol("Outer-Inner").name', "Inner", 'The name of inner function is found.');
+ is('symbols.getSymbol("Outer-Inner#name").name', "name", 'A member of the inner function constructor, attached to "this" is found on inner.');
+ is('symbols.getSymbol("Outer-Inner#name").memberOf', "Outer-Inner", 'The memberOf of an inner function member is found.');
+ }
+ ,
+ function() {
+ symbolize({a:true, _: [SYS.pwd+"test/prototype_nested.js"]});
+
+ is('symbols.getSymbol("Word").name', "Word", 'Base constructor name is found.');
+ is('symbols.getSymbol("Word").hasMethod("reverse")', true, 'Base constructor method is found.');
+ is('symbols.getSymbol("Word").methods.length', 1, 'Base constructor has only one method.');
+ is('symbols.getSymbol("Word").memberOf', "", 'Base constructor memberOf is empty.');
+ is('symbols.getSymbol("Word#reverse").name', "reverse", 'Member of constructor prototype name is found.');
+ is('symbols.getSymbol("Word#reverse").memberOf', "Word", 'Member of constructor prototype memberOf is found.');
+ is('symbols.getSymbol("Word#reverse.utf8").name', "utf8", 'Member of constructor prototype method name is found.');
+ is('symbols.getSymbol("Word#reverse.utf8").memberOf', "Word#reverse", 'Static nested member memberOf is found.');
+ }
+ ,
+ function() {
+ symbolize({a:true, _: [SYS.pwd+"test/namespace_nested.js"]});
+
+ is('symbols.getSymbol("ns1").name', "ns1", 'Base namespace name is found.');
+ is('symbols.getSymbol("ns1").memberOf', "", 'Base namespace memberOf is empty (its a constructor).');
+ is('symbols.getSymbol("ns1.ns2").name', "ns2", 'Nested namespace name is found.');
+ is('symbols.getSymbol("ns1.ns2").alias', "ns1.ns2", 'Nested namespace alias is found.');
+ is('symbols.getSymbol("ns1.ns2").memberOf', "ns1", 'Nested namespace memberOf is found.');
+ is('symbols.getSymbol("ns1.ns2.Function1").name', "Function1", 'Method of nested namespace name is found.');
+ is('symbols.getSymbol("ns1.ns2.Function1").memberOf', "ns1.ns2", 'Constructor of nested namespace memberOf is found.');
+ }
+ ,
+ function() {
+ symbolize({a:true, p:true, _: [SYS.pwd+"test/functions_nested.js"]});
+
+ is('symbols.getSymbol("Zop").name', "Zop", 'Any constructor name is found.');
+ is('symbols.getSymbol("Zop").isa', "CONSTRUCTOR", 'It isa constructor.');
+ is('symbols.getSymbol("Zop").hasMethod("zap")', true, 'Its method name, set later, is in methods array.');
+ is('symbols.getSymbol("Foo").name', "Foo", 'The containing constructor name is found.');
+ is('symbols.getSymbol("Foo").hasMethod("methodOne")', true, 'Its method name is found.');
+ is('symbols.getSymbol("Foo").hasMethod("methodTwo")', true, 'Its second method name is found.');
+ is('symbols.getSymbol("Foo#methodOne").alias', "Foo#methodOne", 'A methods alias is found.');
+ is('symbols.getSymbol("Foo#methodOne").isStatic', false, 'A methods is not static.');
+ is('symbols.getSymbol("Bar").name', "Bar", 'A global function declared inside another function is found.');
+ is('symbols.getSymbol("Bar").isa', "FUNCTION", 'It isa function.');
+ is('symbols.getSymbol("Bar").memberOf', "_global_", 'It is global.');
+ is('symbols.getSymbol("Foo-inner").name', "inner", 'An inner functions name is found.');
+ is('symbols.getSymbol("Foo-inner").memberOf', "Foo", 'It is member of the outer function.');
+ is('symbols.getSymbol("Foo-inner").isInner', true, 'It is an inner function.');
+ }
+ ,
+ function() {
+ symbolize({a:true, _: [SYS.pwd+"test/memberof_constructor.js"]});
+
+ is('symbols.getSymbol("Circle#Tangent").name', "Tangent", 'Constructor set on prototype using @member has correct name.');
+ is('symbols.getSymbol("Circle#Tangent").memberOf', "Circle", 'Constructor set on prototype using @member has correct memberOf.');
+ is('symbols.getSymbol("Circle#Tangent").alias', "Circle#Tangent", 'Constructor set on prototype using @member has correct alias.');
+ is('symbols.getSymbol("Circle#Tangent").isa', "CONSTRUCTOR", 'Constructor set on prototype using @member has correct isa.');
+ is('symbols.getSymbol("Circle#Tangent").isStatic', false, 'Constructor set on prototype using @member is not static.');
+ is('symbols.getSymbol("Circle#Tangent#getDiameter").name', "getDiameter", 'Method set on prototype using @member has correct name.');
+ is('symbols.getSymbol("Circle#Tangent#getDiameter").memberOf', "Circle#Tangent", 'Method set on prototype using @member has correct memberOf.');
+ is('symbols.getSymbol("Circle#Tangent#getDiameter").alias', "Circle#Tangent#getDiameter", 'Method set on prototype using @member has correct alias.');
+ is('symbols.getSymbol("Circle#Tangent#getDiameter").isa', "FUNCTION", 'Method set on prototype using @member has correct isa.');
+ is('symbols.getSymbol("Circle#Tangent#getDiameter").isStatic', false, 'Method set on prototype using @member is not static.');
+ }
+ ,
+ function() {
+ symbolize({a:true, p: true, _: [SYS.pwd+"test/memberof.js"]});
+
+ is('symbols.getSymbol("pack.install").alias', "pack.install", 'Using @memberOf sets alias, when parent name is in memberOf tag.');
+ is('symbols.getSymbol("pack.install.overwrite").name', "install.overwrite", 'Using @memberOf sets name, even if the name is dotted.');
+ is('symbols.getSymbol("pack.install.overwrite").memberOf', "pack", 'Using @memberOf sets memberOf.');
+ is('symbols.getSymbol("pack.install.overwrite").isStatic', true, 'Using @memberOf with value not ending in octothorp sets isStatic to true.');
+ }
+ ,
+ function() {
+ symbolize({a:true, p:true, _: [SYS.pwd+"test/borrows.js"]});
+
+ is('symbols.getSymbol("Layout").name', "Layout", 'Constructor can be found.');
+ is('symbols.getSymbol("Layout").hasMethod("init")', true, 'Constructor method name can be found.');
+ is('symbols.getSymbol("Layout").hasMember("orientation")', true, 'Constructor property name can be found.');
+
+ is('symbols.getSymbol("Page").hasMethod("reset")', true, 'Second constructor method name can be found.');
+ is('symbols.getSymbol("Page").hasMember("orientation")', true, 'Second constructor borrowed property name can be found in properties.');
+ is('symbols.getSymbol("Page#orientation").memberOf', "Page", 'Second constructor borrowed property memberOf can be found.');
+ is('symbols.getSymbol("Page").hasMethod("myGetInnerElements")', true, 'Can borrow an inner function, add it as a static function.');
+
+ is('symbols.getSymbol("ThreeColumnPage#init").alias', "ThreeColumnPage#init", 'Third constructor method can be found even though method with same name is borrowed.');
+ is('symbols.getSymbol("ThreeColumnPage#reset").alias', "ThreeColumnPage#reset", 'Borrowed method can be found.');
+ is('symbols.getSymbol("ThreeColumnPage#orientation").alias', "ThreeColumnPage#orientation", 'Twice borrowed method can be found.');
+
+ }
+ ,
+ function() {
+ symbolize({a:true, p:true, _: [SYS.pwd+"test/borrows2.js"]});
+
+ is('symbols.getSymbol("Foo").hasMethod("my_zop")', true, 'Borrowed method can be found.');
+ is('symbols.getSymbol("Bar").hasMethod("my_zip")', true, 'Second borrowed method can be found.');
+ }
+ ,
+ function() {
+ symbolize({a:true, p:true, _: [SYS.pwd+"test/constructs.js"]});
+
+ is('symbols.getSymbol("Person").hasMethod("say")', true, 'The constructs tag creates a class that lends can add a method to.');
+ }
+ ,
+ function() {
+ symbolize({a: true, _: [SYS.pwd+"test/augments.js", SYS.pwd+"test/augments2.js"]});
+
+ is('symbols.getSymbol("Page").augments[0]', "Layout", 'An augmented class can be found.');
+ is('symbols.getSymbol("Page#reset").alias', "Page#reset", 'Method of augmenter can be found.');
+ is('symbols.getSymbol("Page").hasMethod("Layout#init")', true, 'Method from augmented can be found.');
+ is('symbols.getSymbol("Page").hasMember("Layout#orientation")', true, 'Property from augmented can be found.');
+ is('symbols.getSymbol("Page").methods.length', 3, 'Methods of augmented class are included in methods array.');
+
+ is('symbols.getSymbol("ThreeColumnPage").augments[0]', "Page", 'The extends tag is a synonym for augments.');
+ is('symbols.getSymbol("ThreeColumnPage").hasMethod("ThreeColumnPage#init")', true, 'Local method overrides augmented method of same name.');
+ is('symbols.getSymbol("ThreeColumnPage").methods.length', 3, 'Local method count is right.');
+
+ is('symbols.getSymbol("NewsletterPage").augments[0]', "ThreeColumnPage", 'Can augment across file boundaries.');
+ is('symbols.getSymbol("NewsletterPage").augments.length', 2, 'Multiple augments are supported.');
+ is('symbols.getSymbol("NewsletterPage").inherits[0].alias', "Junkmail#annoy", 'Inherited method with augments.');
+ is('symbols.getSymbol("NewsletterPage").methods.length', 6, 'Methods of augmented class are included in methods array across files.');
+ is('symbols.getSymbol("NewsletterPage").properties.length', 1, 'Properties of augmented class are included in properties array across files.');
+ }
+ ,
+ function() {
+ symbolize({a:true, _: [SYS.pwd+"test/static_this.js"]});
+
+ is('symbols.getSymbol("box.holder").name', "holder", 'Static namespace name can be found.');
+ is('symbols.getSymbol("box.holder.foo").name', "foo", 'Static namespace method name can be found.');
+ is('symbols.getSymbol("box.holder").isStatic', true, 'Static namespace method is static.');
+
+ is('symbols.getSymbol("box.holder.counter").name', "counter", 'Instance namespace property name set on "this" can be found.');
+ is('symbols.getSymbol("box.holder.counter").alias', "box.holder.counter", 'Instance namespace property alias set on "this" can be found.');
+ is('symbols.getSymbol("box.holder.counter").memberOf', "box.holder", 'Static namespace property memberOf set on "this" can be found.');
+ }
+ ,
+ function() {
+ symbolize({a:true, p: true, _: [SYS.pwd+"test/lend.js"]});
+
+ is('symbols.getSymbol("Person").name', "Person", 'Class defined in lend comment is found.');
+ is('symbols.getSymbol("Person").hasMethod("initialize")', true, 'Lent instance method name can be found.');
+ is('symbols.getSymbol("Person").hasMethod("say")', true, 'Second instance method can be found.');
+ is('symbols.getSymbol("Person#sing").isStatic', false, 'Instance method is known to be not static.');
+
+ is('symbols.getSymbol("Person.getCount").name', "getCount", 'Static method name from second lend comment can be found.');
+ is('symbols.getSymbol("Person.getCount").isStatic', true, 'Static method from second lend comment is known to be static.');
+
+ is('LOG.warnings.filter(function($){if($.indexOf("notok") > -1) return $}).length', 1, 'A warning is emitted when lending to an undocumented parent.');
+ }
+ ,
+ function() {
+ symbolize({a:true, _: [SYS.pwd+"test/param_inline.js"]});
+
+ is('symbols.getSymbol("Layout").params[0].type', "int", 'Inline param name is set.');
+ is('symbols.getSymbol("Layout").params[0].desc', "The number of columns.", 'Inline param desc is set from comment.');
+ is('symbols.getSymbol("Layout#getElement").params[0].name', "id", 'User defined param documentation takes precedence over parser defined.');
+ is('symbols.getSymbol("Layout#getElement").params[0].isOptional', true, 'Default for param is to not be optional.');
+ is('symbols.getSymbol("Layout#getElement").params[1].isOptional', false, 'Can mark a param as being optional.');
+ is('symbols.getSymbol("Layout#getElement").params[1].type', "number|string", 'Type of inline param doc can have multiple values.');
+ is('symbols.getSymbol("Layout#Canvas").params[0].type', "", 'Type can be not defined for some params.');
+ is('symbols.getSymbol("Layout#Canvas").params[2].type', "int", 'Type can be defined inline for only some params.');
+ is('symbols.getSymbol("Layout#rotate").params.length', 0, 'Docomments inside function sig is ignored without a param.');
+ is('symbols.getSymbol("Layout#init").params[2].type', "zoppler", 'Doc comment type overrides inline type for param with same name.');
+ }
+ ,
+ function() {
+ symbolize({a: true, _: [SYS.pwd+"test/shared.js", SYS.pwd+"test/shared2.js"]});
+
+ is('symbols.getSymbol("Array#some").name', 'some', 'The name of a symbol in a shared section is found.');
+ is('symbols.getSymbol("Array#some").alias', 'Array#some', 'The alias of a symbol in a shared section is found.');
+ is('symbols.getSymbol("Array#some").desc', "Extension to builtin array.", 'A description can be shared.');
+ is('symbols.getSymbol("Array#filter").desc', "Extension to builtin array.\nChange every element of an array.", 'A shared description is appended.');
+ is('symbols.getSymbol("Queue").desc', "A first in, first out data structure.", 'A description is not shared when outside a shared section.');
+ is('symbols.getSymbol("Queue.rewind").alias', "Queue.rewind", 'Second shared tag can be started.');
+ is('symbols.getSymbol("startOver").alias', "startOver", 'Shared tag doesnt cross over files.');
+ }
+ ,
+ function() {
+ symbolize({a: true, _: [SYS.pwd+"test/config.js"]});
+ is('symbols.getSymbol("Contact").params[0].name', 'person', 'The name of a param is found.');
+ is('symbols.getSymbol("Contact").params[1].name', 'person.name', 'The name of a param set with a dot name is found.');
+ is('symbols.getSymbol("Contact").params[2].name', 'person.age', 'The name of a param set with a dot name is found.');
+ is('symbols.getSymbol("Contact").params[4].name', 'connection', 'The name of a param after config is found.');
+
+ is('symbols.getSymbol("Family").params[0].name', 'persons', 'Another name of a param is found.');
+ is('symbols.getSymbol("Family").params[1].name', 'persons.Father', 'The name of a param+config is found.');
+ is('symbols.getSymbol("Family").params[2].name', 'persons.Mother', 'The name of a second param+config is found.');
+ is('symbols.getSymbol("Family").params[3].name', 'persons.Children', 'The name of a third param+config is found.');
+
+ }
+ ,
+ function() {
+ symbolize({a:true, p:true, _: [SYS.pwd+"test/ignore.js"]});
+ is('LOG.warnings.filter(function($){if($.indexOf("undocumented symbol Ignored") > -1) return $}).length', 1, 'A warning is emitted when documenting members of an ignored parent.');
+
+ }
+ ,
+ function() {
+ symbolize({a:true, p:true, _: [SYS.pwd+"test/functions_anon.js"]});
+ is('symbols.getSymbol("a.b").alias', 'a.b', 'In anonymous constructor this is found to be the container object.');
+ is('symbols.getSymbol("a.f").alias', 'a.f', 'In anonymous constructor this can have a method.');
+ is('symbols.getSymbol("a.c").alias', 'a.c', 'In anonymous constructor method this is found to be the container object.');
+ is('symbols.getSymbol("g").alias', 'g', 'In anonymous function executed inline this is the global.');
+ is('symbols.getSymbol("bar2.p").alias', 'bar2.p', 'In named constructor executed inline this is the container object.');
+ is('symbols.getSymbol("module.pub").alias', 'module.pub', 'In parenthesized anonymous function executed inline function scoped variables arent documented.');
+
+ }
+ ,
+ function() {
+ symbolize({a:true, p:true, _: [SYS.pwd+"test/oblit_anon.js"]});
+ is('symbols.getSymbol("opt").name', 'opt', 'Anonymous object properties are assigned to $anonymous.');
+ is('symbols.getSymbol("opt.conf.keep").alias', 'opt.conf.keep', 'Anonymous object properties are assigned to $anonymous.');
+ is('symbols.getSymbol("opt.conf.base").alias', 'opt.conf.base', 'Anonymous object properties are assigned to $anonymous.');
+
+ }
+ ,
+ function() {
+ symbolize({a:true, p:true, _: [SYS.pwd+"test/params_optional.js"]});
+ is('symbols.getSymbol("Document").params.length', 3, 'Correct number of params are found when optional param syntax is used.');
+ is('symbols.getSymbol("Document").params[1].name', "id", 'Name of optional param is found.');
+ is('symbols.getSymbol("Document").params[1].isOptional', true, 'Optional param is marked isOptional.');
+ is('symbols.getSymbol("Document").params[2].name', "title", 'Name of optional param with default value is found.');
+ is('symbols.getSymbol("Document").params[2].isOptional', true, 'Optional param with default value is marked isOptional.');
+ is('symbols.getSymbol("Document").params[2].defaultValue', " This is untitled.", 'Optional param default value is found.');
+
+
+ }
+];
+
+
+//// run and print results
+print(testrun(testCases));
Index: /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/test/addon.js
===================================================================
--- /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/test/addon.js (revision 4056)
+++ /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/test/addon.js (revision 4056)
@@ -0,0 +1,24 @@
+String.prototype.reverse = function() {
+}
+
+String.prototype.reverse.utf8 = function() {
+}
+
+Function.count = function() {
+}
+
+/** @memberOf Function */
+Function.count.reset = function() {
+}
+
+/** @memberOf Function */
+count.getValue = function() {
+}
+
+/** @memberOf Function.prototype */
+getSig = function() {
+}
+
+/** @memberOf Function.prototype */
+Function.prototype.getProps = function() {
+}
Index: /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/test/anon_inner.js
===================================================================
--- /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/test/anon_inner.js (revision 4056)
+++ /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/test/anon_inner.js (revision 4056)
@@ -0,0 +1,14 @@
+/**
+ * @name bar
+ * @namespace
+ */
+
+new function() {
+ /**
+ * @name bar-foo
+ * @function
+ * @param {number} x
+ */
+ function foo(x) {
+ }
+}
Index: /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/test/augments.js
===================================================================
--- /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/test/augments.js (revision 4056)
+++ /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/test/augments.js (revision 4056)
@@ -0,0 +1,31 @@
+/**
+@constructor
+*/
+function Layout(p) {
+ this.init = function(p) {
+ }
+
+ this.getId = function() {
+ }
+
+ /** @type Page */
+ this.orientation = "landscape";
+}
+
+/**
+@constructor
+@augments Layout
+*/
+function Page() {
+ this.reset = function(b) {
+ }
+}
+
+/**
+@extends Page
+@constructor
+*/
+function ThreeColumnPage() {
+ this.init = function(resetCode) {
+ }
+}
Index: /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/test/augments2.js
===================================================================
--- /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/test/augments2.js (revision 4056)
+++ /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/test/augments2.js (revision 4056)
@@ -0,0 +1,26 @@
+/**
+@constructor
+*/
+function LibraryItem() {
+ this.reserve = function() {
+ }
+}
+
+/**
+@constructor
+*/
+function Junkmail() {
+ this.annoy = function() {
+ }
+}
+
+/**
+@inherits Junkmail.prototype.annoy as pester
+@augments ThreeColumnPage
+@augments LibraryItem
+@constructor
+*/
+function NewsletterPage() {
+ this.getHeadline = function() {
+ }
+}
Index: /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/test/borrows.js
===================================================================
--- /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/test/borrows.js (revision 4056)
+++ /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/test/borrows.js (revision 4056)
@@ -0,0 +1,41 @@
+/**
+@constructor
+*/
+function Layout(p) {
+ /** initilize 1 */
+ this.init = function(p) {
+ }
+
+ /** get the id */
+ this.getId = function() {
+ }
+
+ /** @type string */
+ this.orientation = "landscape";
+
+ function getInnerElements(elementSecretId){
+ }
+}
+
+/**
+@constructor
+@borrows Layout#orientation as #orientation
+@borrows Layout-getInnerElements as myGetInnerElements
+*/
+function Page() {
+ /** reset the page */
+ this.reset = function(b) {
+ }
+}
+
+/**
+@constructor
+@borrows Layout.prototype.orientation as this.orientation
+@borrows Layout.prototype.init as #init
+@inherits Page.prototype.reset as #reset
+*/
+function ThreeColumnPage() {
+ /** initilize 2 */
+ this.init = function(p) {
+ }
+}
Index: /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/test/borrows2.js
===================================================================
--- /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/test/borrows2.js (revision 4056)
+++ /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/test/borrows2.js (revision 4056)
@@ -0,0 +1,23 @@
+// testing circular borrows
+
+/**
+ @class
+ @borrows Bar#zop as this.my_zop
+*/
+function Foo() {
+ /** this is a zip. */
+ this.zip = function() {}
+
+ this.my_zop = new Bar().zop;
+}
+
+/**
+ @class
+ @borrows Foo#zip as this.my_zip
+*/
+function Bar() {
+ /** this is a zop. */
+ this.zop = function() {}
+
+ this.my_zip = new Foo().zip;
+}
Index: /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/test/config.js
===================================================================
--- /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/test/config.js (revision 4056)
+++ /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/test/config.js (revision 4056)
@@ -0,0 +1,22 @@
+/**
+ * @constructor
+ * @param person The person.
+ * @param {string} person.name The person's name.
+ * @config {integer} age The person's age.
+ * @config [id=1] Optional id number to use.
+ * @param connection
+ */
+function Contact(person, connection) {
+
+}
+
+/**
+ * @constructor
+ * @param persons
+ * @config {string} Father The paternal person.
+ * @config {string} Mother The maternal person.
+ * @config {string[]} Children And the rest.
+ */
+function Family(/**Object*/persons) {
+
+}
Index: /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/test/constructs.js
===================================================================
--- /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/test/constructs.js (revision 4056)
+++ /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/test/constructs.js (revision 4056)
@@ -0,0 +1,18 @@
+var Person = makeClass(
+ /**
+ @scope Person
+ */
+ {
+ /**
+ This is just another way to define a constructor.
+ @constructs
+ @param {string} name The name of the person.
+ */
+ initialize: function(name) {
+ this.name = name;
+ },
+ say: function(message) {
+ return this.name + " says: " + message;
+ }
+ }
+);
Index: /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/test/encoding.js
===================================================================
--- /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/test/encoding.js (revision 4056)
+++ /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/test/encoding.js (revision 4056)
@@ -0,0 +1,10 @@
+
+/**
+ * @Constructor
+ * @desc 配置文件
+ * @class 什么也不返回
+ */
+function Test(conf) {
+ // do something;
+}
+
Index: /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/test/encoding_other.js
===================================================================
--- /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/test/encoding_other.js (revision 4056)
+++ /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/test/encoding_other.js (revision 4056)
@@ -0,0 +1,12 @@
+
+/**
+ * @Constructor
+ * @desc ðïîÛ
+ * @class ßàáâãäåæçèçìëêíîï °±²³´µ¡¶·¸¹
+ */
+function Test(conf) {
+ // do something;
+}
+
+// run with commanline option -e=iso-8859-5
+
Index: /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/test/functions_anon.js
===================================================================
--- /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/test/functions_anon.js (revision 4056)
+++ /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/test/functions_anon.js (revision 4056)
@@ -0,0 +1,39 @@
+/** an anonymous constructor executed inline */
+a = new function() {
+ /** a.b*/
+ this.b = 1;
+ /** a.f */
+ this.f = function() {
+ /** a.c */
+ this.c = 2;
+ }
+}
+
+
+/**
+ named function executed inline
+*/
+bar1 = function Zoola1() {
+ /** property of global */
+ this.g = 1;
+}();
+
+/**
+ named constructor executed inline
+*/
+bar2 = new function Zoola2() {
+ /** property of bar */
+ this.p = 1;
+};
+
+/** module pattern */
+module = (function () {
+ /** won't appear in documentation */
+ var priv = 1;
+
+ /** @scope module */
+ return {
+ /** will appear as a property of module */
+ pub: 1
+ }
+})();
Index: /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/test/functions_nested.js
===================================================================
--- /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/test/functions_nested.js (revision 4056)
+++ /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/test/functions_nested.js (revision 4056)
@@ -0,0 +1,33 @@
+/** @constructor */
+function Zop() {
+}
+
+/**
+ @class
+*/
+Foo = function(id) {
+ // this is a bit twisted, but if you call Foo() you will then
+ // modify Foo(). This is kinda, sorta non-insane, because you
+ // would have to call Foo() 100% of the time to use Foo's methods
+ Foo.prototype.methodOne = function(bar) {
+ alert(bar);
+ };
+
+ // same again
+ Foo.prototype.methodTwo = function(bar2) {
+ alert(bar2);
+ };
+
+ // and these are only executed if the enclosing function is actually called
+ // and who knows if that will ever happen?
+ Bar = function(pez) {
+ alert(pez);
+ };
+ Zop.prototype.zap = function(p){
+ alert(p);
+ };
+
+ // but this is only visible inside Foo
+ function inner() {
+ }
+};
Index: /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/test/global.js
===================================================================
--- /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/test/global.js (revision 4056)
+++ /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/test/global.js (revision 4056)
@@ -0,0 +1,13 @@
+/** ecks */
+var x = [1, 2, 4];
+
+var y = {
+ foo: function(){
+ }
+}
+
+bar = function() {
+}
+
+function zop() {
+}
Index: /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/test/globals.js
===================================================================
--- /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/test/globals.js (revision 4056)
+++ /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/test/globals.js (revision 4056)
@@ -0,0 +1,25 @@
+function example(/**Circle*/a, b) {
+ /** a global defined in function */
+ var number = a;
+
+ var hideNumber = function(){
+ }
+
+ setNumber = function(){
+ }
+ alert('You have chosen: ' + b);
+}
+
+function initPage() {
+ var supported = document.createElement && document.getElementsByTagName;
+ if (!supported) return;
+ // start of DOM script
+ var x = document.getElementById('writeroot');
+ // etc.
+}
+
+/** an example var */
+var document = new Document(x, y);
+
+var getNumber = function(){
+}
Index: /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/test/ignore.js
===================================================================
--- /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/test/ignore.js (revision 4056)
+++ /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/test/ignore.js (revision 4056)
@@ -0,0 +1,10 @@
+/**
+ * A test constructor.
+ * @constructor
+ * @ignore
+ */
+function Ignored() {
+ /** a method */
+ this.bar = function() {
+ }
+}
Index: /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/test/inner.js
===================================================================
--- /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/test/inner.js (revision 4056)
+++ /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/test/inner.js (revision 4056)
@@ -0,0 +1,16 @@
+/**
+ * @constructor
+ */
+function Outer() {
+ /**
+ * @constructor
+ */
+ function Inner(name) {
+ /** The name of this. */
+ this.name = name;
+ }
+
+ this.open = function(name) {
+ return (new Inner(name));
+ }
+}
Index: /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/test/jsdoc_test.js
===================================================================
--- /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/test/jsdoc_test.js (revision 4056)
+++ /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/test/jsdoc_test.js (revision 4056)
@@ -0,0 +1,477 @@
+/**
+ * @fileoverview This file is to be used for testing the JSDoc parser
+ * It is not intended to be an example of good JavaScript OO-programming,
+ * nor is it intended to fulfill any specific purpose apart from
+ * demonstrating the functionality of the
+ * JSDoc parser
+ *
+ * @author Gabriel Reid gab_reid@users.sourceforge.net
+ * @version 0.1
+ */
+
+
+/**
+ * Construct a new Shape object.
+ * @class This is the basic Shape class.
+ * It can be considered an abstract class, even though no such thing
+ * really existing in JavaScript
+ * @constructor
+ * @throws MemoryException if there is no more memory
+ * @throws GeneralShapeException rarely (if ever)
+ * @return {Shape|Coordinate} A new shape.
+ */
+function Shape(){
+
+ /**
+ * This is an example of a function that is not given as a property
+ * of a prototype, but instead it is assigned within a constructor.
+ * For inner functions like this to be picked up by the parser, the
+ * function that acts as a constructor must be denoted with
+ * the @constructor tag in its comment.
+ * @type String
+ */
+ this.getClassName = function(){
+ return "Shape";
+ }
+
+ /**
+ * This is an inner method, just used here as an example
+ * @since version 0.5
+ * @author Sue Smart
+ */
+ function addReference(){
+ // Do nothing...
+ }
+
+}
+
+/**
+ * Create a new Hexagon instance.
+ * @extends Shape
+ * @class Hexagon is a class that is a logical sublcass of
+ * {@link Shape} (thanks to the @extends tag), but in
+ * reality it is completely unrelated to Shape.
+ * @param {int} sideLength The length of one side for the new Hexagon
+ * @example
+ * var h = new Hexagon(2);
+ * @example
+ * if (hasHex) {
+ * hex = new Hexagon(5);
+ * color = hex.getColor();
+ * }
+ */
+function Hexagon(sideLength) {
+}
+
+
+/**
+ * This is an unattached (static) function that adds two integers together.
+ * @param {int} One The first number to add
+ * @param {int} Two The second number to add
+ * @author Gabriel Reid
+ * @deprecated So you shouldn't use it anymore!
+ */
+function Add(One, Two){
+ return One + Two;
+}
+
+
+/**
+ * The color of this shape
+ * @type Color
+ */
+Shape.prototype.color = null;
+
+/**
+ * The border of this shape.
+ * @field
+ * @type int
+ */
+Shape.prototype.border = function(){return border;};
+
+/*
+ * These are all the instance method implementations for Shape
+ */
+
+/**
+ * Get the coordinates of this shape. It is assumed that we're always talking
+ * about shapes in a 2D location here.
+ * @requires The {@link Shape} class
+ * @returns A Coordinate object representing the location of this Shape
+ * @type Coordinate[]
+ */
+Shape.prototype.getCoords = function(){
+ return this.coords;
+}
+
+/**
+ * Get the color of this shape.
+ * @see #setColor
+ * @see The Color library.
+ * @link Shape
+ * @type Color
+ */
+Shape.prototype.getColor = function(){
+ return this.color;
+}
+
+/**
+ * Set the coordinates for this Shape
+ * @param {Coordinate} coordinates The coordinates to set for this Shape
+ */
+Shape.prototype.setCoords = function(coordinates){
+ this.coords = coordinates;
+}
+
+/**
+ * Set the color for this Shape
+ * @param {Color} color The color to set for this Shape
+ * @param other There is no other param, but it can still be documented if
+ * optional parameters are used
+ * @throws NonExistantColorException (no, not really!)
+ * @see #getColor
+ */
+Shape.prototype.setColor = function(color){
+ this.color = color;
+}
+
+/**
+ * Clone this shape
+ * @returns A copy of this shape
+ * @type Shape
+ * @author Gabriel Reid
+ */
+Shape.prototype.clone = function(){
+ return new Shape();
+}
+
+/**
+ * Create a new Rectangle instance.
+ * @class A basic rectangle class, inherits from Shape.
+ * This class could be considered a concrete implementation class
+ * @constructor
+ * @param {int} width The optional width for this Rectangle
+ * @param {int} height Thie optional height for this Rectangle
+ * @author Gabriel Reid
+ * @see Shape is the base class for this
+ * @augments Shape
+ * @hilited
+ */
+function Rectangle(width, // This is the width
+ height // This is the height
+ ){
+ if (width){
+ this.width = width;
+ if (height){
+ this.height = height;
+ }
+ }
+}
+
+
+/* Inherit from Shape */
+Rectangle.prototype = new Shape();
+
+/**
+ * Value to represent the width of the Rectangle.
+ * Text in bold and italic and a
+ * link to SourceForge
+ * @private
+ * @type int
+ */
+Rectangle.prototype.width = 0;
+
+/**
+ * Value to represent the height of the Rectangle
+ * @private
+ * @type int
+ */
+Rectangle.prototype.height = 0;
+
+/**
+ * Get the type of this object.
+ * @type String
+ */
+Rectangle.prototype.getClassName= function(){
+ return "Rectangle";
+}
+
+/**
+ * Get the value of the width for the Rectangle
+ * @type int
+ * @see Rectangle#setWidth
+ */
+Rectangle.prototype.getWidth = function(){
+ return this.width;
+}
+
+/**
+ * Get the value of the height for the Rectangle.
+ * Another getter is the {@link Shape#getColor} method in the
+ * {@link Shape} base class.
+ * @return The height of this Rectangle
+ * @type int
+ * @see Rectangle#setHeight
+ */
+Rectangle.prototype.getHeight = function(){
+ return this.height;
+}
+
+/**
+ * Set the width value for this Rectangle.
+ * @param {int} width The width value to be set
+ * @see #setWidth
+ */
+Rectangle.prototype.setWidth = function(width){
+ this.width = width;
+}
+
+/**
+ * Set the height value for this Rectangle.
+ * @param {int} height The height value to be set
+ * @see #getHeight
+ */
+Rectangle.prototype.setHeight = function(height){
+ this.height = height;
+}
+
+/**
+ * Get the value for the total area of this Rectangle
+ * @return total area of this Rectangle
+ * @type int
+ */
+Rectangle.prototype.getArea = function(){
+ return width * height;
+}
+
+
+/**
+ * Create a new Square instance.
+ * @class A Square is a subclass of {@link Rectangle}
+ * @param {int} width The optional width for this Rectangle
+ * @param {int} height The optional height for this Rectangle
+ * @augments Rectangle
+ */
+function Square(width, height){
+ if (width){
+ this.width = width;
+ if (height){
+ this.height = height;
+ }
+ }
+
+}
+
+/* Square is a subclass of Rectangle */
+Square.prototype = new Rectangle();
+
+/**
+ * Set the width value for this Shape.
+ * @param {int} width The width value to be set
+ * @see #getWidth
+ */
+Square.prototype.setWidth = function(width){
+ this.width = this.height = width;
+}
+
+/**
+ * Set the height value for this Shape
+ * Sets the {@link Rectangle#height} attribute in the Rectangle.
+ * @param {int} height The height value to be set
+ */
+Square.prototype.setHeight = function(height){
+ this.height = this.width = height;
+}
+
+
+/**
+ * Create a new Circle instance based on a radius.
+ * @class Circle class is another subclass of Shape
+ * @extends Shape
+ * @param {int} radius The optional radius of this {@link Circle }
+ * @mixin Square.prototype.setWidth as this.setDiameter
+ */
+function Circle(radius){
+ if (radius) {
+ /** The radius of the this Circle. */
+ this.radius = radius;
+ }
+}
+
+/* Circle inherits from {@link Shape} */
+Circle.prototype = new Shape();
+
+/**
+ * The radius value for this Circle
+ * @private
+ * @type int
+ */
+Circle.prototype.radius = 0;
+
+/**
+ * A very simple class (static) field that is also a constant
+ * @final
+ * @type float
+ */
+Circle.PI = 3.14;
+
+/**
+ * Get the radius value for this Circle
+ * @type int
+ * @see #setRadius
+ */
+Circle.prototype.getRadius = function(){
+ return this.radius;
+}
+
+/**
+ * Set the radius value for this Circle
+ * @param {int} radius The {@link Circle#radius} value to set
+ * @see #getRadius
+ */
+Circle.prototype.setRadius = function(radius){
+ this.radius = radius;
+}
+
+/**
+ * An example of a class (static) method that acts as a factory for Circle
+ * objects. Given a radius value, this method creates a new Circle.
+ * @param {int} radius The radius value to use for the new Circle.
+ * @type Circle
+ */
+Circle.createCircle = function(radius){
+ return new Circle(radius);
+}
+
+
+/**
+ * Create a new Coordinate instance based on x and y grid data.
+ * @class Coordinate is a class that can encapsulate location information.
+ * @param {int} [x=0] The optional x portion of the Coordinate
+ * @param {int} [y=0] The optinal y portion of the Coordinate
+ */
+function Coordinate(x, y){
+ if (x){
+ this.x = x;
+ if (y){
+ this.y = y;
+ }
+ }
+}
+
+/**
+ * The x portion of the Coordinate
+ * @type int
+ * @see #getX
+ * @see #setX
+ */
+Coordinate.prototype.x = 0;
+
+/**
+ * The y portion of the Coordinate
+ * @type int
+ * @see #getY
+ * @see #setY
+ */
+Coordinate.prototype.y = 0;
+
+/**
+ * Gets the x portion of the Coordinate.
+ * @type int
+ * @see #setX
+ */
+Coordinate.prototype.getX = function(){
+ return this.x;
+}
+
+/**
+ * Get the y portion of the Coordinate.
+ * @type int
+ * @see #setY
+ */
+Coordinate.prototype.getY = function(){
+ return this.y;
+}
+
+/**
+ * Sets the x portion of the Coordinate.
+ * @param {int} x The x value to set
+ * @see #getX
+ */
+Coordinate.prototype.setX = function(x){
+ this.x = x;
+}
+
+/**
+ * Sets the y portion of the Coordinate.
+ * @param {int} y The y value to set
+ * @see #getY
+ */
+Coordinate.prototype.setY = function(y){
+ this.y = y;
+}
+
+/**
+ * @class This class exists to demonstrate the assignment of a class prototype
+ * as an anonymous block.
+ */
+function ShapeFactory(){
+}
+
+ShapeFactory.prototype = {
+ /**
+ * Creates a new {@link Shape} instance.
+ * @return A new {@link Shape}
+ * @type Shape
+ */
+ createShape: function(){
+ return new Shape();
+ }
+}
+
+/**
+ * An example of a singleton class
+ * @param ... Arguments represent {@link coordinate}s in the shape.
+ * @constructor
+ */
+MySingletonShapeFactory = function(){
+
+ /**
+ * Get the next {@link Shape}
+ * @type Shape
+ * @return A new {@link Shape}
+ */
+ this.getShape = function(){
+ return null;
+ }
+
+}
+
+
+/**
+ * Create a new Foo instance.
+ * @class This is the Foo class. It exists to demonstrate 'nested' classes.
+ * @constructor
+ * @see Foo.Bar
+ */
+function Foo(){}
+
+/**
+ * Creates a new instance of Bar.
+ * @class This class exists to demonstrate 'nested' classes.
+ * @constructor
+ * @see Foo.Bar
+ */
+function Bar(){}
+
+/**
+ * Nested class
+ * @constructor
+ */
+Foo.Bar = function(){
+ /** The x. */ this.x = 2;
+}
+
+Foo.Bar.prototype = new Bar();
+/** The y. */
+Foo.Bar.prototype.y = '3';
Index: /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/test/lend.js
===================================================================
--- /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/test/lend.js (revision 4056)
+++ /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/test/lend.js (revision 4056)
@@ -0,0 +1,33 @@
+ /** @class */
+var Person = Class.create(
+ /**
+ @lends Person.prototype
+ */
+ {
+ initialize: function(name) {
+ this.name = name;
+ },
+ say: function(message) {
+ return this.name + ': ' + message;
+ }
+ }
+ );
+
+/** @lends Person.prototype */
+{
+ /** like say but more musical */
+ sing: function(song) {
+ }
+}
+
+/** @lends Person */
+{
+ getCount: function() {
+ }
+}
+
+/** @lends Unknown.prototype */
+{
+ notok: function() {
+ }
+}
Index: /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/test/memberof.js
===================================================================
--- /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/test/memberof.js (revision 4056)
+++ /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/test/memberof.js (revision 4056)
@@ -0,0 +1,20 @@
+/** @constructor */
+pack = function() {
+ this.init = function(){}
+ function config(){}
+}
+
+ pack.build = function(task) {};
+
+/** @memberOf pack */
+pack.install = function() {}
+
+/** @memberOf pack */
+pack.install.overwrite = function() {}
+
+/** @memberOf pack */
+clean = function() {}
+
+
+/** @memberOf pack-config */
+install = function() {};
Index: /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/test/memberof_constructor.js
===================================================================
--- /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/test/memberof_constructor.js (revision 4056)
+++ /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/test/memberof_constructor.js (revision 4056)
@@ -0,0 +1,15 @@
+/** @constructor */
+function Circle(){}
+
+/**
+ @constructor
+ @memberOf Circle.prototype
+ */
+Tangent = function(){};
+
+/**
+ @member Circle.prototype.Tangent.prototype
+*/
+getDiameter = function(){};
+
+
Index: /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/test/name.js
===================================================================
--- /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/test/name.js (revision 4056)
+++ /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/test/name.js (revision 4056)
@@ -0,0 +1,19 @@
+/**
+ @name Response
+ @class
+*/
+
+Response.prototype = {
+ /**
+ @name Response#text
+ @function
+ @description
+ Gets the body of the response as plain text
+ @returns {String}
+ Response as text
+ */
+
+ text: function() {
+ return this.nativeResponse.responseText;
+ }
+}
Index: /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/test/namespace_nested.js
===================================================================
--- /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/test/namespace_nested.js (revision 4056)
+++ /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/test/namespace_nested.js (revision 4056)
@@ -0,0 +1,23 @@
+/**
+ @namespace This is the first namespace.
+*/
+ns1 = {};
+
+/**
+ This is the second namespace.
+ @namespace
+*/
+ns1.ns2 = {};
+
+/**
+ This part of ns1.ns2
+ @constructor
+*/
+ns1.ns2.Function1 = function() {
+};
+
+ns1.staticFunction = function() {
+};
+
+/** A static field in a namespace. */
+ns1.ns2.staticField = 1;
Index: /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/test/nocode.js
===================================================================
--- /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/test/nocode.js (revision 4056)
+++ /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/test/nocode.js (revision 4056)
@@ -0,0 +1,13 @@
+/**#nocode+*/
+ /**
+ @name star
+ @function
+ */
+ function blahblah() {
+
+ }
+/**#nocode-*/
+
+function yaddayadda() {
+
+}
Index: /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/test/oblit_anon.js
===================================================================
--- /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/test/oblit_anon.js (revision 4056)
+++ /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/test/oblit_anon.js (revision 4056)
@@ -0,0 +1,20 @@
+/** the options */
+opt = Opt.get(
+ arguments,
+ {
+ d: "directory",
+ c: "conf",
+ "D[]": "define"
+ }
+);
+
+/** configuration */
+opt.conf = {
+ /** keep */
+ keep: true,
+ /** base */
+ base: getBase(this, {p: properties})
+}
+
+
+
Index: /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/test/overview.js
===================================================================
--- /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/test/overview.js (revision 4056)
+++ /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/test/overview.js (revision 4056)
@@ -0,0 +1,20 @@
+/**
+ * @overview This "library" contains a
+ * lot of classes and functions.
+ * @example
+
+ var x (x < 1);
+ alert("This 'is' \"code\"");
+
+ * @name My Cool Library
+ * @author Joe Smith jsmith@company.com
+ * @version 0.1
+ */
+
+/**
+ * Gets the current foo
+ * @param {String} fooId The unique identifier for the foo.
+ * @return {Object} Returns the current foo.
+ */
+function getFoo(fooID){
+}
Index: /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/test/param_inline.js
===================================================================
--- /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/test/param_inline.js (revision 4056)
+++ /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/test/param_inline.js (revision 4056)
@@ -0,0 +1,37 @@
+/**
+ @constructor
+ @param columns The number of columns.
+*/
+function Layout(/**int*/columns){
+ /**
+ @param [id] The id of the element.
+ @param elName The name of the element.
+ */
+ this.getElement = function(
+ /** string */ elName,
+ /** number|string */ id
+ ) {
+ };
+
+ /**
+ @constructor
+ */
+ this.Canvas = function(top, left, /**int*/width, height) {
+ /** Is it initiated yet? */
+ this.initiated = true;
+ }
+
+ this.rotate = function(/**nothing*/) {
+ }
+
+ /**
+ @param x
+ @param y
+ @param {zoppler} z*/
+ this.init = function(x, y, /**abbler*/z) {
+ /** The xyz. */
+ this.xyz = x+y+z;
+ this.getXyz = function() {
+ }
+ }
+}
Index: /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/test/params_optional.js
===================================================================
--- /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/test/params_optional.js (revision 4056)
+++ /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/test/params_optional.js (revision 4056)
@@ -0,0 +1,8 @@
+
+/**
+ * @param {Page[]} pages
+ * @param {number} [id] Specifies the id, if applicable.
+ * @param {String} [title = This is untitled.] Specifies the title.
+ */
+function Document(pages, id, title){
+}
Index: /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/test/prototype.js
===================================================================
--- /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/test/prototype.js (revision 4056)
+++ /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/test/prototype.js (revision 4056)
@@ -0,0 +1,17 @@
+/** @constructor */
+function Article() {
+}
+
+Article.prototype.init = function(title) {
+ /** the instance title */
+ this.title = title;
+
+ /** the static counter */
+ Article.counter = 1;
+}
+
+a = new Article();
+a.Init("my title");
+
+print(a.title);
+print(Article.counter);
Index: /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/test/prototype_nested.js
===================================================================
--- /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/test/prototype_nested.js (revision 4056)
+++ /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/test/prototype_nested.js (revision 4056)
@@ -0,0 +1,9 @@
+/** @constructor */
+function Word() {
+}
+
+Word.prototype.reverse = function() {
+}
+
+Word.prototype.reverse.utf8 = function() {
+}
Index: /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/test/prototype_oblit.js
===================================================================
--- /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/test/prototype_oblit.js (revision 4056)
+++ /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/test/prototype_oblit.js (revision 4056)
@@ -0,0 +1,13 @@
+/** @constructor */
+function Article() {
+}
+
+Article.prototype = {
+ /** instance get title */
+ getTitle: function(){
+ }
+}
+
+/** static get title */
+Article.getTitle = function(){
+}
Index: /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/test/prototype_oblit_constructor.js
===================================================================
--- /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/test/prototype_oblit_constructor.js (revision 4056)
+++ /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/test/prototype_oblit_constructor.js (revision 4056)
@@ -0,0 +1,24 @@
+/** @constructor */
+function Article() {
+}
+
+Article.prototype = {
+ /** @constructor */
+ Title: function(title) {
+ /** the value of the Title instance */
+ this.title = title;
+ },
+
+ init: function(pages) {
+ /** the value of the pages of the Article instance */
+ this.pages = pages;
+ }
+}
+
+f = new Article();
+f.init("one two three");
+
+t = new f.Title("my title");
+
+print(f.pages);
+print(t.title);
Index: /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/test/public.js
===================================================================
--- /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/test/public.js (revision 4056)
+++ /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/test/public.js (revision 4056)
@@ -0,0 +1,10 @@
+/**@constructor*/
+function Foo() {
+ /**
+ @public
+ @static
+ @field
+ */
+ var bar = function(x) {
+ }
+}
Index: /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/test/shared.js
===================================================================
--- /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/test/shared.js (revision 4056)
+++ /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/test/shared.js (revision 4056)
@@ -0,0 +1,42 @@
+
+/**
+ * Builtin object.
+ * @class
+ * @name Array
+ */
+
+/**#@+
+ * Extension to builtin array.
+ * @memberOf Array
+ * @method
+ */
+
+/**
+ * @returns Boolen if some array members...
+ */
+Array.prototype.some = function(){};
+
+/**
+ * Change every element of an array.
+ * @returns Filtered array copy.
+ */
+Array.prototype.filter = function(){};
+
+/**#@-*/
+
+
+/**
+ * A first in, first out data structure.
+ * @constructor
+ */
+Queue = function(){};
+
+/**#@+
+ * Extension to Queue.
+ * @memberOf Queue
+ */
+
+rewind = function(){
+}
+
+// should close automatically here.
Index: /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/test/shared2.js
===================================================================
--- /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/test/shared2.js (revision 4056)
+++ /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/test/shared2.js (revision 4056)
@@ -0,0 +1,2 @@
+startOver = function(){
+}
Index: /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/test/shortcuts.js
===================================================================
--- /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/test/shortcuts.js (revision 4056)
+++ /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/test/shortcuts.js (revision 4056)
@@ -0,0 +1,22 @@
+// /**#=+
+// * {
+// * 'D': 'Date.prototype',
+// * '$N': 'Number'
+// * }
+// */
+// var D = Date.prototype,
+// $N = Number;
+//
+// D.locale = function(){
+// };
+//
+// /**
+// @return {string} The cardinal number string.
+// */
+// $N.nth = function(n){
+// };
+//
+// LOAD.file = function(){
+// }
+//
+// /**#=-*/
Index: /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/test/static_this.js
===================================================================
--- /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/test/static_this.js (revision 4056)
+++ /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/test/static_this.js (revision 4056)
@@ -0,0 +1,13 @@
+/** the parent */
+var box = {};
+
+/** @namespace */
+box.holder = {}
+
+box.holder.foo = function() {
+ /** the counter */
+ this.counter = 1;
+}
+
+box.holder.foo();
+print(box.holder.counter);
Index: /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/test/synonyms.js
===================================================================
--- /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/test/synonyms.js (revision 4056)
+++ /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/test/synonyms.js (revision 4056)
@@ -0,0 +1,23 @@
+/**
+ @class
+ @inherits Bar#zop as #my_zop
+*/
+function Foo() {
+ /** this is a zip. */
+ this.zip = function() {}
+
+ /** from Bar */
+ this.my_zop = new Bar().zop;
+}
+
+/**
+ @class
+ @borrows Foo#zip as this.my_zip
+*/
+function Bar() {
+ /** this is a zop. */
+ this.zop = function() {}
+
+ /** from Foo */
+ this.my_zip = new Foo().zip;
+}
Index: /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/test/tosource.js
===================================================================
--- /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/test/tosource.js (revision 4056)
+++ /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/test/tosource.js (revision 4056)
@@ -0,0 +1,23 @@
+/**
+ * @param {Object} object
+ * @return {string}
+ */
+function valueOf(object) {}
+
+/**
+ * @param {Object} object
+ * @return {string}
+ */
+function toString(object) {}
+
+/**
+ * @param {Object} object
+ * @return {string}
+ */
+function toSource(object) {}
+
+/**
+ * @param {Object} object
+ * @return {string}
+ */
+function constructor(object) {}
Index: /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/test/variable_redefine.js
===================================================================
--- /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/test/variable_redefine.js (revision 4056)
+++ /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/app/test/variable_redefine.js (revision 4056)
@@ -0,0 +1,14 @@
+/** @constructor */
+function Foo() {
+ var bar = 1;
+ bar = 2; // redefining a private
+
+ this.baz = 1;
+ baz = 2; // global
+
+ /** a private */
+ var blap = {
+ /** in here */
+ tada: 1
+ }
+}
Index: /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/changes.txt
===================================================================
--- /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/changes.txt (revision 4056)
+++ /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/changes.txt (revision 4056)
@@ -0,0 +1,53 @@
+== 2.0.2 ==
+
+ * Fixed bug that sometimes caused an example of division in the source code to be interpretted as a regex by the JsDoc Toolkit analyzer. ( issue #158 )
+ * Fixed a bug that prevented private variables marked as @public from appearing in the documentation. ( issue #161 )
+ * Fixed bug that prevented variable names with underscored properties from appearing in summaries. ( issue #173 )
+
+== 2.0.1 ==
+
+ * Fixed bug that prevented @fileOverview tag from being recognized.
+ * Added support for @fieldOf as a synonym for @field plus @memberOf.
+ * Added support for @name tag in a @fileOverview comment to control the displayed name of the file.
+ * Added support for multiple @example tags. ( issue #152 )
+ * Modified style sheet of jsdoc template to make more readable. ( issue #151 )
+ * Fixed bug that prevented @since documentation from displaying correctly when it appeared in a class. ( issue #150 )
+ * Fixed bug that caused inhertited properties to sometimes not resolve correctly. ( issue #144 )
+ * Modified so that trailing whitespace in @example is always trimmed. ( issue #153 )
+ * Added support for elseif to JsPlate. (hat tip to fredck)
+ * Added support for @location urls in the @overview comment to the jsdoc template.
+
+== Changes From Versions 1.4.0 to 2.0.0 ==
+
+ * Upgraded included version of Rhino from 1.6 to 1.7R1.
+ * Removed circular references in parsed documentation objects.
+ * Improved inheritance handling, now properties and events can be inherited same as methods.
+ * Improved handling of cross-file relationships, now having two related objects in separate files is not a problem.
+ * Improved ability to recognize membership of previously defined objects.
+ * Added ability to redefine parsing behavior with plugins.
+ * @methodOf is a synonym for @function and @memberOf.
+ * Added @default to document default values of members that are objects.
+ * Added ability to parse and refer to inner functions.
+ * Fixed bug that appeared when calling a method to set properties of the instance referred to by "this".
+ * Added ability to automatically create links to other symbols.
+ * New "jsdoc" template now produces fully W3C valid XHTML.
+ * Inline parameter type hint comments are now documented.
+ * Fixed error: Locally scoped variables (declared with var) no longer appear as global.
+ * It is now possible to run JsDoc Toolkit from any directory.
+ * Added support for inline {@link ...} tags.
+ * Added support for the -H command-line option to allow for custom content handlers.
+ * Tag names @inherits and @scope changed to @borrows and @lends.
+ ? Combining @constructor in a doclet with @lends now supported.
+ * Multiple @lend tags now supported.
+ * Added support for the @constructs tag, used inside a @lends block.
+ * Added support for the @constant tag.
+ * Fixed bug that prevented the use of [] as a default value.
+ * Added support for the @field tag.
+ * Added support for the @public tag (applied to inner functions).
+ * @namespace tag can now be applied to functions, not just object literals.
+ * Added support for the -s command line option to suppress source code output.
+ * Added new unit test framework.
+ * Underscored symbols are now treated as if they have a @private tag by default.
+ * Improved support for anonymous constructors.
+ * Added support for the nocode meta tag.
+
Index: /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/conf/sample.conf
===================================================================
--- /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/conf/sample.conf (revision 4056)
+++ /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/conf/sample.conf (revision 4056)
@@ -0,0 +1,31 @@
+/*
+ This is an example of one way you could set up a configuration file to more
+ conveniently define some commandline options. You might like to do this if
+ you frequently reuse the same options. Note that you don't need to define
+ every option in this file, you can combine a configuration file with
+ additional options on the commandline if your wish.
+
+ You would include this configuration file by running JsDoc Toolkit like so:
+ java -jar jsrun.jar app/run.js -c=conf/sample.conf
+
+*/
+
+{
+ // source files to use
+ _: ['app/test/jsdoc_test.js'],
+
+ // document all functions, even uncommented ones
+ a: true,
+
+ // including those marked @private
+ p: true,
+
+ // some extra variables I want to include
+ D: {generatedBy: "Michael Mathews", copyright: "2008"},
+
+ // use this directory as the output directory
+ d: "docs",
+
+ // use this template
+ t: "templates/jsdoc"
+}
Index: /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/java/build.xml
===================================================================
--- /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/java/build.xml (revision 4056)
+++ /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/java/build.xml (revision 4056)
@@ -0,0 +1,36 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/java/build_1.4.xml
===================================================================
--- /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/java/build_1.4.xml (revision 4056)
+++ /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/java/build_1.4.xml (revision 4056)
@@ -0,0 +1,36 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/java/src/JsDebugRun.java
===================================================================
--- /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/java/src/JsDebugRun.java (revision 4056)
+++ /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/java/src/JsDebugRun.java (revision 4056)
@@ -0,0 +1,21 @@
+/**
+ * A trivial bootstrap class that simply adds the path to the
+ * .js file as an argument to the Rhino call. This little hack
+ * allows the code in the .js file to have access to it's own
+ * path via the Rhino arguments object. This is necessary to
+ * allow the .js code to find resource files in a location
+ * relative to itself.
+ *
+ * USAGE: java -jar jsdebug.jar path/to/file.js
+ */
+public class JsDebugRun {
+ public static void main(String[] args) {
+ String[] jsargs = {"-j="+args[0]};
+
+ String[] allArgs = new String[jsargs.length + args.length];
+ System.arraycopy(args, 0, allArgs, 0, args.length);
+ System.arraycopy(jsargs, 0, allArgs, args.length ,jsargs.length);
+
+ org.mozilla.javascript.tools.debugger.Main.main(allArgs);
+ }
+}
Index: /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/java/src/JsRun.java
===================================================================
--- /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/java/src/JsRun.java (revision 4056)
+++ /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/java/src/JsRun.java (revision 4056)
@@ -0,0 +1,21 @@
+/**
+ * A trivial bootstrap class that simply adds the path to the
+ * .js file as an argument to the Rhino call. This little hack
+ * allows the code in the .js file to have access to it's own
+ * path via the Rhino arguments object. This is necessary to
+ * allow the .js code to find resource files in a location
+ * relative to itself.
+ *
+ * USAGE: java -jar jsrun.jar path/to/file.js
+ */
+public class JsRun {
+ public static void main(String[] args) {
+ String[] jsargs = {"-j="+args[0]};
+
+ String[] allArgs = new String[jsargs.length + args.length];
+ System.arraycopy(args, 0, allArgs, 0, args.length);
+ System.arraycopy(jsargs, 0, allArgs, args.length ,jsargs.length);
+
+ org.mozilla.javascript.tools.shell.Main.main(allArgs);
+ }
+}
Index: /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/templates/jsdoc/allclasses.tmpl
===================================================================
--- /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/templates/jsdoc/allclasses.tmpl (revision 4056)
+++ /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/templates/jsdoc/allclasses.tmpl (revision 4056)
@@ -0,0 +1,17 @@
+
Index: /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/templates/jsdoc/static/index.html
===================================================================
--- /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/templates/jsdoc/static/index.html (revision 4056)
+++ /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/templates/jsdoc/static/index.html (revision 4056)
@@ -0,0 +1,19 @@
+
+
+
+
+ Generated Javascript Documentation
+
+
+
Index: /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/templates/jsdoc/symbol.tmpl
===================================================================
--- /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/templates/jsdoc/symbol.tmpl (revision 4056)
+++ /CKEditor/branches/versions/3.0.x/_dev/_thirdparty/jsdoc-toolkit/templates/jsdoc/symbol.tmpl (revision 4056)
@@ -0,0 +1,35 @@
+
+ {+data.name+}
+ {+data.memberOf+}
+ {+data.isStatic+}
+ {+data.isa+}
+ {+data.desc+}
+ {+data.classDesc+}
+
+
+
+ {+method.name+}
+ {+method.memberOf+}
+ {+method.isStatic+}
+ {+method.desc+}
+
+
+ {+param.type+}
+ {+param.name+}
+ {+param.desc+}
+ {+param.defaultValue+}
+
+
+
+
+
+
+
+ {+property.name+}
+ {+property.memberOf+}
+ {+property.isStatic+}
+ {+property.desc+}
+ {+property.type+}
+
+
+
Index: /CKEditor/branches/versions/3.0.x/_dev/docs_build/docs_build.bat
===================================================================
--- /CKEditor/branches/versions/3.0.x/_dev/docs_build/docs_build.bat (revision 4055)
+++ /CKEditor/branches/versions/3.0.x/_dev/docs_build/docs_build.bat (revision 4056)
@@ -4,14 +4,14 @@
:: For licensing, see LICENSE.html or http://ckeditor.com/license
::
-:: Build the _docs/api documentation files.
+:: Builds the documentation files.
::
-ECHO Building the API document at _docs/api...
+ECHO Building the API document into the api_docs directory...
-del /F /Q "../../_docs/api/*.*"
+del /F /Q "api_docs/*.*"
java -jar ../_thirdparty/jsdoc-toolkit/jsrun.jar ../_thirdparty/jsdoc-toolkit/app/run.js -c=docs_build.conf
-:: php ../fixlineends/fixlineends.php --eolstripwhite --eofnewline --eofstripwhite --nohidden --nosystem ../../_docs/api/
+:: php ../fixlineends/fixlineends.php --eolstripwhite --eofnewline --eofstripwhite --nohidden --nosystem api_docs/
ECHO Finished!
Index: /CKEditor/branches/versions/3.0.x/_dev/docs_build/docs_build.conf
===================================================================
--- /CKEditor/branches/versions/3.0.x/_dev/docs_build/docs_build.conf (revision 4055)
+++ /CKEditor/branches/versions/3.0.x/_dev/docs_build/docs_build.conf (revision 4056)
@@ -17,4 +17,5 @@
'../../_source/core/',
'../../_source/plugins/',
+ '../../_source/skins/kama/skin.js',
'../../_source/lang/en.js'
],
@@ -27,5 +28,5 @@
// use this directory as the output directory
- d: '../../_docs/api',
+ d: 'api_docs',
// Template.
Index: /CKEditor/branches/versions/3.0.x/_dev/releaser/ckreleaser.release
===================================================================
--- /CKEditor/branches/versions/3.0.x/_dev/releaser/ckreleaser.release (revision 4055)
+++ /CKEditor/branches/versions/3.0.x/_dev/releaser/ckreleaser.release (revision 4056)
@@ -11,5 +11,4 @@
[
'_dev',
- '_docs/api',
'_samples',
'_source/adapters',
@@ -59,10 +58,4 @@
],
-documentation :
-{
- config: '_dev/docs_build/docs_build.conf',
- target: '_docs/api'
-},
-
samples :
{
Index: /CKEditor/branches/versions/3.0.x/_dev/releaser/release.bat
===================================================================
--- /CKEditor/branches/versions/3.0.x/_dev/releaser/release.bat (revision 4055)
+++ /CKEditor/branches/versions/3.0.x/_dev/releaser/release.bat (revision 4056)
@@ -11,3 +11,3 @@
:: rmdir /S /Q release
-java -jar ckreleaser/ckreleaser.jar ckreleaser.release ../.. release "3.0 RC" ckeditor_3.0rc
+java -jar ckreleaser/ckreleaser.jar ckreleaser.release ../.. release "CKEditor 3.0 SVN" ckeditor_3.0_svn
Index: /CKEditor/branches/versions/3.0.x/_samples/ui_languages.html
===================================================================
--- /CKEditor/branches/versions/3.0.x/_samples/ui_languages.html (revision 4055)
+++ /CKEditor/branches/versions/3.0.x/_samples/ui_languages.html (revision 4056)
@@ -11,5 +11,7 @@
//<\/script>' );
+ document.write( '',
@@ -100,4 +105,10 @@
},
+ onLoad : function()
+ {
+ if ( ( CKEDITOR.env.ie7Compat || CKEDITOR.env.ie6Compat ) && editor.lang.dir == 'rtl' )
+ this.parts.contents.setStyle( 'overflow', 'hidden' );
+ },
+
onOk : function()
{
@@ -107,5 +118,7 @@
html = iframe.$.contentWindow.document.body.innerHTML;
- editor.insertHtml( html );
+ setTimeout( function(){
+ editor.insertHtml( html );
+ }, 0 );
},
Index: /CKEditor/branches/versions/3.0.x/_source/plugins/colorbutton/plugin.js
===================================================================
--- /CKEditor/branches/versions/3.0.x/_source/plugins/colorbutton/plugin.js (revision 4055)
+++ /CKEditor/branches/versions/3.0.x/_source/plugins/colorbutton/plugin.js (revision 4056)
@@ -28,4 +28,5 @@
title : title,
className : 'cke_button_' + name.toLowerCase(),
+ modes : { wysiwyg : 1 },
panel :
@@ -55,5 +56,5 @@
{
var output = [],
- colors = CKEDITOR.config.colorButton_colors.split( ',' );
+ colors = config.colorButton_colors.split( ',' );
var clickFn = CKEDITOR.tools.addFunction( function( color, type )
@@ -77,4 +78,5 @@
else
style.remove( editor.document );
+ editor.fire( 'saveSnapshot' );
});
@@ -140,5 +142,22 @@
});
+/**
+ * Whether to enable the "More Colors..." button in the color selectors.
+ * @default false
+ * @type Boolean
+ * @example
+ * config.colorButton_enableMore = false;
+ */
CKEDITOR.config.colorButton_enableMore = false;
+
+/**
+ * Defines the colors to be displayed in the color selectors. It's a string
+ * containing the hexadecimal notation for HTML colors, without the "#" prefix.
+ * @type String
+ * @default '000,800000,8B4513,2F4F4F,008080,000080,4B0082,696969,B22222,A52A2A,DAA520,006400,40E0D0,0000CD,800080,808080,F00,FF8C00,FFD700,008000,0FF,00F,EE82EE,A9A9A9,FFA07A,FFA500,FFFF00,00FF00,AFEEEE,ADD8E6,DDA0DD,D3D3D3,FFF0F5,FAEBD7,FFFFE0,F0FFF0,F0FFFF,F0F8FF,E6E6FA,FFF'
+ * @example
+ * // Brazil colors only.
+ * config.colorButton_colors = '00923E,F8C100,28166F';
+ */
CKEDITOR.config.colorButton_colors =
'000,800000,8B4513,2F4F4F,008080,000080,4B0082,696969,' +
@@ -148,4 +167,15 @@
'FFF0F5,FAEBD7,FFFFE0,F0FFF0,F0FFFF,F0F8FF,E6E6FA,FFF';
+/**
+ * Holds the style definition to be used to apply the text foreground color.
+ * @type Object
+ * @example
+ * // This is basically the default setting value.
+ * config.colorButton_foreStyle =
+ * {
+ * element : 'span',
+ * styles : { 'color' : '#(color)' }
+ * };
+ */
CKEDITOR.config.colorButton_foreStyle =
{
@@ -155,4 +185,15 @@
};
+/**
+ * Holds the style definition to be used to apply the text background color.
+ * @type Object
+ * @example
+ * // This is basically the default setting value.
+ * config.colorButton_backStyle =
+ * {
+ * element : 'span',
+ * styles : { 'background-color' : '#(color)' }
+ * };
+ */
CKEDITOR.config.colorButton_backStyle =
{
Index: /CKEditor/branches/versions/3.0.x/_source/plugins/dialog/plugin.js
===================================================================
--- /CKEditor/branches/versions/3.0.x/_source/plugins/dialog/plugin.js (revision 4055)
+++ /CKEditor/branches/versions/3.0.x/_source/plugins/dialog/plugin.js (revision 4056)
@@ -359,5 +359,5 @@
* then IE would still leave the caret inside the editing area.
*/
- if ( CKEDITOR.env.ie )
+ if ( this._.editor.mode == 'wysiwyg' && CKEDITOR.env.ie )
{
var $selection = editor.document.$.selection,
@@ -443,4 +443,33 @@
};
+ // Focusable interface. Use it via dialog.addFocusable.
+ function Focusable( dialog, element, index ) {
+ this.element = element;
+ this.focusIndex = index;
+ this.isFocusable = function()
+ {
+ return true;
+ };
+ this.focus = function()
+ {
+ dialog._.currentFocusIndex = this.focusIndex;
+ this.element.focus();
+ };
+ // Bind events
+ element.on( 'keydown', function( e )
+ {
+ if ( e.data.getKeystroke() in { 32:1, 13:1 } )
+ this.fire( 'click' );
+ } );
+ element.on( 'focus', function()
+ {
+ this.fire( 'mouseover' );
+ } );
+ element.on( 'blur', function()
+ {
+ this.fire( 'mouseout' );
+ } );
+ }
+
CKEDITOR.dialog.prototype =
{
@@ -548,5 +577,5 @@
show : function()
{
- if ( CKEDITOR.env.ie )
+ if ( this._.editor.mode == 'wysiwyg' && CKEDITOR.env.ie )
this._.editor.getSelection().lock();
@@ -619,5 +648,7 @@
var dialogSize = this.getSize();
- this.move( ( viewSize.width - dialogSize.width ) / 2, ( viewSize.height - dialogSize.height ) / 2 );
+ // We're using definition size for initial position because of
+ // offten corrupted data in offsetWidth at this point. (#4084)
+ this.move( ( viewSize.width - definition.minWidth ) / 2, ( viewSize.height - dialogSize.height ) / 2 );
this.parts.dialog.setStyle( 'visibility', '' );
@@ -723,5 +754,5 @@
editor.focus();
- if ( CKEDITOR.env.ie )
+ if ( editor.mode == 'wysiwyg' && CKEDITOR.env.ie )
editor.getSelection().unlock( true );
}
@@ -989,4 +1020,24 @@
{
return this.getParentEditor().getSelection().getSelectedElement();
+ },
+
+ /**
+ * Adds element to dialog's focusable list.
+ *
+ * @param {CKEDITOR.dom.element} element
+ * @param {Number} [index]
+ */
+ addFocusable: function( element, index ) {
+ if ( typeof index == 'undefined' )
+ {
+ index = this._.focusList.length;
+ this._.focusList.push( new Focusable( this, element, index ) );
+ }
+ else
+ {
+ this._.focusList.splice( index, 0, new Focusable( this, element, index ) );
+ for ( var i = index + 1 ; i < this._.focusList.length ; i++ )
+ this._.focusList[ i ].focusIndex++;
+ }
}
};
@@ -1424,4 +1475,6 @@
dialog.parts.title.on( 'mousedown', function( evt )
{
+ dialog._.updateSize = true;
+
lastCoords = { x : evt.data.$.screenX, y : evt.data.$.screenY };
Index: /CKEditor/branches/versions/3.0.x/_source/plugins/dialogui/plugin.js
===================================================================
--- /CKEditor/branches/versions/3.0.x/_source/plugins/dialogui/plugin.js (revision 4055)
+++ /CKEditor/branches/versions/3.0.x/_source/plugins/dialogui/plugin.js (revision 4056)
@@ -234,5 +234,10 @@
// IE BUG: Text input fields in IE at 100% would exceed a
or inline
// container's width, so need to wrap it inside a
.
- var html = [ '
',
+ CKEDITOR.tools.htmlEncode( elementDefinition.label ),
+ '' );
return html.join( '' );
};
- CKEDITOR.ui.dialog.uiElement.call( this, dialog, elementDefinition, htmlList, 'label', null, null, innerHTML );
+ CKEDITOR.ui.dialog.uiElement.call( this, dialog, elementDefinition, htmlList, 'span', null, null, innerHTML );
},
@@ -394,5 +401,4 @@
title : title
}, true ),
- inputHtml = [],
inputAttributes =
{
@@ -401,5 +407,6 @@
name : commonName,
value : value
- };
+ },
+ inputHtml = [];
if ( me._['default'] == value )
inputAttributes.checked = 'checked';
@@ -407,6 +414,8 @@
cleanInnerDefinition( labelDefinition );
children.push( new CKEDITOR.ui.dialog.uiElement( dialog, inputDefinition, inputHtml, 'input', null, inputAttributes ) );
- new CKEDITOR.ui.dialog.uiElement( dialog, labelDefinition, inputHtmlList, 'label', null, null,
- inputHtml.join( '' ) + ' ' + item[0] );
+ inputHtml.push( ' ' );
+ new CKEDITOR.ui.dialog.uiElement( dialog, labelDefinition, inputHtml, 'label', null, { 'for' : inputAttributes.id },
+ item[0] );
+ inputHtmlList.push( inputHtml.join( '' ) );
}
new CKEDITOR.ui.dialog.hbox( dialog, [], inputHtmlList, html );
@@ -597,4 +606,5 @@
' class="cke_dialog_ui_input_file"' +
' id="', _.frameId, '"' +
+ ' title="', elementDefinition.label, '"' +
' src="javascript:void(' ];
@@ -813,5 +823,6 @@
{
this._.disabled = false;
- this.getElement().removeClass( 'disabled' );
+ var element = this.getElement();
+ element && element.removeClass( 'disabled' );
},
@@ -896,5 +907,9 @@
// GECKO BUG: setTimeout() is needed to workaround invisible selections.
- setTimeout( function(){ me.getInputElement().$.focus(); }, 0 );
+ setTimeout( function()
+ {
+ var element = me.getInputElement();
+ element && element.$.focus();
+ }, 0 );
},
@@ -908,5 +923,13 @@
// GECKO BUG: setTimeout() is needed to workaround invisible selections.
- setTimeout( function(){ var e = me.getInputElement().$; e.focus(); e.select(); }, 0 );
+ setTimeout( function()
+ {
+ var e = me.getInputElement();
+ if ( e )
+ {
+ e.$.focus();
+ e.$.select();
+ }
+ }, 0 );
},
@@ -1234,4 +1257,8 @@
frameDocument.$.domain = document.domain;
+ var size = '';
+ if ( elementDefinition.size )
+ size = elementDefinition.size - ( CKEDITOR.env.ie ? 7 : 0 ); // "Browse" button is bigger in IE.
+
frameDocument.$.write( [ '',
'',
'',
Index: /CKEditor/branches/versions/3.0.x/_source/plugins/domiterator/plugin.js
===================================================================
--- /CKEditor/branches/versions/3.0.x/_source/plugins/domiterator/plugin.js (revision 4055)
+++ /CKEditor/branches/versions/3.0.x/_source/plugins/domiterator/plugin.js (revision 4056)
@@ -20,4 +20,7 @@
this.range = range;
this.forceBrBreak = false;
+
+ // Whether include s into the enlarged range.(#3730).
+ this.enlargeBr = true;
this.enforceRealBlocks = false;
@@ -46,5 +49,6 @@
{
range = this.range.clone();
- range.enlarge( this.forceBrBreak ? CKEDITOR.ENLARGE_LIST_ITEM_CONTENTS : CKEDITOR.ENLARGE_BLOCK_CONTENTS );
+ range.enlarge( this.forceBrBreak || !this.enlargeBr ?
+ CKEDITOR.ENLARGE_LIST_ITEM_CONTENTS : CKEDITOR.ENLARGE_BLOCK_CONTENTS );
var walker = new CKEDITOR.dom.walker( range ),
@@ -58,10 +62,30 @@
var lastNode = walker.previous();
this._.lastNode = lastNode.getNextSourceNode( true );
+
+ // We may have an empty text node at the end of block due to [3770].
+ // If that node is the lastNode, it would cause our logic to leak to the
+ // next block.(#3887)
+ if ( this._.lastNode &&
+ this._.lastNode.type == CKEDITOR.NODE_TEXT &&
+ !CKEDITOR.tools.trim( this._.lastNode.getText( ) ) &&
+ this._.lastNode.getParent().isBlockBoundary() )
+ {
+ var testRange = new CKEDITOR.dom.range( range.document );
+ testRange.moveToPosition( this._.lastNode, CKEDITOR.POSITION_AFTER_END );
+ if ( testRange.checkEndOfBlock() )
+ {
+ var path = new CKEDITOR.dom.elementPath( testRange.endContainer );
+ var lastBlock = path.block || path.blockLimit;
+ this._.lastNode = lastBlock.getNextSourceNode( true );
+ }
+ }
+
// Probably the document end is reached, we need a marker node.
if ( !this._.lastNode )
{
- this._.lastNode = range.document.createText( '' );
- this._.lastNode.insertAfter( lastNode );
- }
+ this._.lastNode = this._.docEndMarker = range.document.createText( '' );
+ this._.lastNode.insertAfter( lastNode );
+ }
+
// Let's reuse this variable.
range = null;
@@ -181,4 +205,7 @@
range.setEndAt( currentNode, CKEDITOR.POSITION_AFTER_END );
+ currentNode = currentNode.getNextSourceNode( continueFromSibling, null, lastNode );
+ isLast = !currentNode;
+
// We have found a block boundary. Let's close the range and move out of the
// loop.
@@ -188,8 +215,14 @@
startPath = new CKEDITOR.dom.elementPath( range.startContainer ),
endPath = new CKEDITOR.dom.elementPath( range.endContainer );
+
+ // Drop the range if it only contains bookmark nodes.(#4087)
if ( boundaryNodes.startNode.equals( boundaryNodes.endNode )
- && boundaryNodes.startNode.getParent().equals( startPath.blockLimit )
- && boundaryNodes.startNode.type == CKEDITOR.NODE_ELEMENT && boundaryNodes.startNode.getAttribute( '_fck_bookmark' ) )
+ && boundaryNodes.startNode.getParent().equals( startPath.blockLimit )
+ && boundaryNodes.startNode.type == CKEDITOR.NODE_ELEMENT
+ && boundaryNodes.startNode.getAttribute( '_fck_bookmark' ) )
+ {
range = null;
+ this._.nextNode = null;
+ }
else
break;
@@ -199,5 +232,4 @@
break;
- currentNode = currentNode.getNextSourceNode( continueFromSibling, null, lastNode );
}
@@ -208,4 +240,5 @@
if ( !range )
{
+ this._.docEndMarker && this._.docEndMarker.remove();
this._.nextNode = null;
return null;
@@ -288,9 +321,14 @@
if ( removeLastBr )
{
+ // Ignore bookmark nodes.(#3783)
+ var bookmarkGuard = CKEDITOR.dom.walker.bookmark( false, true );
+
var lastChild = block.getLast();
if ( lastChild && lastChild.type == CKEDITOR.NODE_ELEMENT && lastChild.getName() == 'br' )
{
// Take care not to remove the block expanding in non-IE browsers.
- if ( CKEDITOR.env.ie || lastChild.getPrevious() || lastChild.getNext() )
+ if ( CKEDITOR.env.ie
+ || lastChild.getPrevious( bookmarkGuard )
+ || lastChild.getNext( bookmarkGuard ) )
lastChild.remove();
}
Index: /CKEditor/branches/versions/3.0.x/_source/plugins/editingblock/plugin.js
===================================================================
--- /CKEditor/branches/versions/3.0.x/_source/plugins/editingblock/plugin.js (revision 4055)
+++ /CKEditor/branches/versions/3.0.x/_source/plugins/editingblock/plugin.js (revision 4056)
@@ -170,4 +170,6 @@
return;
+ this.fire( 'beforeModeUnload' );
+
var currentMode = getMode( this );
data = currentMode.getData();
@@ -212,5 +214,5 @@
* @default 'wysiwyg'
* @example
- * config.toolbarLocation = 'source';
+ * config.startupMode = 'source';
*/
CKEDITOR.config.startupMode = 'wysiwyg';
@@ -220,6 +222,15 @@
* @type Boolean
* @default false
+ * @example
+ * config.startupFocus = true;
*/
CKEDITOR.config.startupFocus = false;
+/**
+ * Whether to render or not the editing block area in the editor interface.
+ * @type Boolean
+ * @default true
+ * @example
+ * config.editingBlock = false;
+ */
CKEDITOR.config.editingBlock = true;
Index: /CKEditor/branches/versions/3.0.x/_source/plugins/enterkey/plugin.js
===================================================================
--- /CKEditor/branches/versions/3.0.x/_source/plugins/enterkey/plugin.js (revision 4055)
+++ /CKEditor/branches/versions/3.0.x/_source/plugins/enterkey/plugin.js (revision 4056)
@@ -257,4 +257,5 @@
lineBreak = doc.createElement( 'br' );
+ range.deleteContents();
range.insertNode( lineBreak );
Index: /CKEditor/branches/versions/3.0.x/_source/plugins/entities/plugin.js
===================================================================
--- /CKEditor/branches/versions/3.0.x/_source/plugins/entities/plugin.js (revision 4055)
+++ /CKEditor/branches/versions/3.0.x/_source/plugins/entities/plugin.js (revision 4056)
@@ -146,7 +146,55 @@
})();
+/**
+ * Whether to use HTML entities in the output.
+ * @type Boolean
+ * @default true
+ * @example
+ * config.entities = false;
+ */
CKEDITOR.config.entities = true;
+
+/**
+ * Whether to convert some Latin characters (Latin alphabet No. 1, ISO 8859-1)
+ * to HTML entities. The list of entities can be found at the
+ * W3C HTML 4.01 Specification, section 24.2.1.
+ * @type Boolean
+ * @default true
+ * @example
+ * config.entities_latin = false;
+ */
CKEDITOR.config.entities_latin = true;
+
+/**
+ * Whether to convert some symbols, mathematical symbols, and Greek letters to
+ * HTML entities. This may be more relevant for users typing text written in Greek.
+ * The list of entities can be found at the
+ * W3C HTML 4.01 Specification, section 24.3.1.
+ * @type Boolean
+ * @default true
+ * @example
+ * config.entities_greek = false;
+ */
CKEDITOR.config.entities_greek = true;
+
+/**
+ * Whether to convert all remaining characters, not comprised in the ASCII
+ * character table, to their relative numeric representation of HTML entity.
+ * For example, the phrase "This is Chinese: 汉语." is outputted
+ * as "This is Chinese: 汉语."
+ * @type Boolean
+ * @default false
+ * @example
+ * config.entities_processNumerical = true;
+ */
CKEDITOR.config.entities_processNumerical = false;
+
+/**
+ * An additional list of entities to be used. It's a string containing each
+ * entry separated by a comma. Entities names or number must be used, exclusing
+ * the "&" preffix and the ";" termination.
+ * @default '#39' // The single quote (') character.
+ * @type String
+ * @example
+ */
CKEDITOR.config.entities_additional = '#39';
Index: /CKEditor/branches/versions/3.0.x/_source/plugins/find/dialogs/find.js
===================================================================
--- /CKEditor/branches/versions/3.0.x/_source/plugins/find/dialogs/find.js (revision 4055)
+++ /CKEditor/branches/versions/3.0.x/_source/plugins/find/dialogs/find.js (revision 4056)
@@ -712,5 +712,5 @@
dialog.getValueOf( 'replace', 'txtReplaceWordChk' ),
false, true ) )
- ;
+ { /*jsl:pass*/ }
if ( finder.replaceCounter )
Index: /CKEditor/branches/versions/3.0.x/_source/plugins/find/plugin.js
===================================================================
--- /CKEditor/branches/versions/3.0.x/_source/plugins/find/plugin.js (revision 4055)
+++ /CKEditor/branches/versions/3.0.x/_source/plugins/find/plugin.js (revision 4056)
@@ -32,4 +32,15 @@
} );
-// Styles for highlighting search results.
+/**
+ * Defines the style to be used to highlight results with the find dialog.
+ * @type Object
+ * @default { element : 'span', styles : { 'background-color' : '#004', 'color' : '#fff' } }
+ * @example
+ * // Highlight search results with blue on yellow.
+ * config.find_highlight =
+ * {
+ * element : 'span',
+ * styles : { 'background-color' : '#ff0', 'color' : '#00f' }
+ * };
+ */
CKEDITOR.config.find_highlight = { element : 'span', styles : { 'background-color' : '#004', 'color' : '#fff' } };
Index: /CKEditor/branches/versions/3.0.x/_source/plugins/flash/dialogs/flash.js
===================================================================
--- /CKEditor/branches/versions/3.0.x/_source/plugins/flash/dialogs/flash.js (revision 4055)
+++ /CKEditor/branches/versions/3.0.x/_source/plugins/flash/dialogs/flash.js (revision 4056)
@@ -357,4 +357,5 @@
type : 'text',
id : 'width',
+ style : 'width:95px',
label : editor.lang.flash.width,
validate : CKEDITOR.dialog.validate.integer( editor.lang.flash.validateWidth ),
@@ -379,4 +380,5 @@
type : 'text',
id : 'height',
+ style : 'width:95px',
label : editor.lang.flash.height,
validate : CKEDITOR.dialog.validate.integer( editor.lang.flash.validateHeight ),
@@ -401,4 +403,5 @@
type : 'text',
id : 'hSpace',
+ style : 'width:95px',
label : editor.lang.flash.hSpace,
validate : CKEDITOR.dialog.validate.integer( editor.lang.flash.validateHSpace ),
@@ -409,4 +412,5 @@
type : 'text',
id : 'vSpace',
+ style : 'width:95px',
label : editor.lang.flash.vSpace,
validate : CKEDITOR.dialog.validate.integer( editor.lang.flash.validateVSpace ),
Index: /CKEditor/branches/versions/3.0.x/_source/plugins/flash/plugin.js
===================================================================
--- /CKEditor/branches/versions/3.0.x/_source/plugins/flash/plugin.js (revision 4055)
+++ /CKEditor/branches/versions/3.0.x/_source/plugins/flash/plugin.js (revision 4056)
@@ -20,5 +20,5 @@
var attributes = element.attributes;
- return ( attributes.type != 'application/x-shockwave-flash' || !flashFilenameRegex.test( attributes.src || '' ) );
+ return ( attributes.type == 'application/x-shockwave-flash' || flashFilenameRegex.test( attributes.src || '' ) );
}
Index: /CKEditor/branches/versions/3.0.x/_source/plugins/floatpanel/plugin.js
===================================================================
--- /CKEditor/branches/versions/3.0.x/_source/plugins/floatpanel/plugin.js (revision 4055)
+++ /CKEditor/branches/versions/3.0.x/_source/plugins/floatpanel/plugin.js (revision 4056)
@@ -122,4 +122,7 @@
top += offsetParent.$.offsetHeight - 1;
+ // Memorize offsetParent by it's ID.
+ this._.panel._.offsetParentId = offsetParent.getId();
+
element.setStyles(
{
@@ -181,5 +184,5 @@
this );
- setTimeout( function()
+ CKEDITOR.tools.setTimeout( function()
{
if ( rtl )
@@ -212,13 +215,6 @@
}
- if ( !CKEDITOR.env.gecko || panel.isLoaded )
- {
- // IE7 needs some time (setting the delay to 0ms won't work) to refresh
- // the scrollHeight. (#3174)
- if ( CKEDITOR.env.ie && CKEDITOR.env.version >= 7 )
- setTimeout( setHeight, 50 );
- else
- setHeight();
- }
+ if ( panel.isLoaded )
+ setHeight();
else
panel.onLoad = setHeight;
@@ -228,5 +224,5 @@
// Set the IFrame focus, so the blur event gets fired.
- setTimeout( function()
+ CKEDITOR.tools.setTimeout( function()
{
if ( definition.voiceLabel )
@@ -245,7 +241,10 @@
else
iframe.$.contentWindow.focus();
- }, 0);
- }, 0);
-
+
+ // We need this get fired manually because of unfired focus() function.
+ if ( CKEDITOR.env.ie && !CKEDITOR.env.quirks )
+ this.allowBlur( true );
+ }, 0, this);
+ }, 0, this);
this.visible = 1;
@@ -277,4 +276,8 @@
showAsChild : function( panel, blockName, offsetParent, corner, offsetX, offsetY )
{
+ // Skip reshowing of child which is already visible.
+ if ( this._.activeChild == panel && panel._.panel._.offsetParentId == offsetParent.getId() )
+ return;
+
this.hideChild();
Index: /CKEditor/branches/versions/3.0.x/_source/plugins/font/plugin.js
===================================================================
--- /CKEditor/branches/versions/3.0.x/_source/plugins/font/plugin.js (revision 4055)
+++ /CKEditor/branches/versions/3.0.x/_source/plugins/font/plugin.js (revision 4056)
@@ -118,6 +118,22 @@
})();
-// Font settings.
-
+/**
+ * The list of fonts names to be displayed in the Font combo in the toolbar.
+ * Entries are separated by semi-colons (;), while it's possible to have more
+ * than one font for each entry, in the HTML way (separated by comma).
+ *
+ * A display name may be optionally defined by prefixing the entries with the
+ * name and the slash character. For example, "Arial/Arial, Helvetica, sans-serif"
+ * will be displayed as "Arial" in the list, but will be outputted as
+ * "Arial, Helvetica, sans-serif".
+ * @type String
+ * @example
+ * config.font_names =
+ * 'Arial/Arial, Helvetica, sans-serif;' +
+ * 'Times New Roman/Times New Roman, Times, serif;' +
+ * 'Verdana';
+ * @example
+ * config.font_names = 'Arial;Times New Roman;Verdana';
+ */
CKEDITOR.config.font_names =
'Arial/Arial, Helvetica, sans-serif;' +
@@ -131,5 +147,26 @@
'Verdana/Verdana, Geneva, sans-serif';
+/**
+ * The text to be displayed in the Font combo is none of the available values
+ * matches the current cursor position or text selection.
+ * @type String
+ * @example
+ * // If the default site font is Arial, we may making it more explicit to the end user.
+ * config.font_defaultLabel = 'Arial';
+ */
CKEDITOR.config.font_defaultLabel = '';
+
+/**
+ * The style definition to be used to apply the font in the text.
+ * @type Object
+ * @example
+ * // This is actually the default value for it.
+ * config.font_style =
+ * {
+ * element : 'span',
+ * styles : { 'font-family' : '#(family)' },
+ * overrides : [ { element : 'font', attributes : { 'face' : null } } ]
+ * };
+ */
CKEDITOR.config.font_style =
{
@@ -139,14 +176,52 @@
};
-// Font Size setting.
-
+/**
+ * The list of fonts size to be displayed in the Font Size combo in the
+ * toolbar. Entries are separated by semi-colons (;).
+ *
+ * Any kind of "CSS like" size can be used, like "12px", "2.3em", "130%",
+ * "larger" or "x-small".
+ *
+ * A display name may be optionally defined by prefixing the entries with the
+ * name and the slash character. For example, "Bigger Font/14px" will be
+ * displayed as "Bigger Font" in the list, but will be outputted as "14px".
+ * @type String
+ * @default '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'
+ * @example
+ * config.fontSize_sizes = '16/16px;24/24px;48/48px;';
+ * @example
+ * config.fontSize_sizes = '12px;2.3em;130%;larger;x-small';
+ * @example
+ * config.fontSize_sizes = '12 Pixels/12px;Big/2.3em;30 Percent More/130%;Bigger/larger;Very Small/x-small';
+ */
CKEDITOR.config.fontSize_sizes =
'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';
+/**
+ * The text to be displayed in the Font Size combo is none of the available
+ * values matches the current cursor position or text selection.
+ * @type String
+ * @example
+ * // If the default site font size is 12px, we may making it more explicit to the end user.
+ * config.fontSize_defaultLabel = '12px';
+ */
CKEDITOR.config.fontSize_defaultLabel = '';
+
+/**
+ * The style definition to be used to apply the font size in the text.
+ * @type Object
+ * @example
+ * // This is actually the default value for it.
+ * config.fontSize_style =
+ * {
+ * element : 'span',
+ * styles : { 'font-size' : '#(size)' },
+ * overrides : [ { element : 'font', attributes : { 'size' : null } } ]
+ * };
+ */
CKEDITOR.config.fontSize_style =
{
element : 'span',
styles : { 'font-size' : '#(size)' },
- overrides : [ { element : 'font', attributes : { 'face' : null } } ]
+ overrides : [ { element : 'font', attributes : { 'size' : null } } ]
};
Index: /CKEditor/branches/versions/3.0.x/_source/plugins/format/plugin.js
===================================================================
--- /CKEditor/branches/versions/3.0.x/_source/plugins/format/plugin.js (revision 4055)
+++ /CKEditor/branches/versions/3.0.x/_source/plugins/format/plugin.js (revision 4056)
@@ -88,14 +88,104 @@
});
+/**
+ * A list of semi colon separated style names (by default tags) representing
+ * the style definition for each entry to be displayed in the Format combo in
+ * the toolbar. Each entry must have its relative definition configuration in a
+ * setting named "format_(tagName)". For example, the "p" entry has its
+ * definition taken from config.format_p.
+ * @type String
+ * @default 'p;h1;h2;h3;h4;h5;h6;pre;address;div'
+ * @example
+ * config.format_tags = 'p;h2;h3;pre'
+ */
CKEDITOR.config.format_tags = 'p;h1;h2;h3;h4;h5;h6;pre;address;div';
-CKEDITOR.config.format_p = { element : 'p' };
-CKEDITOR.config.format_div = { element : 'div' };
-CKEDITOR.config.format_pre = { element : 'pre' };
-CKEDITOR.config.format_address = { element : 'address' };
-CKEDITOR.config.format_h1 = { element : 'h1' };
-CKEDITOR.config.format_h2 = { element : 'h2' };
-CKEDITOR.config.format_h3 = { element : 'h3' };
-CKEDITOR.config.format_h4 = { element : 'h4' };
-CKEDITOR.config.format_h5 = { element : 'h5' };
-CKEDITOR.config.format_h6 = { element : 'h6' };
+/**
+ * The style definition to be used to apply the "Normal" format.
+ * @type Object
+ * @default { element : 'p' }
+ * @example
+ * config.format_p = { element : 'p', attributes : { class : 'normalPara' } };
+ */
+CKEDITOR.config.format_p = { element : 'p' };
+
+/**
+ * The style definition to be used to apply the "Normal (DIV)" format.
+ * @type Object
+ * @default { element : 'div' }
+ * @example
+ * config.format_div = { element : 'div', attributes : { class : 'normalDiv' } };
+ */
+CKEDITOR.config.format_div = { element : 'div' };
+
+/**
+ * The style definition to be used to apply the "Formatted" format.
+ * @type Object
+ * @default { element : 'pre' }
+ * @example
+ * config.format_pre = { element : 'pre', attributes : { class : 'code' } };
+ */
+CKEDITOR.config.format_pre = { element : 'pre' };
+
+/**
+ * The style definition to be used to apply the "Address" format.
+ * @type Object
+ * @default { element : 'address' }
+ * @example
+ * config.format_address = { element : 'address', attributes : { class : 'styledAddress' } };
+ */
+CKEDITOR.config.format_address = { element : 'address' };
+
+/**
+ * The style definition to be used to apply the "Heading 1" format.
+ * @type Object
+ * @default { element : 'h1' }
+ * @example
+ * config.format_h1 = { element : 'h1', attributes : { class : 'contentTitle1' } };
+ */
+CKEDITOR.config.format_h1 = { element : 'h1' };
+
+/**
+ * The style definition to be used to apply the "Heading 1" format.
+ * @type Object
+ * @default { element : 'h2' }
+ * @example
+ * config.format_h2 = { element : 'h2', attributes : { class : 'contentTitle2' } };
+ */
+CKEDITOR.config.format_h2 = { element : 'h2' };
+
+/**
+ * The style definition to be used to apply the "Heading 1" format.
+ * @type Object
+ * @default { element : 'h3' }
+ * @example
+ * config.format_h3 = { element : 'h3', attributes : { class : 'contentTitle3' } };
+ */
+CKEDITOR.config.format_h3 = { element : 'h3' };
+
+/**
+ * The style definition to be used to apply the "Heading 1" format.
+ * @type Object
+ * @default { element : 'h4' }
+ * @example
+ * config.format_h4 = { element : 'h4', attributes : { class : 'contentTitle4' } };
+ */
+CKEDITOR.config.format_h4 = { element : 'h4' };
+
+/**
+ * The style definition to be used to apply the "Heading 1" format.
+ * @type Object
+ * @default { element : 'h5' }
+ * @example
+ * config.format_h5 = { element : 'h5', attributes : { class : 'contentTitle5' } };
+ */
+CKEDITOR.config.format_h5 = { element : 'h5' };
+
+/**
+ * The style definition to be used to apply the "Heading 1" format.
+ * @type Object
+ * @default { element : 'h6' }
+ * @example
+ * config.format_h6 = { element : 'h6', attributes : { class : 'contentTitle6' } };
+ */
+CKEDITOR.config.format_h6 = { element : 'h6' };
Index: /CKEditor/branches/versions/3.0.x/_source/plugins/forms/dialogs/form.js
===================================================================
--- /CKEditor/branches/versions/3.0.x/_source/plugins/forms/dialogs/form.js (revision 4055)
+++ /CKEditor/branches/versions/3.0.x/_source/plugins/forms/dialogs/form.js (revision 4056)
@@ -10,5 +10,5 @@
id : 1,
method : 1,
- encoding : 1,
+ enctype : 1,
target : 1
};
@@ -120,5 +120,5 @@
},
{
- id : 'encoding',
+ id : 'enctype',
type : 'select',
label : editor.lang.form.encoding,
Index: /CKEditor/branches/versions/3.0.x/_source/plugins/htmldataprocessor/plugin.js
===================================================================
--- /CKEditor/branches/versions/3.0.x/_source/plugins/htmldataprocessor/plugin.js (revision 4055)
+++ /CKEditor/branches/versions/3.0.x/_source/plugins/htmldataprocessor/plugin.js (revision 4056)
@@ -7,5 +7,6 @@
{
// Regex to scan for at the end of blocks, which are actually placeholders.
- var tailNbspRegex = /^[\t\r\n ]* $/;
+ // Safari transforms the to \xa0. (#4172)
+ var tailNbspRegex = /^[\t\r\n ]*(?: |\xa0)$/;
var protectedSourceMarker = '{cke_protected}';
@@ -73,10 +74,4 @@
var defaultDataFilterRules =
{
- elementNames :
- [
- // Elements that cause problems in wysiwyg mode.
- [ ( /^(object|embed|param)$/ ), 'cke:$1' ]
- ],
-
attributeNames :
[
@@ -92,15 +87,4 @@
defaultDataBlockFilterRules.elements[ i ] = extendBlockForDisplay;
- /**
- * IE sucks with dynamic 'name' attribute after element is created, '_cke_saved_name' is used instead for this attribute.
- */
- var removeName = function( element )
- {
- var attribs = element.attributes;
-
- if ( attribs._cke_saved_name )
- delete attribs.name;
- };
-
var defaultHtmlFilterRules =
{
@@ -125,4 +109,21 @@
elements :
{
+ $ : function( element )
+ {
+ // Remove duplicated attributes - #3789.
+ var attribs = element.attributes;
+
+ if ( attribs )
+ {
+ var attributeNames = [ 'name', 'href', 'src' ],
+ savedAttributeName;
+ for ( var i = 0 ; i < attributeNames.length ; i++ )
+ {
+ savedAttributeName = '_cke_saved_' + attributeNames[ i ];
+ savedAttributeName in attribs && ( delete attribs[ attributeNames[ i ] ] );
+ }
+ }
+ },
+
embed : function( element )
{
@@ -133,33 +134,28 @@
if ( parent && parent.name == 'object' )
{
- element.attributes.width = parent.attributes.width;
- element.attributes.height = parent.attributes.height;
+ var parentWidth = parent.attributes.width,
+ parentHeight = parent.attributes.height;
+ parentWidth && ( element.attributes.width = parentWidth );
+ parentHeight && ( element.attributes.height = parentHeight );
}
},
-
- img : function( element )
- {
- var attribs = element.attributes;
-
- if ( attribs._cke_saved_name )
- delete attribs.name;
- if ( attribs._cke_saved_src )
- delete attribs.src;
+ // Restore param elements into self-closing.
+ param : function( param )
+ {
+ param.children = [];
+ param.isEmpty = true;
+ return param;
},
+ // Remove empty link but not empty anchor.(#3829)
a : function( element )
{
- var attribs = element.attributes;
-
- if ( attribs._cke_saved_name )
- delete attribs.name;
- if ( attribs._cke_saved_href )
- delete attribs.href;
- },
-
- input : removeName,
- textarea : removeName,
- select : removeName,
- form : removeName
+ if ( !( element.children.length ||
+ element.attributes.name ||
+ element.attributes._cke_saved_name ) )
+ {
+ return false;
+ }
+ }
},
@@ -206,4 +202,6 @@
var protectStyleTagsRegex = /<(style)(?=[ >])[^>]*>[^<]*<\/\1>/gi;
var encodedTagsRegex = /([^<]*)<\/cke:encoded>/gi;
+ var protectElementNamesRegex = /(<\/?)((?:object|embed|param).*?>)/gi;
+ var protectSelfClosingRegex = //gi;
function protectStyleTagsMatch( match )
@@ -216,4 +214,12 @@
return html.replace( protectStyleTagsRegex, protectStyleTagsMatch );
}
+ function protectElementsNames( html )
+ {
+ return html.replace( protectElementNamesRegex, '$1cke:$2');
+ }
+ function protectSelfClosingElements( html )
+ {
+ return html.replace( protectSelfClosingRegex, '' );
+ }
function unprotectEncodedTagsMatch( match, encoded )
@@ -229,9 +235,11 @@
function protectSource( data, protectRegexes )
{
+ var protectedHtml = [],
+ tempRegex = /<\!--\{cke_temp\}(\d*?)-->/g;
var regexes =
[
// First of any other protection, we must protect all comments
// to avoid loosing them (of course, IE related).
- //g,
+ (//g),
// Script tags will also be forced to be protected, otherwise
@@ -248,8 +256,20 @@
data = data.replace( regexes[i], function( match )
{
- return '';
+ match = match.replace( tempRegex, // There could be protected source inside another one. (#3869).
+ function( $, id )
+ {
+ return protectedHtml[ id ];
+ }
+ );
+ return '';
});
}
-
+ data = data.replace( tempRegex, function( $, id )
+ {
+ return '';
+ }
+ );
return data;
}
@@ -299,9 +319,18 @@
data = protectStyleTags( data );
+ // Certain elements has problem to go through DOM operation, protect
+ // them by prefixing 'cke' namespace.(#3591)
+ data = protectElementsNames( data );
+
+ // All none-IE browsers ignore self-closed custom elements,
+ // protecting them into open-close.(#3591)
+ data = protectSelfClosingElements( data );
+
// Call the browser to help us fixing a possibly invalid HTML
// structure.
var div = document.createElement( 'div' );
- div.innerHTML = data;
- data = div.innerHTML;
+ // Add fake character to workaround IE comments bug. (#3801)
+ div.innerHTML = 'a' + data;
+ data = div.innerHTML.substr( 1 );
if ( CKEDITOR.env.ie )
@@ -332,3 +361,13 @@
})();
+/**
+ * Whether to force using "&" instead of "&" in elements attributes
+ * values. It's not recommended to change this setting for compliance with the
+ * W3C XHTML 1.0 standards
+ * (C.12, XHTML 1.0).
+ * @type Boolean
+ * @default false
+ * @example
+ * config.forceSimpleAmpersand = false;
+ */
CKEDITOR.config.forceSimpleAmpersand = false;
Index: /CKEditor/branches/versions/3.0.x/_source/plugins/image/dialogs/image.js
===================================================================
--- /CKEditor/branches/versions/3.0.x/_source/plugins/image/dialogs/image.js (revision 4055)
+++ /CKEditor/branches/versions/3.0.x/_source/plugins/image/dialogs/image.js (revision 4056)
@@ -210,5 +210,7 @@
var editor = this.getParentEditor(),
- element = this.getParentEditor().getSelection().getSelectedElement();
+ sel = this.getParentEditor().getSelection(),
+ element = sel.getSelectedElement(),
+ link = element && element.getAscendant( 'a' );
// Copy of the image
@@ -217,11 +219,11 @@
this.originalElement.setCustomData( 'isReady', 'false' );
- if ( element && element.getName() == 'a' )
- {
- this.linkElement = element;
+ if ( link )
+ {
+ this.linkElement = link;
this.linkEditMode = true;
// Look for Image element.
- var linkChildren = element.getChildren();
+ var linkChildren = link.getChildren();
if ( linkChildren.count() == 1 ) // 1 child.
{
@@ -238,7 +240,8 @@
// Fill out all fields.
if ( dialogType == 'image' )
- this.setupContent( LINK, element );
+ this.setupContent( LINK, link );
}
- else if ( element && element.getName() == 'img' && !element.getAttribute( '_cke_protected_html' ) )
+
+ if ( element && element.getName() == 'img' && !element.getAttribute( '_cke_protected_html' ) )
this.imageEditMode = 'img';
else if ( element && element.getName() == 'input' && element.getAttribute( 'type' ) && element.getAttribute( 'type' ) == 'image' )
@@ -262,6 +265,5 @@
if ( this.imageEditMode )
{
- var imgTagName = this.imageEditMode,
- removeObj = this.imageElement;
+ var imgTagName = this.imageEditMode;
// Image dialog and Input element.
@@ -272,7 +274,5 @@
this.imageElement = editor.document.createElement( 'img' );
this.imageElement.setAttribute( 'alt', '' );
- removeObj.insertBeforeMe( this.imageElement );
- removeObj.remove( false );
-
+ editor.insertElement( this.imageElement );
}
// ImageButton dialog and Image element.
@@ -288,6 +288,5 @@
}
);
- removeObj.insertBeforeMe( this.imageElement );
- removeObj.remove( false );
+ editor.insertElement( this.imageElement );
}
}
@@ -321,9 +320,9 @@
if ( !this.linkEditMode )
{
- this.linkElement.append( this.imageElement, false );
- editor.insertElement( this.linkElement );
+ editor.insertElement(this.linkElement);
+ this.linkElement.append(this.imageElement, false);
}
- else //Link already exists, image not.
- this.linkElement.append( this.imageElement, false );
+ else //Link already exists, image not.
+ editor.insertElement(this.imageElement );
}
else
@@ -335,10 +334,13 @@
if ( !this.linkEditMode && this.addLink )
{
- this.imageElement.insertBeforeMe( this.linkElement );
+ editor.insertElement( this.linkElement );
this.imageElement.appendTo( this.linkElement );
}
//Remove Link, Image exists.
else if ( this.linkEditMode && !this.addLink )
- this.linkElement.remove( true );
+ {
+ editor.getSelection().selectElement( this.linkElement );
+ editor.insertElement( this.imageElement );
+ }
}
},
@@ -347,4 +349,7 @@
if ( dialogType != 'image' )
this.hidePage( 'Link' ); //Hide Link tab.
+ var doc = this._.element.getDocument();
+ this.addFocusable( doc.getById( 'btnResetSize' ), 5 );
+ this.addFocusable( doc.getById( 'btnLockSizes' ), 5 );
},
onHide : function()
@@ -418,11 +423,16 @@
if ( type == IMAGE )
{
- var dialog = this.getDialog();
- var url = element.getAttribute( '_cke_saved_src' );
- if ( !url )
- url = element.getAttribute( 'src' );
- dialog.dontResetSize = true;
- this.setValue( url ); // And call this.onChange()
- this.focus();
+ var url = element.getAttribute( '_cke_saved_src' ) || element.getAttribute( 'src' );
+ var field = this;
+
+ this.getDialog().dontResetSize = true;
+
+ // In IE7 the dialog is being rendered improperly when loading
+ // an image with a long URL. So we need to delay it a bit. (#4122)
+ setTimeout( function()
+ {
+ field.setValue( url ); // And call this.onChange()
+ field.focus();
+ }, 0 );
}
},
@@ -507,4 +517,5 @@
{
type : 'text',
+ width: '40px',
id : 'txtWidth',
labelLayout : 'horizontal',
@@ -553,4 +564,5 @@
type : 'text',
id : 'txtHeight',
+ width: '40px',
labelLayout : 'horizontal',
label : editor.lang.image.height,
@@ -599,5 +611,5 @@
{
type : 'html',
- style : 'position:relative;top:10px;height:50px;',
+ style : 'margin-top:10px;width:40px;height:40px;',
onLoad : function()
{
@@ -613,9 +625,9 @@
resetButton.on( 'mouseover', function()
{
- this.addClass( 'BtnOver' );
+ this.addClass( 'cke_btn_over' );
}, resetButton );
resetButton.on( 'mouseout', function()
{
- this.removeClass( 'BtnOver' );
+ this.removeClass( 'cke_btn_over' );
}, resetButton );
}
@@ -641,17 +653,17 @@
ratioButton.on( 'mouseover', function()
{
- this.addClass( 'BtnOver' );
+ this.addClass( 'cke_btn_over' );
}, ratioButton );
ratioButton.on( 'mouseout', function()
{
- this.removeClass( 'BtnOver' );
+ this.removeClass( 'cke_btn_over' );
}, ratioButton );
}
},
html : '
'+
- '' +
- ''+
+ '' +
+ ''+
'
'
}
@@ -666,4 +678,5 @@
type : 'text',
id : 'txtBorder',
+ width: '60px',
labelLayout : 'horizontal',
label : editor.lang.image.border,
@@ -707,4 +720,5 @@
type : 'text',
id : 'txtHSpace',
+ width: '60px',
labelLayout : 'horizontal',
label : editor.lang.image.hSpace,
@@ -754,4 +768,5 @@
type : 'text',
id : 'txtVSpace',
+ width : '60px',
labelLayout : 'horizontal',
label : editor.lang.image.vSpace,
@@ -799,5 +814,5 @@
labelLayout : 'horizontal',
widths : [ '35%','65%' ],
- style : 'width:100%',
+ style : 'width:90px',
label : editor.lang.image.align,
'default' : '',
@@ -968,4 +983,5 @@
id : 'upload',
label : editor.lang.image.btnUpload,
+ style: 'height:40px',
size : 38
},
@@ -1010,5 +1026,5 @@
id : 'cmbLangDir',
type : 'select',
- style : 'width : 100%;',
+ style : 'width : 100px;',
label : editor.lang.common.langDir,
'default' : '',
Index: /CKEditor/branches/versions/3.0.x/_source/plugins/image/plugin.js
===================================================================
--- /CKEditor/branches/versions/3.0.x/_source/plugins/image/plugin.js (revision 4055)
+++ /CKEditor/branches/versions/3.0.x/_source/plugins/image/plugin.js (revision 4056)
@@ -55,3 +55,10 @@
} );
+/**
+ * Whether to remove links when emptying the link URL field in the image dialog.
+ * @type Boolean
+ * @default true
+ * @example
+ * config.image_removeLinkByEmptyURL = false;
+ */
CKEDITOR.config.image_removeLinkByEmptyURL = true;
Index: /CKEditor/branches/versions/3.0.x/_source/plugins/indent/plugin.js
===================================================================
--- /CKEditor/branches/versions/3.0.x/_source/plugins/indent/plugin.js (revision 4055)
+++ /CKEditor/branches/versions/3.0.x/_source/plugins/indent/plugin.js (revision 4056)
@@ -43,5 +43,5 @@
else
{
- while ( listItem && ( listItem = listItem.getPrevious() ) )
+ while ( listItem && ( listItem = listItem.getPrevious( CKEDITOR.dom.walker.whitespaces( true ) ) ) )
{
if ( listItem.getName && listItem.getName() == 'li' )
@@ -70,5 +70,5 @@
}
if ( ( this.name == 'outdent' && !indentStep ) ||
- ( this.name == 'indent' && indentStep == editor.config.indentClass.length ) )
+ ( this.name == 'indent' && indentStep == editor.config.indentClasses.length ) )
return setState.call( this, editor, CKEDITOR.TRISTATE_DISABLED );
return setState.call( this, editor, CKEDITOR.TRISTATE_OFF );
@@ -117,5 +117,5 @@
// possible about the surrounding lists, we need to feed it the further
// ancestor node that is still a list.
- var listParents = listNode.getParents();
+ var listParents = listNode.getParents( true );
for ( var i = 0 ; i < listParents.length ; i++ )
{
@@ -145,7 +145,48 @@
// And replace the old list with the new forest.
var newList = CKEDITOR.plugins.list.arrayToList( listArray, database, null, editor.config.enterMode, 0 );
+
+ // Avoid nested
after outdent even they're visually same,
+ // recording them for later refactoring.(#3982)
+ if ( this.name == 'outdent' )
+ {
+ var parentLiElement;
+ if ( ( parentLiElement = listNode.getParent() ) && parentLiElement.is( 'li' ) )
+ {
+ var children = newList.listNode.getChildren(),
+ pendingLis = [],
+ count = children.count(),
+ child;
+
+ for ( i = count - 1 ; i >= 0 ; i-- )
+ {
+ if( ( child = children.getItem( i ) ) && child.is && child.is( 'li' ) )
+ pendingLis.push( child );
+ }
+ }
+ }
+
if ( newList )
newList.listNode.replace( listNode );
+ // Move the nested
to be appeared after the parent.
+ if ( pendingLis && pendingLis.length )
+ {
+ for ( i = 0; i < pendingLis.length ; i++ )
+ {
+ var li = pendingLis[ i ],
+ followingList = li;
+
+ // Nest preceding
/ inside current
if any.
+ while( ( followingList = followingList.getNext() ) &&
+ followingList.is &&
+ followingList.getName() in listNodeNames )
+ {
+ li.append( followingList );
+ }
+
+ li.insertAfter( parentLiElement );
+ }
+ }
+
// Clean up the markers.
CKEDITOR.dom.element.clearAllMarkers( database );
@@ -154,7 +195,8 @@
function indentBlock( editor, range )
{
- var iterator = range.createIterator();
+ var iterator = range.createIterator(),
+ enterMode = editor.config.enterMode;
iterator.enforceRealBlocks = true;
-
+ iterator.enlargeBr = enterMode != CKEDITOR.ENTER_BR;
var block;
while ( ( block = iterator.getNextParagraph() ) )
Index: /CKEditor/branches/versions/3.0.x/_source/plugins/keystrokes/plugin.js
===================================================================
--- /CKEditor/branches/versions/3.0.x/_source/plugins/keystrokes/plugin.js (revision 4055)
+++ /CKEditor/branches/versions/3.0.x/_source/plugins/keystrokes/plugin.js (revision 4056)
@@ -148,9 +148,17 @@
/**
- * A list of keystrokes to be blocked if not defined in the {@link #keystrokes}
+ * A list of keystrokes to be blocked if not defined in the {@link CKEDITOR.config.keystrokes}
* setting. In this way it is possible to block the default browser behavior
* for those keystrokes.
* @type Array
+ * @default (see example)
* @example
+ * // This is actually the default value.
+ * config.blockedKeystrokes =
+ * [
+ * CKEDITOR.CTRL + 66 /*B*/,
+ * CKEDITOR.CTRL + 73 /*I*/,
+ * CKEDITOR.CTRL + 85 /*U*/
+ * ];
*/
CKEDITOR.config.blockedKeystrokes =
@@ -164,7 +172,28 @@
* A list associating keystrokes to editor commands. Each element in the list
* is an array where the first item is the keystroke, and the second is the
- * command to be executed.
+ * name of the command to be executed.
* @type Array
+ * @default (see example)
* @example
+ * // This is actually the default value.
+ * config.keystrokes =
+ * [
+ * [ CKEDITOR.ALT + 121 /*F10*/, 'toolbarFocus' ],
+ * [ CKEDITOR.ALT + 122 /*F11*/, 'elementsPathFocus' ],
+ *
+ * [ CKEDITOR.SHIFT + 121 /*F10*/, 'contextMenu' ],
+ *
+ * [ CKEDITOR.CTRL + 90 /*Z*/, 'undo' ],
+ * [ CKEDITOR.CTRL + 89 /*Y*/, 'redo' ],
+ * [ CKEDITOR.CTRL + CKEDITOR.SHIFT + 90 /*Z*/, 'redo' ],
+ *
+ * [ CKEDITOR.CTRL + 76 /*L*/, 'link' ],
+ *
+ * [ CKEDITOR.CTRL + 66 /*B*/, 'bold' ],
+ * [ CKEDITOR.CTRL + 73 /*I*/, 'italic' ],
+ * [ CKEDITOR.CTRL + 85 /*U*/, 'underline' ],
+ *
+ * [ CKEDITOR.ALT + 109 /*-*/, 'toolbarCollapse' ]
+ * ];
*/
CKEDITOR.config.keystrokes =
Index: /CKEditor/branches/versions/3.0.x/_source/plugins/link/dialogs/link.js
===================================================================
--- /CKEditor/branches/versions/3.0.x/_source/plugins/link/dialogs/link.js (revision 4055)
+++ /CKEditor/branches/versions/3.0.x/_source/plugins/link/dialogs/link.js (revision 4056)
@@ -829,5 +829,6 @@
id : 'upload',
label : editor.lang.common.upload,
- size : 38
+ style: 'height:40px',
+ size : 29
},
{
@@ -868,5 +869,5 @@
label : editor.lang.link.langDir,
'default' : '',
- style : 'width: 100%;',
+ style : 'width:110px',
items :
[
@@ -881,4 +882,5 @@
type : 'text',
id : 'advAccessKey',
+ width : '80px',
label : editor.lang.link.acccessKey,
maxLength : 1,
@@ -906,4 +908,5 @@
label : editor.lang.link.langCode,
id : 'advLangCode',
+ width : '110px',
'default' : '',
setup : setupAdvParams,
@@ -915,4 +918,5 @@
label : editor.lang.link.tabIndex,
id : 'advTabIndex',
+ width : '80px',
maxLength : 5,
setup : setupAdvParams,
@@ -1018,14 +1022,14 @@
selection.selectElement( element );
}
+ else if ( ( element = rangeRoot.getAscendant( 'img', true ) ) &&
+ element.getAttribute( '_cke_real_element_type' ) &&
+ element.getAttribute( '_cke_real_element_type' ) == 'anchor' )
+ {
+ this.fakeObj = element;
+ element = editor.restoreRealElement( this.fakeObj );
+ selection.selectElement( this.fakeObj );
+ }
else
- {
- element = rangeRoot.getAscendant( 'img', true );
- if ( element && element.getAttribute( '_cke_real_element_type' ) && element.getAttribute( '_cke_real_element_type' ) == 'anchor' )
- {
- this.fakeObj = element;
- element = editor.restoreRealElement( this.fakeObj );
- selection.selectElement( this.fakeObj );
- }
- }
+ element = null;
}
Index: /CKEditor/branches/versions/3.0.x/_source/plugins/list/plugin.js
===================================================================
--- /CKEditor/branches/versions/3.0.x/_source/plugins/list/plugin.js (revision 4055)
+++ /CKEditor/branches/versions/3.0.x/_source/plugins/list/plugin.js (revision 4056)
@@ -117,5 +117,6 @@
currentListItem.append( item.contents[i].clone( true, true ) );
- if ( currentListItem.type == CKEDITOR.NODE_DOCUMENT_FRAGMENT )
+ if ( currentListItem.type == CKEDITOR.NODE_DOCUMENT_FRAGMENT
+ && currentIndex != listArray.length - 1 )
{
if ( currentListItem.getLast()
@@ -177,7 +178,12 @@
function onSelectionChange( evt )
{
- var elements = evt.data.path.elements;
-
- for ( var i = 0 ; i < elements.length ; i++ )
+ var path = evt.data.path,
+ blockLimit = path.blockLimit,
+ elements = path.elements,
+ element;
+
+ // Grouping should only happen under blockLimit.(#3940).
+ for ( var i = 0 ; i < elements.length && ( element = elements[ i ] )
+ && !element.equals( blockLimit ); i++ )
{
if ( listNodeNames[ elements[i].getName() ] )
@@ -336,12 +342,21 @@
var newList = CKEDITOR.plugins.list.arrayToList( listArray, database, null, editor.config.enterMode );
- // If groupObj.root is the last element in its parent, or its nextSibling is a , then we should
- // not add a after the final item. So, check for the cases and trim the .
- if ( !groupObj.root.getNext() || groupObj.root.getNext().$.nodeName.toLowerCase() == 'br' )
- {
- if ( newList.listNode.getLast().$.nodeName.toLowerCase() == 'br' )
- newList.listNode.getLast().remove();
- }
- newList.listNode.replace( groupObj.root );
+
+ // Compensate before/after the list node if the surrounds are non-blocks.(#3836)
+ var docFragment = newList.listNode, boundaryNode, siblingNode;
+ function compensateBrs( isStart )
+ {
+ if ( ( boundaryNode = docFragment[ isStart ? 'getFirst' : 'getLast' ]() )
+ && !( boundaryNode.is && boundaryNode.isBlockBoundary() )
+ && ( siblingNode = groupObj.root[ isStart ? 'getPrevious' : 'getNext' ]
+ ( CKEDITOR.dom.walker.whitespaces( true ) ) )
+ && !( siblingNode.is && siblingNode.isBlockBoundary( { br : 1 } ) ) )
+ editor.document.createElement( 'br' )[ isStart ? 'insertBefore' : 'insertAfter' ]( boundaryNode );
+ }
+ compensateBrs( true );
+ compensateBrs();
+
+ var rootParent = groupObj.root.getParent();
+ docFragment.replace( groupObj.root );
}
@@ -388,4 +403,16 @@
selection.selectRanges( ranges );
}
+ // Maybe a single range there enclosing the whole list,
+ // turn on the list state manually(#4129).
+ else
+ {
+ var range = ranges.length == 1 && ranges[ 0 ],
+ enclosedNode = range && range.getEnclosedNode();
+ if ( enclosedNode && enclosedNode.is
+ && this.type == enclosedNode.getName() )
+ {
+ setState.call( this, editor, CKEDITOR.TRISTATE_ON );
+ }
+ }
}
@@ -399,10 +426,13 @@
while ( ranges.length > 0 )
{
- var range = ranges.shift(),
- boundaryNodes = range.getBoundaryNodes(),
+ range = ranges.shift();
+
+ var boundaryNodes = range.getBoundaryNodes(),
startNode = boundaryNodes.startNode,
endNode = boundaryNodes.endNode;
+
if ( startNode.type == CKEDITOR.NODE_ELEMENT && startNode.getName() == 'td' )
range.setStartAt( boundaryNodes.startNode, CKEDITOR.POSITION_AFTER_START );
+
if ( endNode.type == CKEDITOR.NODE_ELEMENT && endNode.getName() == 'td' )
range.setEndAt( boundaryNodes.endNode, CKEDITOR.POSITION_BEFORE_END );
@@ -410,4 +440,5 @@
var iterator = range.createIterator(),
block;
+
iterator.forceBrBreak = ( this.state == CKEDITOR.TRISTATE_OFF );
@@ -417,10 +448,11 @@
listNode = null,
processedFlag = false,
- blockLimit = path.blockLimit;
+ blockLimit = path.blockLimit,
+ element;
// First, try to group by a list ancestor.
- for ( var i = 0 ; i < path.elements.length ; i++ )
- {
- var element = path.elements[i];
+ for ( var i = 0 ; i < path.elements.length &&
+ ( element = path.elements[ i ] ) && !element.equals( blockLimit ); i++ )
+ {
if ( listNodeNames[ element.getName() ] )
{
@@ -487,10 +519,12 @@
( mergeSibling = function( rtl ){
- var sibling = listNode[ rtl ? 'getPrevious' : 'getNext' ].call( listNode, true );
+ var sibling = listNode[ rtl ?
+ 'getPrevious' : 'getNext' ]( CKEDITOR.dom.walker.whitespaces( true ) );
if ( sibling && sibling.getName &&
sibling.getName() == listCommand.type )
{
sibling.remove();
- sibling.moveChildren( listNode );
+ // Move children order by merge direction.(#3820)
+ sibling.moveChildren( listNode, rtl ? true : false );
}
} )();
Index: /CKEditor/branches/versions/3.0.x/_source/plugins/menu/plugin.js
===================================================================
--- /CKEditor/branches/versions/3.0.x/_source/plugins/menu/plugin.js (revision 4055)
+++ /CKEditor/branches/versions/3.0.x/_source/plugins/menu/plugin.js (revision 4056)
@@ -107,4 +107,10 @@
add : function( item )
{
+ // Later we may sort the items, but Array#sort is not stable in
+ // some browsers, here we're forcing the original sequence with
+ // 'order' attribute if it hasn't been assigned. (#3868)
+ if ( !item.order )
+ item.order = this.items.length;
+
this.items.push( item );
},
@@ -343,5 +349,25 @@
});
+/**
+ * The amount of time, in milliseconds, the editor waits before showing submenu
+ * options when moving the mouse over options that contains submenus, like the
+ * "Cell Properties" entry for tables.
+ * @type Number
+ * @default 400
+ * @example
+ * // Remove the submenu delay.
+ * config.menu_subMenuDelay = 0;
+ */
CKEDITOR.config.menu_subMenuDelay = 400;
+
+/**
+ * A comma separated list of items group names to be displayed in the context
+ * menu. The items order will reflect the order in this list if no priority
+ * has been definted in the groups.
+ * @type String
+ * @default 'clipboard,form,tablecell,tablecellproperties,tablerow,tablecolumn,table,anchor,link,image,flash,checkbox,radio,textfield,hiddenfield,imagebutton,button,select,textarea'
+ * @example
+ * config.menu_groups = 'clipboard,table,anchor,link,image';
+ */
CKEDITOR.config.menu_groups =
'clipboard,' +
Index: /CKEditor/branches/versions/3.0.x/_source/plugins/menubutton/plugin.js
===================================================================
--- /CKEditor/branches/versions/3.0.x/_source/plugins/menubutton/plugin.js (revision 4055)
+++ /CKEditor/branches/versions/3.0.x/_source/plugins/menubutton/plugin.js (revision 4056)
@@ -6,5 +6,5 @@
CKEDITOR.plugins.add( 'menubutton',
{
- requires : [ 'button' ],
+ requires : [ 'button', 'contextmenu' ],
beforeInit : function( editor )
{
Index: /CKEditor/branches/versions/3.0.x/_source/plugins/newpage/plugin.js
===================================================================
--- /CKEditor/branches/versions/3.0.x/_source/plugins/newpage/plugin.js (revision 4055)
+++ /CKEditor/branches/versions/3.0.x/_source/plugins/newpage/plugin.js (revision 4056)
@@ -56,4 +56,10 @@
}
});
-
+/**
+ * The HTML to load in the editor when the "new page" command is executed.
+ * @type String
+ * @default ''
+ * @example
+ * config.newpage_html = '<p>Type your text here.</p>';
+ */
CKEDITOR.config.newpage_html = '';
Index: /CKEditor/branches/versions/3.0.x/_source/plugins/panel/plugin.js
===================================================================
--- /CKEditor/branches/versions/3.0.x/_source/plugins/panel/plugin.js (revision 4055)
+++ /CKEditor/branches/versions/3.0.x/_source/plugins/panel/plugin.js (revision 4056)
@@ -79,5 +79,6 @@
'
' +
+ // iframe loading need sometime, keep the panel hidden(#4186).
+ ' style="display:none;z-index:' + ( editor.config.baseFloatZIndex + 1 ) + '">' +
'.' + className + '_container{visibility:hidden}' +
'' +
- '' +
+ '' +
'' +
// It looks strange, but for FF2, the styles must go
@@ -161,12 +169,4 @@
// Register the CKEDITOR global.
win.$.CKEDITOR = CKEDITOR;
-
- win.on( 'load', function( ev )
- {
- this.isLoaded = true;
- if ( this.onLoad )
- this.onLoad();
- },
- this);
doc.on( 'keydown', function( evt )
Index: /CKEditor/branches/versions/3.0.x/_source/plugins/pastefromword/dialogs/pastefromword.js
===================================================================
--- /CKEditor/branches/versions/3.0.x/_source/plugins/pastefromword/dialogs/pastefromword.js (revision 4055)
+++ /CKEditor/branches/versions/3.0.x/_source/plugins/pastefromword/dialogs/pastefromword.js (revision 4056)
@@ -19,4 +19,10 @@
+ 'var iframe = new window.parent.CKEDITOR.dom.element( frameElement );'
+ 'var dialog = iframe.getCustomData( "dialog" );'
+ + ''
+ + 'iframe.getFrameDocument().on( "keydown", function( e )\
+ {\
+ if ( e.data.getKeystroke() == 27 )\
+ dialog.hide();\
+ });'
+ 'dialog.fire( "iframeAdded", { iframe : iframe } );'
+ '};'
@@ -24,4 +30,7 @@
cleanWord : function( editor, html, ignoreFont, removeStyles )
{
+ // Remove comments [SF BUG-1481861].
+ html = html.replace(/<\!--[\s\S]*?-->/g, '' ) ;
+
html = html.replace(/\s*<\/o:p>/g, '') ;
html = html.replace(/[\s\S]*?<\/o:p>/g, ' ') ;
@@ -31,6 +40,6 @@
// Remove margin styles.
- html = html.replace( /\s*MARGIN: 0cm 0cm 0pt\s*;/gi, '' ) ;
- html = html.replace( /\s*MARGIN: 0cm 0cm 0pt\s*"/gi, "\"" ) ;
+ html = html.replace( /\s*MARGIN: 0(?:cm|in) 0(?:cm|in) 0pt\s*;/gi, '' ) ;
+ html = html.replace( /\s*MARGIN: 0(?:cm|in) 0(?:cm|in) 0pt\s*"/gi, "\"" ) ;
html = html.replace( /\s*TEXT-INDENT: 0cm\s*;/gi, '' ) ;
@@ -88,7 +97,4 @@
// Remove Tags with XML namespace declarations: <\/o:p>
html = html.replace(/<\/?\w+:[^>]*>/gi, '' ) ;
-
- // Remove comments [SF BUG-1481861].
- html = html.replace(/<\!--[\s\S]*?-->/g, '' ) ;
html = html.replace( /<(U|I|STRIKE)> <\/\1>/g, ' ' ) ;
@@ -228,4 +234,9 @@
this.getParentEditor().document.getBody().$.contentEditable = 'true';
},
+ onLoad : function()
+ {
+ if ( ( CKEDITOR.env.ie7Compat || CKEDITOR.env.ie6Compat ) && editor.lang.dir == 'rtl' )
+ this.parts.contents.setStyle( 'overflow', 'hidden' );
+ },
contents :
[
@@ -237,5 +248,5 @@
{
type : 'html',
- style : 'white-space: normal;',
+ style : 'white-space:normal;width:346px;display:block',
onShow : function()
{
@@ -280,10 +291,11 @@
id : 'ignoreFontFace',
label : editor.lang.pastefromword.ignoreFontFace,
- 'default' : true
+ 'default' : editor.config.pasteFromWordIgnoreFontFace
},
{
type : 'checkbox',
id : 'removeStyle',
- label : editor.lang.pastefromword.removeStyle
+ label : editor.lang.pastefromword.removeStyle,
+ 'default' : editor.config.pasteFromWordRemoveStyle
}
]
Index: /CKEditor/branches/versions/3.0.x/_source/plugins/pastefromword/plugin.js
===================================================================
--- /CKEditor/branches/versions/3.0.x/_source/plugins/pastefromword/plugin.js (revision 4055)
+++ /CKEditor/branches/versions/3.0.x/_source/plugins/pastefromword/plugin.js (revision 4056)
@@ -23,5 +23,32 @@
} );
+/**
+ * Whether the "Ignore font face definitions" checkbox is enabled by default in
+ * the Paste from Word dialog.
+ * @type Boolean
+ * @default true
+ * @example
+ * config.pasteFromWordIgnoreFontFace = false;
+ */
CKEDITOR.config.pasteFromWordIgnoreFontFace = true;
+
+/**
+ * Whether the "Remove styles definitions" checkbox is enabled by default in
+ * the Paste from Word dialog.
+ * @type Boolean
+ * @default false
+ * @example
+ * config.pasteFromWordRemoveStyle = true;
+ */
CKEDITOR.config.pasteFromWordRemoveStyle = false;
+
+/**
+ * Whether to keep structure markup (<h1>, <h2>, etc.) or replace
+ * it with elements that create more similar pasting results when pasting
+ * content from Microsoft Word into the Paste from Word dialog.
+ * @type Boolean
+ * @default false
+ * @example
+ * config.pasteFromWordKeepsStructure = true;
+ */
CKEDITOR.config.pasteFromWordKeepsStructure = false;
Index: /CKEditor/branches/versions/3.0.x/_source/plugins/pastetext/plugin.js
===================================================================
--- /CKEditor/branches/versions/3.0.x/_source/plugins/pastetext/plugin.js (revision 4055)
+++ /CKEditor/branches/versions/3.0.x/_source/plugins/pastetext/plugin.js (revision 4056)
@@ -47,6 +47,9 @@
editor.on( 'beforePaste', function( event )
{
- setTimeout( function() { command.exec(); }, 0 );
- event.cancel();
+ if ( editor.mode == "wysiwyg" )
+ {
+ setTimeout( function() { command.exec(); }, 0 );
+ event.cancel();
+ }
},
null, null, 20 );
@@ -128,3 +131,12 @@
};
+/**
+ * Whether to force all pasting operations to insert on plain text into the
+ * editor, loosing any formatting information possibly available in the source
+ * text.
+ * @type Boolean
+ * @default false
+ * @example
+ * config.forcePasteAsPlainText = true;
+ */
CKEDITOR.config.forcePasteAsPlainText = false;
Index: /CKEditor/branches/versions/3.0.x/_source/plugins/removeformat/plugin.js
===================================================================
--- /CKEditor/branches/versions/3.0.x/_source/plugins/removeformat/plugin.js (revision 4055)
+++ /CKEditor/branches/versions/3.0.x/_source/plugins/removeformat/plugin.js (revision 4056)
@@ -114,6 +114,19 @@
};
-// Only inline elements are valid.
+/**
+ * A comma separated list of elements to be removed when executing the "remove
+ " format" command. Note that only inline elements are allowed.
+ * @type String
+ * @default 'b,big,code,del,dfn,em,font,i,ins,kbd,q,samp,small,span,strike,strong,sub,sup,tt,u,var'
+ * @example
+ */
CKEDITOR.config.removeFormatTags = 'b,big,code,del,dfn,em,font,i,ins,kbd,q,samp,small,span,strike,strong,sub,sup,tt,u,var';
+/**
+ * A comma separated list of elements attributes to be removed when executing
+ * the "remove format" command.
+ * @type String
+ * @default 'class,style,lang,width,height,align,hspace,valign'
+ * @example
+ */
CKEDITOR.config.removeFormatAttributes = 'class,style,lang,width,height,align,hspace,valign';
Index: /CKEditor/branches/versions/3.0.x/_source/plugins/resize/plugin.js
===================================================================
--- /CKEditor/branches/versions/3.0.x/_source/plugins/resize/plugin.js (revision 4055)
+++ /CKEditor/branches/versions/3.0.x/_source/plugins/resize/plugin.js (revision 4056)
@@ -70,7 +70,46 @@
} );
+/**
+ * The minimum editor width, in pixels, when resizing it with the resize handle.
+ * @type Number
+ * @default 750
+ * @example
+ * config.resize_minWidth = 500;
+ */
CKEDITOR.config.resize_minWidth = 750;
+
+/**
+ * The minimum editor height, in pixels, when resizing it with the resize handle.
+ * @type Number
+ * @default 250
+ * @example
+ * config.resize_minHeight = 600;
+ */
CKEDITOR.config.resize_minHeight = 250;
+
+/**
+ * The maximum editor width, in pixels, when resizing it with the resize handle.
+ * @type Number
+ * @default 3000
+ * @example
+ * config.resize_maxWidth = 750;
+ */
CKEDITOR.config.resize_maxWidth = 3000;
+
+/**
+ * The maximum editor height, in pixels, when resizing it with the resize handle.
+ * @type Number
+ * @default 3000
+ * @example
+ * config.resize_maxHeight = 600;
+ */
CKEDITOR.config.resize_maxHeight = 3000;
+
+/**
+ * Whether to enable the resizing feature. If disabed the resize handler will not be visible.
+ * @type Boolean
+ * @default true
+ * @example
+ * config.resize_enabled = false;
+ */
CKEDITOR.config.resize_enabled = true;
Index: /CKEditor/branches/versions/3.0.x/_source/plugins/scayt/dialogs/options.js
===================================================================
--- /CKEditor/branches/versions/3.0.x/_source/plugins/scayt/dialogs/options.js (revision 4055)
+++ /CKEditor/branches/versions/3.0.x/_source/plugins/scayt/dialogs/options.js (revision 4056)
@@ -9,5 +9,8 @@
captions,
doc = CKEDITOR.document,
- fckLang = 'en';
+ tags = [],
+ i,
+ contents = [],
+ userDicActive = false;
var dic_buttons = [
// [0] contains buttons for creating
@@ -16,365 +19,5 @@
"dic_rename,dic_delete"
];
-
- var init_with_captions = function()
- {
- var dialog = this,
- lang_list = dialog.data.scayt.getLangList(),
- buttons = [ 'dic_create','dic_delete','dic_rename','dic_restore' ],
- labels = [ 'mixedCase','mixedWithDigits','allCaps','ignoreDomainNames' ],
- i;
-
- // Add buttons titles
- for ( i in buttons )
- {
- var button = buttons[ i ];
- doc.getById( button ).setHtml( '' + captions[ 'button_' + button] +'' );
- }
- doc.getById( 'dic_info' ).setHtml( captions[ 'dic_info' ] );
-
- // Fill options and dictionary labels.
- for ( i in labels )
- {
- var label = 'label_' + labels[ i ],
- labelElement = doc.getById( label );
-
- if ( 'undefined' != typeof labelElement
- && 'undefined' != typeof captions[ label ]
- && 'undefined' != typeof dialog.options[labels[ i ]] )
- {
- labelElement.setHtml( captions[ label ] );
- var labelParent = labelElement.getParent();
- labelParent.$.style.display = "block";
- }
- }
-
- var about = '