struts-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lukaszlen...@apache.org
Subject [23/50] struts git commit: Moves deprecated plugins to struts-archive repo
Date Fri, 22 May 2015 10:58:50 GMT
http://git-wip-us.apache.org/repos/asf/struts/blob/17d73d21/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/widget/Dialog.js
----------------------------------------------------------------------
diff --git a/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/widget/Dialog.js b/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/widget/Dialog.js
deleted file mode 100644
index 51d31ad..0000000
--- a/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/widget/Dialog.js
+++ /dev/null
@@ -1,300 +0,0 @@
-/*
-	Copyright (c) 2004-2006, The Dojo Foundation
-	All Rights Reserved.
-
-	Licensed under the Academic Free License version 2.1 or above OR the
-	modified BSD license. For more information on Dojo licensing, see:
-
-		http://dojotoolkit.org/community/licensing.shtml
-*/
-
-
-
-dojo.provide("dojo.widget.Dialog");
-dojo.require("dojo.widget.*");
-dojo.require("dojo.widget.ContentPane");
-dojo.require("dojo.event.*");
-dojo.require("dojo.gfx.color");
-dojo.require("dojo.html.layout");
-dojo.require("dojo.html.display");
-dojo.require("dojo.html.iframe");
-dojo.declare("dojo.widget.ModalDialogBase", null, {isContainer:true, focusElement:"", bgColor:"black", bgOpacity:0.4, followScroll:true, closeOnBackgroundClick:false, trapTabs:function (e) {
-	if (e.target == this.tabStartOuter) {
-		if (this._fromTrap) {
-			this.tabStart.focus();
-			this._fromTrap = false;
-		} else {
-			this._fromTrap = true;
-			this.tabEnd.focus();
-		}
-	} else {
-		if (e.target == this.tabStart) {
-			if (this._fromTrap) {
-				this._fromTrap = false;
-			} else {
-				this._fromTrap = true;
-				this.tabEnd.focus();
-			}
-		} else {
-			if (e.target == this.tabEndOuter) {
-				if (this._fromTrap) {
-					this.tabEnd.focus();
-					this._fromTrap = false;
-				} else {
-					this._fromTrap = true;
-					this.tabStart.focus();
-				}
-			} else {
-				if (e.target == this.tabEnd) {
-					if (this._fromTrap) {
-						this._fromTrap = false;
-					} else {
-						this._fromTrap = true;
-						this.tabStart.focus();
-					}
-				}
-			}
-		}
-	}
-}, clearTrap:function (e) {
-	var _this = this;
-	setTimeout(function () {
-		_this._fromTrap = false;
-	}, 100);
-}, postCreate:function () {
-	with (this.domNode.style) {
-		position = "absolute";
-		zIndex = 999;
-		display = "none";
-		overflow = "visible";
-	}
-	var b = dojo.body();
-	b.appendChild(this.domNode);
-	this.bg = document.createElement("div");
-	this.bg.className = "dialogUnderlay";
-	with (this.bg.style) {
-		position = "absolute";
-		left = top = "0px";
-		zIndex = 998;
-		display = "none";
-	}
-	b.appendChild(this.bg);
-	this.setBackgroundColor(this.bgColor);
-	this.bgIframe = new dojo.html.BackgroundIframe();
-	if (this.bgIframe.iframe) {
-		with (this.bgIframe.iframe.style) {
-			position = "absolute";
-			left = top = "0px";
-			zIndex = 90;
-			display = "none";
-		}
-	}
-	if (this.closeOnBackgroundClick) {
-		dojo.event.kwConnect({srcObj:this.bg, srcFunc:"onclick", adviceObj:this, adviceFunc:"onBackgroundClick", once:true});
-	}
-}, uninitialize:function () {
-	this.bgIframe.remove();
-	dojo.html.removeNode(this.bg, true);
-}, setBackgroundColor:function (color) {
-	if (arguments.length >= 3) {
-		color = new dojo.gfx.color.Color(arguments[0], arguments[1], arguments[2]);
-	} else {
-		color = new dojo.gfx.color.Color(color);
-	}
-	this.bg.style.backgroundColor = color.toString();
-	return this.bgColor = color;
-}, setBackgroundOpacity:function (op) {
-	if (arguments.length == 0) {
-		op = this.bgOpacity;
-	}
-	dojo.html.setOpacity(this.bg, op);
-	try {
-		this.bgOpacity = dojo.html.getOpacity(this.bg);
-	}
-	catch (e) {
-		this.bgOpacity = op;
-	}
-	return this.bgOpacity;
-}, _sizeBackground:function () {
-	if (this.bgOpacity > 0) {
-		var viewport = dojo.html.getViewport();
-		var h = viewport.height;
-		var w = viewport.width;
-		with (this.bg.style) {
-			width = w + "px";
-			height = h + "px";
-		}
-		var scroll_offset = dojo.html.getScroll().offset;
-		this.bg.style.top = scroll_offset.y + "px";
-		this.bg.style.left = scroll_offset.x + "px";
-		var viewport = dojo.html.getViewport();
-		if (viewport.width != w) {
-			this.bg.style.width = viewport.width + "px";
-		}
-		if (viewport.height != h) {
-			this.bg.style.height = viewport.height + "px";
-		}
-	}
-	this.bgIframe.size(this.bg);
-}, _showBackground:function () {
-	if (this.bgOpacity > 0) {
-		this.bg.style.display = "block";
-	}
-	if (this.bgIframe.iframe) {
-		this.bgIframe.iframe.style.display = "block";
-	}
-}, placeModalDialog:function () {
-	var scroll_offset = dojo.html.getScroll().offset;
-	var viewport_size = dojo.html.getViewport();
-	var mb;
-	if (this.isShowing()) {
-		mb = dojo.html.getMarginBox(this.domNode);
-	} else {
-		dojo.html.setVisibility(this.domNode, false);
-		dojo.html.show(this.domNode);
-		mb = dojo.html.getMarginBox(this.domNode);
-		dojo.html.hide(this.domNode);
-		dojo.html.setVisibility(this.domNode, true);
-	}
-	var x = scroll_offset.x + (viewport_size.width - mb.width) / 2;
-	var y = scroll_offset.y + (viewport_size.height - mb.height) / 2;
-	with (this.domNode.style) {
-		left = x + "px";
-		top = y + "px";
-	}
-}, _onKey:function (evt) {
-	if (evt.key) {
-		var node = evt.target;
-		while (node != null) {
-			if (node == this.domNode) {
-				return;
-			}
-			node = node.parentNode;
-		}
-		if (evt.key != evt.KEY_TAB) {
-			dojo.event.browser.stopEvent(evt);
-		} else {
-			if (!dojo.render.html.opera) {
-				try {
-					this.tabStart.focus();
-				}
-				catch (e) {
-				}
-			}
-		}
-	}
-}, showModalDialog:function () {
-	if (this.followScroll && !this._scrollConnected) {
-		this._scrollConnected = true;
-		dojo.event.connect(window, "onscroll", this, "_onScroll");
-	}
-	dojo.event.connect(document.documentElement, "onkey", this, "_onKey");
-	this.placeModalDialog();
-	this.setBackgroundOpacity();
-	this._sizeBackground();
-	this._showBackground();
-	this._fromTrap = true;
-	setTimeout(dojo.lang.hitch(this, function () {
-		try {
-			this.tabStart.focus();
-		}
-		catch (e) {
-		}
-	}), 50);
-}, hideModalDialog:function () {
-	if (this.focusElement) {
-		dojo.byId(this.focusElement).focus();
-		dojo.byId(this.focusElement).blur();
-	}
-	this.bg.style.display = "none";
-	this.bg.style.width = this.bg.style.height = "1px";
-	if (this.bgIframe.iframe) {
-		this.bgIframe.iframe.style.display = "none";
-	}
-	dojo.event.disconnect(document.documentElement, "onkey", this, "_onKey");
-	if (this._scrollConnected) {
-		this._scrollConnected = false;
-		dojo.event.disconnect(window, "onscroll", this, "_onScroll");
-	}
-}, _onScroll:function () {
-	var scroll_offset = dojo.html.getScroll().offset;
-	this.bg.style.top = scroll_offset.y + "px";
-	this.bg.style.left = scroll_offset.x + "px";
-	this.placeModalDialog();
-}, checkSize:function () {
-	if (this.isShowing()) {
-		this._sizeBackground();
-		this.placeModalDialog();
-		this.onResized();
-	}
-}, onBackgroundClick:function () {
-	if (this.lifetime - this.timeRemaining >= this.blockDuration) {
-		return;
-	}
-	this.hide();
-}});
-dojo.widget.defineWidget("dojo.widget.Dialog", [dojo.widget.ContentPane, dojo.widget.ModalDialogBase], {templateString:"<div id=\"${this.widgetId}\" class=\"dojoDialog\" dojoattachpoint=\"wrapper\">\n\t<span dojoattachpoint=\"tabStartOuter\" dojoonfocus=\"trapTabs\" dojoonblur=\"clearTrap\"\ttabindex=\"0\"></span>\n\t<span dojoattachpoint=\"tabStart\" dojoonfocus=\"trapTabs\" dojoonblur=\"clearTrap\" tabindex=\"0\"></span>\n\t<div dojoattachpoint=\"containerNode\" style=\"position: relative; z-index: 2;\"></div>\n\t<span dojoattachpoint=\"tabEnd\" dojoonfocus=\"trapTabs\" dojoonblur=\"clearTrap\" tabindex=\"0\"></span>\n\t<span dojoattachpoint=\"tabEndOuter\" dojoonfocus=\"trapTabs\" dojoonblur=\"clearTrap\" tabindex=\"0\"></span>\n</div>\n", blockDuration:0, lifetime:0, closeNode:"", postMixInProperties:function () {
-	dojo.widget.Dialog.superclass.postMixInProperties.apply(this, arguments);
-	if (this.closeNode) {
-		this.setCloseControl(this.closeNode);
-	}
-}, postCreate:function () {
-	dojo.widget.Dialog.superclass.postCreate.apply(this, arguments);
-	dojo.widget.ModalDialogBase.prototype.postCreate.apply(this, arguments);
-}, show:function () {
-	if (this.lifetime) {
-		this.timeRemaining = this.lifetime;
-		if (this.timerNode) {
-			this.timerNode.innerHTML = Math.ceil(this.timeRemaining / 1000);
-		}
-		if (this.blockDuration && this.closeNode) {
-			if (this.lifetime > this.blockDuration) {
-				this.closeNode.style.visibility = "hidden";
-			} else {
-				this.closeNode.style.display = "none";
-			}
-		}
-		if (this.timer) {
-			clearInterval(this.timer);
-		}
-		this.timer = setInterval(dojo.lang.hitch(this, "_onTick"), 100);
-	}
-	this.showModalDialog();
-	dojo.widget.Dialog.superclass.show.call(this);
-}, onLoad:function () {
-	this.placeModalDialog();
-	dojo.widget.Dialog.superclass.onLoad.call(this);
-}, fillInTemplate:function () {
-}, hide:function () {
-	this.hideModalDialog();
-	dojo.widget.Dialog.superclass.hide.call(this);
-	if (this.timer) {
-		clearInterval(this.timer);
-	}
-}, setTimerNode:function (node) {
-	this.timerNode = node;
-}, setCloseControl:function (node) {
-	this.closeNode = dojo.byId(node);
-	dojo.event.connect(this.closeNode, "onclick", this, "hide");
-}, setShowControl:function (node) {
-	node = dojo.byId(node);
-	dojo.event.connect(node, "onclick", this, "show");
-}, _onTick:function () {
-	if (this.timer) {
-		this.timeRemaining -= 100;
-		if (this.lifetime - this.timeRemaining >= this.blockDuration) {
-			if (this.closeNode) {
-				this.closeNode.style.visibility = "visible";
-			}
-		}
-		if (!this.timeRemaining) {
-			clearInterval(this.timer);
-			this.hide();
-		} else {
-			if (this.timerNode) {
-				this.timerNode.innerHTML = Math.ceil(this.timeRemaining / 1000);
-			}
-		}
-	}
-}});
-

http://git-wip-us.apache.org/repos/asf/struts/blob/17d73d21/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/widget/DocPane.js
----------------------------------------------------------------------
diff --git a/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/widget/DocPane.js b/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/widget/DocPane.js
deleted file mode 100644
index 2e381cd..0000000
--- a/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/widget/DocPane.js
+++ /dev/null
@@ -1,262 +0,0 @@
-/*
-	Copyright (c) 2004-2006, The Dojo Foundation
-	All Rights Reserved.
-
-	Licensed under the Academic Free License version 2.1 or above OR the
-	modified BSD license. For more information on Dojo licensing, see:
-
-		http://dojotoolkit.org/community/licensing.shtml
-*/
-
-
-
-dojo.provide("dojo.widget.DocPane");
-dojo.require("dojo.widget.*");
-dojo.require("dojo.io.*");
-dojo.require("dojo.event.*");
-dojo.require("dojo.widget.HtmlWidget");
-dojo.require("dojo.widget.Editor2");
-dojo.require("dojo.widget.Dialog");
-dojo.require("dojo.html.common");
-dojo.require("dojo.html.display");
-dojo.widget.DocPane = function () {
-	dojo.event.topic.subscribe("/docs/function/results", this, "onDocResults");
-	dojo.event.topic.subscribe("/docs/package/results", this, "onPkgResults");
-	dojo.event.topic.subscribe("/docs/function/detail", this, "onDocSelectFunction");
-};
-dojo.widget.defineWidget("dojo.widget.DocPane", dojo.widget.HtmlWidget, {dialog:null, dialogBg:null, dialogFg:null, logIn:null, edit:null, save:null, cancel:null, detail:null, result:null, packag:null, fn:null, fnLink:null, count:null, row:null, summary:null, description:null, variables:null, vRow:null, vLink:null, vDesc:null, methods:null, mRow:null, mLink:null, mDesc:null, requires:null, rRow:null, rRow2:null, rH3:null, rLink:null, parameters:null, pRow:null, pLink:null, pDesc:null, pOpt:null, pType:null, sType:null, sName:null, sParams:null, sPType:null, sPTypeSave:null, sPName:null, sPNameSave:null, pkgDescription:null, _appends:[], templateString:"<div class=\"dojoDocPane\">\n\t<div dojoAttachPoint=\"containerNode\" class=\"container\"></div>\n\n\t<div dojoAttachPoint=\"dialog\" class=\"dialog\">\n\t\t<div class=\"container\" dojoAttachPoint=\"dialogBg\">\n\t\t\t<div class=\"docDialog\" dojoAttachPoint=\"dialogFg\">\n\t\t\t\t<h2>Log In</h2>\n\t\t\t\t<p><input id=\"dojoDocUserNa
 me\" dojoAttachPoint=\"userName\"><label for=\"dojoDocUserName\">User Name:</label></p>\n\t\t\t\t<p><input id=\"dojoDocPassword\" dojoAttachPoint=\"password\" type=\"password\"><label for=\"dojoDocPassword\">Password:</label></p>\n\t\t\t\t<p><input type=\"button\" dojoAttachPoint=\"cancel\" value=\"cancel\"> <input type=\"button\" dojoAttachPoint=\"logIn\" value=\"Log In\"></p>\n\t\t\t\t<p></p>\n\t\t\t</div>\n\t\t</div>\n\t</div>\n\n\t<div dojoAttachPoint=\"nav\" class=\"nav\"><span>Detail</span> | <span>Source</span> | <span>Examples</span> | <span>Walkthrough</span></div>\n\n\t<div dojoAttachPoint=\"detail\" class=\"detail\">\n\t\t<h1>Detail: <span class=\"fn\" dojoAttachPoint=\"fn\">dojo.select</span></h1>\n\t\t<div class=\"description\" dojoAttachPoint=\"description\">Description</div>\n\t\t<div class=\"params\" dojoAttachPoint=\"parameters\">\n\t\t\t<h2>Parameters</h2>\n\t\t\t<div class=\"row\" dojoAttachPoint=\"pRow\">\n\t\t\t\t<span dojoAttachPoint=\"pOpt\"><em>optional</em> 
 </span>\n\t\t\t\t<span><span dojoAttachPoint=\"pType\">type</span> </span>\n\t\t\t\t<a href=\"#\" dojoAttachPoint=\"pLink\">variable</a>\n\t\t\t\t<span> - <span dojoAttachPoint=\"pDesc\"></span></span>\n\t\t\t</div>\n\t\t</div>\n\t\t<div class=\"variables\" dojoAttachPoint=\"variables\">\n\t\t\t<h2>Variables</h2>\n\t\t\t<div class\"row\" dojoAttachPoint=\"vRow\">\n\t\t\t\t<a href=\"#\" dojoAttachPoint=\"vLink\">variable</a><span> - <span dojoAttachPoint=\"vDesc\"></span></span>\n\t\t\t</div>\n\t\t</div>\n\t\t<div class=\"signature\">\n\t\t\t<h2>Signature</h2>\n\t\t\t<div class=\"source\">\n\t\t\t\t<span class=\"return\" dojoAttachPoint=\"sType\">returnType</span> \n\t\t\t\t<span class=\"function\" dojoAttachPoint=\"sName\">foo</span>\n\t\t\t\t(<span class=\"params\" dojoAttachPoint=\"sParams\">\n\t\t\t\t\t<span class=\"type\" dojoAttachPoint=\"sPType\">type </span>\n\t\t\t\t\t<span class=\"name\" dojoAttachPoint=\"sPName\">paramName</span>\n\t\t\t\t</span>)\n\t\t\t</div>\n\t\t</div>
 \n\t</div>\n\t\n\t<div dojoAttachPoint=\"result\" class=\"result\">\n\t\t<h1>Search Results: <span dojoAttachPoint=\"count\">0</span> matches</h1>\n\t\t<div class=\"row\" dojoAttachPoint=\"row\">\n\t\t\t<a href=\"#\" dojoAttachPoint=\"fnLink\">dojo.fnLink</a>\n\t\t\t<span> - <span class=\"summary\" dojoAttachPoint=\"summary\">summary</span></span>\n\t\t</div>\n\t</div>\n\n\t<div dojoAttachPoint=\"packag\" class=\"package\">\n\t\t<h1>Package: \n\t\t\t<span class=\"pkg\" dojoAttachPoint=\"pkg\">dojo.package</span> \n\t\t\t<span class=\"edit\" dojoAttachPoint=\"edit\">[edit]</span> \n\t\t\t<span class=\"save\" dojoAttachPoint=\"save\">[save]</span>\n\t\t</h1>\n\t\t<div dojoAttachPoint=\"pkgDescription\" class=\"description\">Description</div>\n\t\t<div class=\"methods\" dojoAttachPoint=\"methods\">\n\t\t\t<h2>Methods</h2>\n\t\t\t<div class=\"row\" dojoAttachPoint=\"mRow\">\n\t\t\t\t<a href=\"#\" dojoAttachPoint=\"mLink\">method</a>\n\t\t\t\t<span> - <span class=\"description\" dojoAtta
 chPoint=\"mDesc\"></span></span>\n\t\t\t</div>\n\t\t</div>\n\t\t<div class=\"requires\" dojoAttachPoint=\"requires\">\n\t\t\t<h2>Requires</h2>\n\t\t\t<div class=\"row\" dojoAttachPoint=\"rRow\">\n\t\t\t\t<h3 dojoAttachPoint=\"rH3\">Environment</h3>\n\t\t\t\t<div dojoAttachPoint=\"rRow2\"><a href=\"#\" dojoAttachPoint=\"rLink\" class=\"package\">require</a></div>\n\t\t\t</div>\n\t\t</div>\n\t</div>\n</div>\n", templateCssString:".dojoDocPane { padding:1em; font: 1em Georgia,Times,\"Times New Roman\",serif; }\n\n.dojoDocPane .container{ }\n\n.dojoDocPane .dialog{ }\n.dojoDocPane .dialog .container{ padding: 0.5em; background: #fff; border: 2px solid #333; }\n.dojoDocPane .dialog .docDialog{ background: transparent; width: 20em; }\n.dojoDocPane .dialog .docDialog h2{ margin-top: 0; padding-top: 0; }\n.dojoDocPane .dialog .docDialog input { float: right; margin-right: 1em; }\n.dojoDocPane .dialog .docDialog p{ clear: both; }\n#dojoDocUserName, #dojoDocPassword { width: 10em; }\n\n.dojoD
 ocPane .nav{ }\n.dojoDocPane .nav span{ }\n\n.dojoDocPane .detail{ }\n.dojoDocPane .detail h1{ }\n.dojoDocPane .detail h1 span.fn{ }\n.dojoDocPane .detail .description{ }\n.dojoDocPane .detail .params{ }\n.dojoDocPane .detail .params .row{ }\n.dojoDocPane .detail .params .row span{ }\n.dojoDocPane .detail .variables{ }\n.dojoDocPane .detail .variables .row{ }\n.dojoDocPane .detail .signature{ }\n.dojoDocPane .detail .signature .source{ white-space: pre; font: 0.8em Monaco, Courier, \"Courier New\", monospace; }\n.dojoDocPane .detail .signature .source .return{ color:#369; }\n.dojoDocPane .detail .signature .source .function{ color: #98543F; font-weight: bold; }\n.dojoDocPane .detail .signature .source .params{ }\n.dojoDocPane .detail .signature .source .params .type{ font-style: italic; color: #d17575; }\n.dojoDocPane .detail .signature .source .params .name{ color: #d14040; }\n\n.dojoDocPane .result{ }\n.dojoDocPane .result h1{ }\n.dojoDocPane .result .row{ }\n.dojoDocPane .result 
 .row .summary{ }\n\n.dojoDocPane .package{ }\n.dojoDocPane .package h1{ }\n.dojoDocPane .package .row{ }\n.dojoDocPane .package .row .summary{ }\n.dojoDocPane .package .description{ }\n.dojoDocPane .package .methods{ }\n.dojoDocPane .package .methods h2{ }\n.dojoDocPane .package .methods .row{ }\n.dojoDocPane .package .methods .row .description{ }\n.dojoDocPane .package .requires{ }\n.dojoDocPane .package .requires h2{ }\n.dojoDocPane .package .requires .row{ }\n", templateCssPath:dojo.uri.moduleUri("dojo.widget", "templates/DocPane.css"), isContainer:true, fillInTemplate:function () {
-	this.requires = dojo.html.removeNode(this.requires);
-	this.rRow.style.display = "none";
-	this.rRow2.style.display = "none";
-	this.methods = dojo.html.removeNode(this.methods);
-	this.mRow.style.display = "none";
-	this.dialog = dojo.widget.createWidget("dialog", {}, this.dialog);
-	this.dialog.setCloseControl(this.cancel);
-	dojo.html.setOpacity(this.dialogBg, 0.8);
-	dojo.html.setOpacity(this.dialogFg, 1);
-	dojo.event.connect(this.edit, "onclick", dojo.lang.hitch(this, function () {
-		if (!this._isLoggedIn) {
-			this.dialog.show();
-		}
-	}));
-	dojo.event.connect(this.logIn, "onclick", this, "_logIn");
-	dojo.event.connect(this.save, "onclick", this, "_save");
-	dojo.event.connect(dojo.docs, "logInSuccess", this, "_loggedIn");
-	this.homeSave = this.containerNode.cloneNode(true);
-	this.detailSave = dojo.html.removeNode(this.detail);
-	this.resultSave = dojo.html.removeNode(this.result);
-	this.packageSave = dojo.html.removeNode(this.packag);
-	this.results = dojo.html.removeNode(this.results);
-	this.rowParent = this.row.parentNode;
-	this.rowSave = dojo.html.removeNode(this.row);
-	this.vParent = this.vRow.parentNode;
-	this.vSave = dojo.html.removeNode(this.vRow);
-	this.pParent = this.pRow.parentNode;
-	this.pSave = dojo.html.removeNode(this.pRow);
-	this.sPTypeSave = dojo.html.removeNode(this.sPType);
-	this.sPNameSave = dojo.html.removeNode(this.sPName);
-	this.navSave = dojo.html.removeNode(this.nav);
-}, _logIn:function () {
-	dojo.docs.setUserName(this.userName.value);
-	dojo.docs.setPassword(this.password.value);
-}, _loggedIn:function () {
-	this._isLoggedIn = true;
-	this.dialog.hide();
-	this.pkgEditor = dojo.widget.createWidget("editor2", {toolbarAlwaysVisible:true}, this.pkgDescription);
-}, _save:function () {
-	if (this.pkgEditor) {
-		dojo.docs.savePackage(this._pkgPath, {description:this.pkgEditor.getEditorContent()});
-	}
-}, onDocSelectFunction:function (message) {
-	dojo.debug("onDocSelectFunction()");
-	for (var key in message) {
-		dojo.debug(key + ": " + dojo.json.serialize(message[key]));
-	}
-	var meta = message.meta;
-	if (meta) {
-		var variables = meta.variables;
-		var this_variables = meta.this_variables;
-		var child_variables = meta.child_variables;
-		var parameters = meta.parameters;
-	}
-	var doc = message.doc;
-	dojo.debug(dojo.json.serialize(doc));
-	var appends = this._appends;
-	dojo.html.removeChildren(this.domNode);
-	this.fn.innerHTML = message.name;
-	this.variables.style.display = "block";
-	var all = [];
-	if (variables) {
-		all = variables;
-	}
-	if (this_variables) {
-		all = all.concat(this_variables);
-	}
-	if (child_variables) {
-		all = all.concat(child_variables);
-	}
-	if (!all.length) {
-		this.variables.style.display = "none";
-	} else {
-		for (var i = 0, one; one = all[i]; i++) {
-			this.vLink.innerHTML = one;
-			this.vDesc.parentNode.style.display = "none";
-			appends.push(this.vParent.appendChild(this.vSave.cloneNode(true)));
-		}
-	}
-	this.sParams.innerHTML = "";
-	var first = true;
-	for (var param in parameters) {
-		var paramType = parameters[param].type;
-		var paramSummary = parameters[param].summary;
-		var paramName = param;
-		this.parameters.style.display = "block";
-		this.pLink.innerHTML = paramName;
-		this.pOpt.style.display = "none";
-		if (parameters[param].opt) {
-			this.pOpt.style.display = "inline";
-		}
-		this.pType.parentNode.style.display = "none";
-		if (parameters[param][0]) {
-			this.pType.parentNode.style.display = "inline";
-			this.pType.innerHTML = paramType;
-		}
-		this.pDesc.parentNode.style.display = "none";
-		if (paramSummary) {
-			this.pDesc.parentNode.style.display = "inline";
-			this.pDesc.innerHTML = paramSummary;
-		}
-		appends.push(this.pParent.appendChild(this.pSave.cloneNode(true)));
-		if (!first) {
-			this.sParams.appendChild(document.createTextNode(", "));
-		}
-		first = false;
-		if (paramType) {
-			dojo.debug(this.sPTypeSave);
-			this.sPTypeSave.innerHTML = paramType;
-			this.sParams.appendChild(this.sPTypeSave.cloneNode(true));
-			this.sParams.appendChild(document.createTextNode(" "));
-		}
-		dojo.debug(this.sPNameSave);
-		this.sPNameSave.innerHTML = paramName;
-		this.sParams.appendChild(this.sPNameSave.cloneNode(true));
-	}
-	if (message.returns) {
-		this.sType.innerHTML = message.returns;
-	} else {
-		this.sType.innerHTML = "void";
-	}
-	this.sName.innerHTML = message.name;
-	this.domNode.appendChild(this.navSave);
-	this.domNode.appendChild(this.detailSave.cloneNode(true));
-	for (var i = 0, append; append = appends[i]; i++) {
-		dojo.html.removeNode(append);
-	}
-}, onPkgResult:function (results) {
-	if (this.pkgEditor) {
-		this.pkgEditor.close(true);
-		dojo.debug(this.pkgDescription);
-	}
-	var methods = results.methods;
-	var requires = results.requires;
-	var description = results.description;
-	this._pkgPath = results.path;
-	var requireLinks = [];
-	var appends = this._appends;
-	while (appends.length) {
-		dojo.html.removeNode(appends.shift());
-	}
-	dojo.html.removeChildren(this.domNode);
-	this.pkg.innerHTML = results.pkg;
-	var hasRequires = false;
-	for (var env in requires) {
-		hasRequires = true;
-		this.rH3.style.display = "none";
-		if (env != "common") {
-			this.rH3.style.display = "";
-			this.rH3.innerHTML = env;
-		}
-		for (var i = 0, require; require = requires[env][i]; i++) {
-			requireLinks.push({name:require});
-			this.rLink.innerHTML = require;
-			this.rLink.href = "#" + require;
-			var rRow2 = this.rRow2.parentNode.insertBefore(this.rRow2.cloneNode(true), this.rRow2);
-			rRow2.style.display = "";
-			appends.push(rRow2);
-		}
-		var rRow = this.rRow.parentNode.insertBefore(this.rRow.cloneNode(true), this.rRow);
-		rRow.style.display = "";
-		appends.push(rRow);
-	}
-	if (hasRequires) {
-		appends.push(this.packageSave.appendChild(this.requires.cloneNode(true)));
-	}
-	if (results.size) {
-		for (var i = 0, method; method = methods[i]; i++) {
-			this.mLink.innerHTML = method.name;
-			this.mLink.href = "#" + method.name;
-			this.mDesc.parentNode.style.display = "none";
-			if (method.summary) {
-				this.mDesc.parentNode.style.display = "inline";
-				this.mDesc.innerHTML = method.summary;
-			}
-			var mRow = this.mRow.parentNode.insertBefore(this.mRow.cloneNode(true), this.mRow);
-			mRow.style.display = "";
-			appends.push(mRow);
-		}
-		appends.push(this.packageSave.appendChild(this.methods.cloneNode(true)));
-	}
-	this.domNode.appendChild(this.packageSave);
-	this.pkgDescription.innerHTML = description;
-	function makeSelect(fOrP, x) {
-		return function (e) {
-			dojo.event.topic.publish("/docs/" + fOrP + "/select", x);
-		};
-	}
-	var as = this.domNode.getElementsByTagName("a");
-	for (var i = 0, a; a = as[i]; i++) {
-		if (a.className == "docMLink") {
-			dojo.event.connect(a, "onclick", makeSelect("function", methods[i]));
-		} else {
-			if (a.className == "docRLink") {
-				dojo.event.connect(a, "onclick", makeSelect("package", requireLinks[i]));
-			}
-		}
-	}
-}, onDocResults:function (fns) {
-	dojo.debug("onDocResults(): called");
-	if (fns.length == 1) {
-		dojo.event.topic.publish("/docs/function/select", fns[0]);
-		return;
-	}
-	dojo.html.removeChildren(this.domNode);
-	this.count.innerHTML = fns.length;
-	var appends = [];
-	for (var i = 0, fn; fn = fns[i]; i++) {
-		this.fnLink.innerHTML = fn.name;
-		this.fnLink.href = "#" + fn.name;
-		if (fn.id) {
-			this.fnLink.href = this.fnLink.href + "," + fn.id;
-		}
-		this.summary.parentNode.style.display = "none";
-		if (fn.summary) {
-			this.summary.parentNode.style.display = "inline";
-			this.summary.innerHTML = fn.summary;
-		}
-		appends.push(this.rowParent.appendChild(this.rowSave.cloneNode(true)));
-	}
-	function makeSelect(x) {
-		return function (e) {
-			dojo.event.topic.publish("/docs/function/select", x);
-		};
-	}
-	this.domNode.appendChild(this.resultSave.cloneNode(true));
-	var as = this.domNode.getElementsByTagName("a");
-	for (var i = 0, a; a = as[i]; i++) {
-		dojo.event.connect(a, "onclick", makeSelect(fns[i]));
-	}
-	for (var i = 0, append; append = appends[i]; i++) {
-		this.rowParent.removeChild(append);
-	}
-}});
-

http://git-wip-us.apache.org/repos/asf/struts/blob/17d73d21/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/widget/DomWidget.js
----------------------------------------------------------------------
diff --git a/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/widget/DomWidget.js b/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/widget/DomWidget.js
deleted file mode 100644
index 1fb2d23..0000000
--- a/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/widget/DomWidget.js
+++ /dev/null
@@ -1,507 +0,0 @@
-/*
-	Copyright (c) 2004-2006, The Dojo Foundation
-	All Rights Reserved.
-
-	Licensed under the Academic Free License version 2.1 or above OR the
-	modified BSD license. For more information on Dojo licensing, see:
-
-		http://dojotoolkit.org/community/licensing.shtml
-*/
-
-
-
-dojo.provide("dojo.widget.DomWidget");
-dojo.require("dojo.event.*");
-dojo.require("dojo.widget.Widget");
-dojo.require("dojo.dom");
-dojo.require("dojo.html.style");
-dojo.require("dojo.xml.Parse");
-dojo.require("dojo.uri.*");
-dojo.require("dojo.lang.func");
-dojo.require("dojo.lang.extras");
-dojo.widget._cssFiles = {};
-dojo.widget._cssStrings = {};
-dojo.widget._templateCache = {};
-dojo.widget.defaultStrings = {dojoRoot:dojo.hostenv.getBaseScriptUri(), dojoWidgetModuleUri:dojo.uri.moduleUri("dojo.widget"), baseScriptUri:dojo.hostenv.getBaseScriptUri()};
-dojo.widget.fillFromTemplateCache = function (obj, templatePath, templateString, avoidCache) {
-	var tpath = templatePath || obj.templatePath;
-	var tmplts = dojo.widget._templateCache;
-	if (!tpath && !obj["widgetType"]) {
-		do {
-			var dummyName = "__dummyTemplate__" + dojo.widget._templateCache.dummyCount++;
-		} while (tmplts[dummyName]);
-		obj.widgetType = dummyName;
-	}
-	var wt = tpath ? tpath.toString() : obj.widgetType;
-	var ts = tmplts[wt];
-	if (!ts) {
-		tmplts[wt] = {"string":null, "node":null};
-		if (avoidCache) {
-			ts = {};
-		} else {
-			ts = tmplts[wt];
-		}
-	}
-	if ((!obj.templateString) && (!avoidCache)) {
-		obj.templateString = templateString || ts["string"];
-	}
-	if (obj.templateString) {
-		obj.templateString = this._sanitizeTemplateString(obj.templateString);
-	}
-	if ((!obj.templateNode) && (!avoidCache)) {
-		obj.templateNode = ts["node"];
-	}
-	if ((!obj.templateNode) && (!obj.templateString) && (tpath)) {
-		var tstring = this._sanitizeTemplateString(dojo.hostenv.getText(tpath));
-		obj.templateString = tstring;
-		if (!avoidCache) {
-			tmplts[wt]["string"] = tstring;
-		}
-	}
-	if ((!ts["string"]) && (!avoidCache)) {
-		ts.string = obj.templateString;
-	}
-};
-dojo.widget._sanitizeTemplateString = function (tString) {
-	if (tString) {
-		tString = tString.replace(/^\s*<\?xml(\s)+version=[\'\"](\d)*.(\d)*[\'\"](\s)*\?>/im, "");
-		var matches = tString.match(/<body[^>]*>\s*([\s\S]+)\s*<\/body>/im);
-		if (matches) {
-			tString = matches[1];
-		}
-	} else {
-		tString = "";
-	}
-	return tString;
-};
-dojo.widget._templateCache.dummyCount = 0;
-dojo.widget.attachProperties = ["dojoAttachPoint", "id"];
-dojo.widget.eventAttachProperty = "dojoAttachEvent";
-dojo.widget.onBuildProperty = "dojoOnBuild";
-dojo.widget.waiNames = ["waiRole", "waiState"];
-dojo.widget.wai = {waiRole:{name:"waiRole", "namespace":"http://www.w3.org/TR/xhtml2", alias:"x2", prefix:"wairole:"}, waiState:{name:"waiState", "namespace":"http://www.w3.org/2005/07/aaa", alias:"aaa", prefix:""}, setAttr:function (node, ns, attr, value) {
-	if (dojo.render.html.ie) {
-		node.setAttribute(this[ns].alias + ":" + attr, this[ns].prefix + value);
-	} else {
-		node.setAttributeNS(this[ns]["namespace"], attr, this[ns].prefix + value);
-	}
-}, getAttr:function (node, ns, attr) {
-	if (dojo.render.html.ie) {
-		return node.getAttribute(this[ns].alias + ":" + attr);
-	} else {
-		return node.getAttributeNS(this[ns]["namespace"], attr);
-	}
-}, removeAttr:function (node, ns, attr) {
-	var success = true;
-	if (dojo.render.html.ie) {
-		success = node.removeAttribute(this[ns].alias + ":" + attr);
-	} else {
-		node.removeAttributeNS(this[ns]["namespace"], attr);
-	}
-	return success;
-}};
-dojo.widget.attachTemplateNodes = function (rootNode, targetObj, events) {
-	var elementNodeType = dojo.dom.ELEMENT_NODE;
-	function trim(str) {
-		return str.replace(/^\s+|\s+$/g, "");
-	}
-	if (!rootNode) {
-		rootNode = targetObj.domNode;
-	}
-	if (rootNode.nodeType != elementNodeType) {
-		return;
-	}
-	var nodes = rootNode.all || rootNode.getElementsByTagName("*");
-	var _this = targetObj;
-	for (var x = -1; x < nodes.length; x++) {
-		var baseNode = (x == -1) ? rootNode : nodes[x];
-		var attachPoint = [];
-		if (!targetObj.widgetsInTemplate || !baseNode.getAttribute("dojoType")) {
-			for (var y = 0; y < this.attachProperties.length; y++) {
-				var tmpAttachPoint = baseNode.getAttribute(this.attachProperties[y]);
-				if (tmpAttachPoint) {
-					attachPoint = tmpAttachPoint.split(";");
-					for (var z = 0; z < attachPoint.length; z++) {
-						if (dojo.lang.isArray(targetObj[attachPoint[z]])) {
-							targetObj[attachPoint[z]].push(baseNode);
-						} else {
-							targetObj[attachPoint[z]] = baseNode;
-						}
-					}
-					break;
-				}
-			}
-			var attachEvent = baseNode.getAttribute(this.eventAttachProperty);
-			if (attachEvent) {
-				var evts = attachEvent.split(";");
-				for (var y = 0; y < evts.length; y++) {
-					if ((!evts[y]) || (!evts[y].length)) {
-						continue;
-					}
-					var thisFunc = null;
-					var tevt = trim(evts[y]);
-					if (evts[y].indexOf(":") >= 0) {
-						var funcNameArr = tevt.split(":");
-						tevt = trim(funcNameArr[0]);
-						thisFunc = trim(funcNameArr[1]);
-					}
-					if (!thisFunc) {
-						thisFunc = tevt;
-					}
-					var tf = function () {
-						var ntf = new String(thisFunc);
-						return function (evt) {
-							if (_this[ntf]) {
-								_this[ntf](dojo.event.browser.fixEvent(evt, this));
-							}
-						};
-					}();
-					dojo.event.browser.addListener(baseNode, tevt, tf, false, true);
-				}
-			}
-			for (var y = 0; y < events.length; y++) {
-				var evtVal = baseNode.getAttribute(events[y]);
-				if ((evtVal) && (evtVal.length)) {
-					var thisFunc = null;
-					var domEvt = events[y].substr(4);
-					thisFunc = trim(evtVal);
-					var funcs = [thisFunc];
-					if (thisFunc.indexOf(";") >= 0) {
-						funcs = dojo.lang.map(thisFunc.split(";"), trim);
-					}
-					for (var z = 0; z < funcs.length; z++) {
-						if (!funcs[z].length) {
-							continue;
-						}
-						var tf = function () {
-							var ntf = new String(funcs[z]);
-							return function (evt) {
-								if (_this[ntf]) {
-									_this[ntf](dojo.event.browser.fixEvent(evt, this));
-								}
-							};
-						}();
-						dojo.event.browser.addListener(baseNode, domEvt, tf, false, true);
-					}
-				}
-			}
-		}
-		var tmpltPoint = baseNode.getAttribute(this.templateProperty);
-		if (tmpltPoint) {
-			targetObj[tmpltPoint] = baseNode;
-		}
-		dojo.lang.forEach(dojo.widget.waiNames, function (name) {
-			var wai = dojo.widget.wai[name];
-			var val = baseNode.getAttribute(wai.name);
-			if (val) {
-				if (val.indexOf("-") == -1) {
-					dojo.widget.wai.setAttr(baseNode, wai.name, "role", val);
-				} else {
-					var statePair = val.split("-");
-					dojo.widget.wai.setAttr(baseNode, wai.name, statePair[0], statePair[1]);
-				}
-			}
-		}, this);
-		var onBuild = baseNode.getAttribute(this.onBuildProperty);
-		if (onBuild) {
-			eval("var node = baseNode; var widget = targetObj; " + onBuild);
-		}
-	}
-};
-dojo.widget.getDojoEventsFromStr = function (str) {
-	var re = /(dojoOn([a-z]+)(\s?))=/gi;
-	var evts = str ? str.match(re) || [] : [];
-	var ret = [];
-	var lem = {};
-	for (var x = 0; x < evts.length; x++) {
-		if (evts[x].length < 1) {
-			continue;
-		}
-		var cm = evts[x].replace(/\s/, "");
-		cm = (cm.slice(0, cm.length - 1));
-		if (!lem[cm]) {
-			lem[cm] = true;
-			ret.push(cm);
-		}
-	}
-	return ret;
-};
-dojo.declare("dojo.widget.DomWidget", dojo.widget.Widget, function () {
-	if ((arguments.length > 0) && (typeof arguments[0] == "object")) {
-		this.create(arguments[0]);
-	}
-}, {templateNode:null, templateString:null, templateCssString:null, preventClobber:false, domNode:null, containerNode:null, widgetsInTemplate:false, addChild:function (widget, overrideContainerNode, pos, ref, insertIndex) {
-	if (!this.isContainer) {
-		dojo.debug("dojo.widget.DomWidget.addChild() attempted on non-container widget");
-		return null;
-	} else {
-		if (insertIndex == undefined) {
-			insertIndex = this.children.length;
-		}
-		this.addWidgetAsDirectChild(widget, overrideContainerNode, pos, ref, insertIndex);
-		this.registerChild(widget, insertIndex);
-	}
-	return widget;
-}, addWidgetAsDirectChild:function (widget, overrideContainerNode, pos, ref, insertIndex) {
-	if ((!this.containerNode) && (!overrideContainerNode)) {
-		this.containerNode = this.domNode;
-	}
-	var cn = (overrideContainerNode) ? overrideContainerNode : this.containerNode;
-	if (!pos) {
-		pos = "after";
-	}
-	if (!ref) {
-		if (!cn) {
-			cn = dojo.body();
-		}
-		ref = cn.lastChild;
-	}
-	if (!insertIndex) {
-		insertIndex = 0;
-	}
-	widget.domNode.setAttribute("dojoinsertionindex", insertIndex);
-	if (!ref) {
-		cn.appendChild(widget.domNode);
-	} else {
-		if (pos == "insertAtIndex") {
-			dojo.dom.insertAtIndex(widget.domNode, ref.parentNode, insertIndex);
-		} else {
-			if ((pos == "after") && (ref === cn.lastChild)) {
-				cn.appendChild(widget.domNode);
-			} else {
-				dojo.dom.insertAtPosition(widget.domNode, cn, pos);
-			}
-		}
-	}
-}, registerChild:function (widget, insertionIndex) {
-	widget.dojoInsertionIndex = insertionIndex;
-	var idx = -1;
-	for (var i = 0; i < this.children.length; i++) {
-		if (this.children[i].dojoInsertionIndex <= insertionIndex) {
-			idx = i;
-		}
-	}
-	this.children.splice(idx + 1, 0, widget);
-	widget.parent = this;
-	widget.addedTo(this, idx + 1);
-	delete dojo.widget.manager.topWidgets[widget.widgetId];
-}, removeChild:function (widget) {
-	dojo.dom.removeNode(widget.domNode);
-	return dojo.widget.DomWidget.superclass.removeChild.call(this, widget);
-}, getFragNodeRef:function (frag) {
-	if (!frag) {
-		return null;
-	}
-	if (!frag[this.getNamespacedType()]) {
-		dojo.raise("Error: no frag for widget type " + this.getNamespacedType() + ", id " + this.widgetId + " (maybe a widget has set it's type incorrectly)");
-	}
-	return frag[this.getNamespacedType()]["nodeRef"];
-}, postInitialize:function (args, frag, parentComp) {
-	var sourceNodeRef = this.getFragNodeRef(frag);
-	if (parentComp && (parentComp.snarfChildDomOutput || !sourceNodeRef)) {
-		parentComp.addWidgetAsDirectChild(this, "", "insertAtIndex", "", args["dojoinsertionindex"], sourceNodeRef);
-	} else {
-		if (sourceNodeRef) {
-			if (this.domNode && (this.domNode !== sourceNodeRef)) {
-				this._sourceNodeRef = dojo.dom.replaceNode(sourceNodeRef, this.domNode);
-			}
-		}
-	}
-	if (parentComp) {
-		parentComp.registerChild(this, args.dojoinsertionindex);
-	} else {
-		dojo.widget.manager.topWidgets[this.widgetId] = this;
-	}
-	if (this.widgetsInTemplate) {
-		var parser = new dojo.xml.Parse();
-		var subContainerNode;
-		var subnodes = this.domNode.getElementsByTagName("*");
-		for (var i = 0; i < subnodes.length; i++) {
-			if (subnodes[i].getAttribute("dojoAttachPoint") == "subContainerWidget") {
-				subContainerNode = subnodes[i];
-			}
-			if (subnodes[i].getAttribute("dojoType")) {
-				subnodes[i].setAttribute("isSubWidget", true);
-			}
-		}
-		if (this.isContainer && !this.containerNode) {
-			if (subContainerNode) {
-				var src = this.getFragNodeRef(frag);
-				if (src) {
-					dojo.dom.moveChildren(src, subContainerNode);
-					frag["dojoDontFollow"] = true;
-				}
-			} else {
-				dojo.debug("No subContainerWidget node can be found in template file for widget " + this);
-			}
-		}
-		var templatefrag = parser.parseElement(this.domNode, null, true);
-		dojo.widget.getParser().createSubComponents(templatefrag, this);
-		var subwidgets = [];
-		var stack = [this];
-		var w;
-		while ((w = stack.pop())) {
-			for (var i = 0; i < w.children.length; i++) {
-				var cwidget = w.children[i];
-				if (cwidget._processedSubWidgets || !cwidget.extraArgs["issubwidget"]) {
-					continue;
-				}
-				subwidgets.push(cwidget);
-				if (cwidget.isContainer) {
-					stack.push(cwidget);
-				}
-			}
-		}
-		for (var i = 0; i < subwidgets.length; i++) {
-			var widget = subwidgets[i];
-			if (widget._processedSubWidgets) {
-				dojo.debug("This should not happen: widget._processedSubWidgets is already true!");
-				return;
-			}
-			widget._processedSubWidgets = true;
-			if (widget.extraArgs["dojoattachevent"]) {
-				var evts = widget.extraArgs["dojoattachevent"].split(";");
-				for (var j = 0; j < evts.length; j++) {
-					var thisFunc = null;
-					var tevt = dojo.string.trim(evts[j]);
-					if (tevt.indexOf(":") >= 0) {
-						var funcNameArr = tevt.split(":");
-						tevt = dojo.string.trim(funcNameArr[0]);
-						thisFunc = dojo.string.trim(funcNameArr[1]);
-					}
-					if (!thisFunc) {
-						thisFunc = tevt;
-					}
-					if (dojo.lang.isFunction(widget[tevt])) {
-						dojo.event.kwConnect({srcObj:widget, srcFunc:tevt, targetObj:this, targetFunc:thisFunc});
-					} else {
-						alert(tevt + " is not a function in widget " + widget);
-					}
-				}
-			}
-			if (widget.extraArgs["dojoattachpoint"]) {
-				this[widget.extraArgs["dojoattachpoint"]] = widget;
-			}
-		}
-	}
-	if (this.isContainer && !frag["dojoDontFollow"]) {
-		dojo.widget.getParser().createSubComponents(frag, this);
-	}
-}, buildRendering:function (args, frag) {
-	var ts = dojo.widget._templateCache[this.widgetType];
-	if (args["templatecsspath"]) {
-		args["templateCssPath"] = args["templatecsspath"];
-	}
-	var cpath = args["templateCssPath"] || this.templateCssPath;
-	if (cpath && !dojo.widget._cssFiles[cpath.toString()]) {
-		if ((!this.templateCssString) && (cpath)) {
-			this.templateCssString = dojo.hostenv.getText(cpath);
-			this.templateCssPath = null;
-		}
-		dojo.widget._cssFiles[cpath.toString()] = true;
-	}
-	if ((this["templateCssString"]) && (!dojo.widget._cssStrings[this.templateCssString])) {
-		dojo.html.insertCssText(this.templateCssString, null, cpath);
-		dojo.widget._cssStrings[this.templateCssString] = true;
-	}
-	if ((!this.preventClobber) && ((this.templatePath) || (this.templateNode) || ((this["templateString"]) && (this.templateString.length)) || ((typeof ts != "undefined") && ((ts["string"]) || (ts["node"]))))) {
-		this.buildFromTemplate(args, frag);
-	} else {
-		this.domNode = this.getFragNodeRef(frag);
-	}
-	this.fillInTemplate(args, frag);
-}, buildFromTemplate:function (args, frag) {
-	var avoidCache = false;
-	if (args["templatepath"]) {
-		args["templatePath"] = args["templatepath"];
-	}
-	dojo.widget.fillFromTemplateCache(this, args["templatePath"], null, avoidCache);
-	var ts = dojo.widget._templateCache[this.templatePath ? this.templatePath.toString() : this.widgetType];
-	if ((ts) && (!avoidCache)) {
-		if (!this.templateString.length) {
-			this.templateString = ts["string"];
-		}
-		if (!this.templateNode) {
-			this.templateNode = ts["node"];
-		}
-	}
-	var matches = false;
-	var node = null;
-	var tstr = this.templateString;
-	if ((!this.templateNode) && (this.templateString)) {
-		matches = this.templateString.match(/\$\{([^\}]+)\}/g);
-		if (matches) {
-			var hash = this.strings || {};
-			for (var key in dojo.widget.defaultStrings) {
-				if (dojo.lang.isUndefined(hash[key])) {
-					hash[key] = dojo.widget.defaultStrings[key];
-				}
-			}
-			for (var i = 0; i < matches.length; i++) {
-				var key = matches[i];
-				key = key.substring(2, key.length - 1);
-				var kval = (key.substring(0, 5) == "this.") ? dojo.lang.getObjPathValue(key.substring(5), this) : hash[key];
-				var value;
-				if ((kval) || (dojo.lang.isString(kval))) {
-					value = new String((dojo.lang.isFunction(kval)) ? kval.call(this, key, this.templateString) : kval);
-					while (value.indexOf("\"") > -1) {
-						value = value.replace("\"", "&quot;");
-					}
-					tstr = tstr.replace(matches[i], value);
-				}
-			}
-		} else {
-			this.templateNode = this.createNodesFromText(this.templateString, true)[0];
-			if (!avoidCache) {
-				ts.node = this.templateNode;
-			}
-		}
-	}
-	if ((!this.templateNode) && (!matches)) {
-		dojo.debug("DomWidget.buildFromTemplate: could not create template");
-		return false;
-	} else {
-		if (!matches) {
-			node = this.templateNode.cloneNode(true);
-			if (!node) {
-				return false;
-			}
-		} else {
-			node = this.createNodesFromText(tstr, true)[0];
-		}
-	}
-	this.domNode = node;
-	this.attachTemplateNodes();
-	if (this.isContainer && this.containerNode) {
-		var src = this.getFragNodeRef(frag);
-		if (src) {
-			dojo.dom.moveChildren(src, this.containerNode);
-		}
-	}
-}, attachTemplateNodes:function (baseNode, targetObj) {
-	if (!baseNode) {
-		baseNode = this.domNode;
-	}
-	if (!targetObj) {
-		targetObj = this;
-	}
-	return dojo.widget.attachTemplateNodes(baseNode, targetObj, dojo.widget.getDojoEventsFromStr(this.templateString));
-}, fillInTemplate:function () {
-}, destroyRendering:function () {
-	try {
-		dojo.dom.destroyNode(this.domNode);
-		delete this.domNode;
-	}
-	catch (e) {
-	}
-	if (this._sourceNodeRef) {
-		try {
-			dojo.dom.destroyNode(this._sourceNodeRef);
-		}
-		catch (e) {
-		}
-	}
-}, createNodesFromText:function () {
-	dojo.unimplemented("dojo.widget.DomWidget.createNodesFromText");
-}});
-

http://git-wip-us.apache.org/repos/asf/struts/blob/17d73d21/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/widget/DropdownContainer.js
----------------------------------------------------------------------
diff --git a/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/widget/DropdownContainer.js b/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/widget/DropdownContainer.js
deleted file mode 100644
index 0047547..0000000
--- a/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/widget/DropdownContainer.js
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
-	Copyright (c) 2004-2006, The Dojo Foundation
-	All Rights Reserved.
-
-	Licensed under the Academic Free License version 2.1 or above OR the
-	modified BSD license. For more information on Dojo licensing, see:
-
-		http://dojotoolkit.org/community/licensing.shtml
-*/
-
-
-
-dojo.provide("dojo.widget.DropdownContainer");
-dojo.require("dojo.widget.*");
-dojo.require("dojo.widget.HtmlWidget");
-dojo.require("dojo.widget.PopupContainer");
-dojo.require("dojo.event.*");
-dojo.require("dojo.html.layout");
-dojo.require("dojo.html.display");
-dojo.require("dojo.html.iframe");
-dojo.require("dojo.html.util");
-dojo.widget.defineWidget("dojo.widget.DropdownContainer", dojo.widget.HtmlWidget, {inputWidth:"7em", id:"", inputId:"", inputName:"", iconURL:dojo.uri.moduleUri("dojo.widget", "templates/images/combo_box_arrow.png"), copyClasses:false, iconAlt:"", containerToggle:"plain", containerToggleDuration:150, templateString:"<span style=\"white-space:nowrap\"><input type=\"hidden\" name=\"\" value=\"\" dojoAttachPoint=\"valueNode\" /><input name=\"\" type=\"text\" value=\"\" style=\"vertical-align:middle;\" dojoAttachPoint=\"inputNode\" autocomplete=\"off\" /> <img src=\"${this.iconURL}\" alt=\"${this.iconAlt}\" dojoAttachEvent=\"onclick:onIconClick\" dojoAttachPoint=\"buttonNode\" style=\"vertical-align:middle; cursor:pointer; cursor:hand\" /></span>", templateCssPath:"", isContainer:true, attachTemplateNodes:function () {
-	dojo.widget.DropdownContainer.superclass.attachTemplateNodes.apply(this, arguments);
-	this.popup = dojo.widget.createWidget("PopupContainer", {toggle:this.containerToggle, toggleDuration:this.containerToggleDuration});
-	this.containerNode = this.popup.domNode;
-}, fillInTemplate:function (args, frag) {
-	this.domNode.appendChild(this.popup.domNode);
-	if (this.id) {
-		this.domNode.id = this.id;
-	}
-	if (this.inputId) {
-		this.inputNode.id = this.inputId;
-	}
-	if (this.inputName) {
-		this.inputNode.name = this.inputName;
-	}
-	this.inputNode.style.width = this.inputWidth;
-	this.inputNode.disabled = this.disabled;
-	if (this.copyClasses) {
-		this.inputNode.style = "";
-		this.inputNode.className = this.getFragNodeRef(frag).className;
-	}
-	dojo.event.connect(this.inputNode, "onchange", this, "onInputChange");
-}, onIconClick:function (evt) {
-	if (this.disabled) {
-		return;
-	}
-	if (!this.popup.isShowingNow) {
-		this.popup.open(this.inputNode, this, this.buttonNode);
-	} else {
-		this.popup.close();
-	}
-}, hideContainer:function () {
-	if (this.popup.isShowingNow) {
-		this.popup.close();
-	}
-}, onInputChange:function () {
-}, enable:function () {
-	this.inputNode.disabled = false;
-	dojo.widget.DropdownContainer.superclass.enable.apply(this, arguments);
-}, disable:function () {
-	this.inputNode.disabled = true;
-	dojo.widget.DropdownContainer.superclass.disable.apply(this, arguments);
-}});
-

http://git-wip-us.apache.org/repos/asf/struts/blob/17d73d21/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/widget/DropdownDatePicker.js
----------------------------------------------------------------------
diff --git a/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/widget/DropdownDatePicker.js b/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/widget/DropdownDatePicker.js
deleted file mode 100644
index 08d51e6..0000000
--- a/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/widget/DropdownDatePicker.js
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
-	Copyright (c) 2004-2006, The Dojo Foundation
-	All Rights Reserved.
-
-	Licensed under the Academic Free License version 2.1 or above OR the
-	modified BSD license. For more information on Dojo licensing, see:
-
-		http://dojotoolkit.org/community/licensing.shtml
-*/
-
-
-
-dojo.provide("dojo.widget.DropdownDatePicker");
-dojo.require("dojo.widget.*");
-dojo.require("dojo.widget.DropdownContainer");
-dojo.require("dojo.widget.DatePicker");
-dojo.require("dojo.event.*");
-dojo.require("dojo.html.*");
-dojo.require("dojo.date.format");
-dojo.require("dojo.date.serialize");
-dojo.require("dojo.string.common");
-dojo.require("dojo.i18n.common");
-dojo.requireLocalization("dojo.widget", "DropdownDatePicker", null, "ROOT");
-dojo.widget.defineWidget("dojo.widget.DropdownDatePicker", dojo.widget.DropdownContainer, {iconURL:dojo.uri.moduleUri("dojo.widget", "templates/images/dateIcon.gif"), formatLength:"short", displayFormat:"", saveFormat:"", value:"", name:"", displayWeeks:6, adjustWeeks:false, startDate:"1492-10-12", endDate:"2941-10-12", weekStartsOn:"", staticDisplay:false, postMixInProperties:function (localProperties, frag) {
-	dojo.widget.DropdownDatePicker.superclass.postMixInProperties.apply(this, arguments);
-	var messages = dojo.i18n.getLocalization("dojo.widget", "DropdownDatePicker", this.lang);
-	this.iconAlt = messages.selectDate;
-	if (typeof (this.value) == "string" && this.value.toLowerCase() == "today") {
-		this.value = new Date();
-	}
-	if (this.value && isNaN(this.value)) {
-		var orig = this.value;
-		this.value = dojo.date.fromRfc3339(this.value);
-		if (!this.value) {
-			this.value = new Date(orig);
-			dojo.deprecated("dojo.widget.DropdownDatePicker", "date attributes must be passed in Rfc3339 format", "0.5");
-		}
-	}
-	if (this.value && !isNaN(this.value)) {
-		this.value = new Date(this.value);
-	}
-}, fillInTemplate:function (args, frag) {
-	dojo.widget.DropdownDatePicker.superclass.fillInTemplate.call(this, args, frag);
-	var dpArgs = {widgetContainerId:this.widgetId, lang:this.lang, value:this.value, startDate:this.startDate, endDate:this.endDate, displayWeeks:this.displayWeeks, weekStartsOn:this.weekStartsOn, adjustWeeks:this.adjustWeeks, staticDisplay:this.staticDisplay};
-	this.datePicker = dojo.widget.createWidget("DatePicker", dpArgs, this.containerNode, "child");
-	dojo.event.connect(this.datePicker, "onValueChanged", this, "_updateText");
-	dojo.event.connect(this.inputNode, "onChange", this, "_updateText");
-	if (this.value) {
-		this._updateText();
-	}
-	this.containerNode.explodeClassName = "calendarBodyContainer";
-	this.valueNode.name = this.name;
-}, getValue:function () {
-	return this.valueNode.value;
-}, getDate:function () {
-	return this.datePicker.value;
-}, setValue:function (rfcDate) {
-	this.setDate(rfcDate);
-}, setDate:function (dateObj) {
-	this.datePicker.setDate(dateObj);
-	this._syncValueNode();
-}, _updateText:function () {
-	this.inputNode.value = this.datePicker.value ? dojo.date.format(this.datePicker.value, {formatLength:this.formatLength, datePattern:this.displayFormat, selector:"dateOnly", locale:this.lang}) : "";
-	if (this.value < this.datePicker.startDate || this.value > this.datePicker.endDate) {
-		this.inputNode.value = "";
-	}
-	this._syncValueNode();
-	this.onValueChanged(this.getDate());
-	this.hideContainer();
-}, onValueChanged:function (dateObj) {
-}, onInputChange:function () {
-	var input = dojo.string.trim(this.inputNode.value);
-	if (input) {
-		var inputDate = dojo.date.parse(input, {formatLength:this.formatLength, datePattern:this.displayFormat, selector:"dateOnly", locale:this.lang});
-		if (!this.datePicker._isDisabledDate(inputDate)) {
-			this.setDate(inputDate);
-		}
-	} else {
-		if (input == "") {
-			this.datePicker.setDate("");
-		}
-		this.valueNode.value = input;
-	}
-	if (input) {
-		this._updateText();
-	}
-}, _syncValueNode:function () {
-	var date = this.datePicker.value;
-	var value = "";
-	switch (this.saveFormat.toLowerCase()) {
-	  case "rfc":
-	  case "iso":
-	  case "":
-		value = dojo.date.toRfc3339(date, "dateOnly");
-		break;
-	  case "posix":
-	  case "unix":
-		value = Number(date);
-		break;
-	  default:
-		if (date) {
-			value = dojo.date.format(date, {datePattern:this.saveFormat, selector:"dateOnly", locale:this.lang});
-		}
-	}
-	this.valueNode.value = value;
-}, destroy:function (finalize) {
-	this.datePicker.destroy(finalize);
-	dojo.widget.DropdownDatePicker.superclass.destroy.apply(this, arguments);
-}});
-

http://git-wip-us.apache.org/repos/asf/struts/blob/17d73d21/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/widget/DropdownTimePicker.js
----------------------------------------------------------------------
diff --git a/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/widget/DropdownTimePicker.js b/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/widget/DropdownTimePicker.js
deleted file mode 100644
index 3541c26..0000000
--- a/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/widget/DropdownTimePicker.js
+++ /dev/null
@@ -1,156 +0,0 @@
-/*
-	Copyright (c) 2004-2006, The Dojo Foundation
-	All Rights Reserved.
-
-	Licensed under the Academic Free License version 2.1 or above OR the
-	modified BSD license. For more information on Dojo licensing, see:
-
-		http://dojotoolkit.org/community/licensing.shtml
-*/
-
-
-
-dojo.provide("dojo.widget.DropdownTimePicker");
-dojo.require("dojo.widget.*");
-dojo.require("dojo.widget.DropdownContainer");
-dojo.require("dojo.widget.TimePicker");
-dojo.require("dojo.event.*");
-dojo.require("dojo.html.*");
-dojo.require("dojo.date.format");
-dojo.require("dojo.date.serialize");
-dojo.require("dojo.i18n.common");
-dojo.requireLocalization("dojo.widget", "DropdownTimePicker", null, "ROOT");
-dojo.widget.defineWidget("dojo.widget.DropdownTimePicker", dojo.widget.DropdownContainer, {iconURL:dojo.uri.moduleUri("dojo.widget", "templates/images/timeIcon.gif"), formatLength:"short", displayFormat:"", timeFormat:"", saveFormat:"", value:"", name:"", postMixInProperties:function () {
-	dojo.widget.DropdownTimePicker.superclass.postMixInProperties.apply(this, arguments);
-	var messages = dojo.i18n.getLocalization("dojo.widget", "DropdownTimePicker", this.lang);
-	this.iconAlt = messages.selectTime;
-	if (typeof (this.value) == "string" && this.value.toLowerCase() == "today") {
-		this.value = new Date();
-	}
-	if (this.value && isNaN(this.value)) {
-		var orig = this.value;
-		this.value = dojo.date.fromRfc3339(this.value);
-		if (!this.value) {
-			var d = dojo.date.format(new Date(), {selector:"dateOnly", datePattern:"yyyy-MM-dd"});
-			var c = orig.split(":");
-			for (var i = 0; i < c.length; ++i) {
-				if (c[i].length == 1) {
-					c[i] = "0" + c[i];
-				}
-			}
-			orig = c.join(":");
-			this.value = dojo.date.fromRfc3339(d + "T" + orig);
-			dojo.deprecated("dojo.widget.DropdownTimePicker", "time attributes must be passed in Rfc3339 format", "0.5");
-		}
-	}
-	if (this.value && !isNaN(this.value)) {
-		this.value = new Date(this.value);
-	}
-}, fillInTemplate:function () {
-	dojo.widget.DropdownTimePicker.superclass.fillInTemplate.apply(this, arguments);
-	var value = "";
-	if (this.value instanceof Date) {
-		value = this.value;
-	} else {
-		if (this.value) {
-			var orig = this.value;
-			var d = dojo.date.format(new Date(), {selector:"dateOnly", datePattern:"yyyy-MM-dd"});
-			var c = orig.split(":");
-			for (var i = 0; i < c.length; ++i) {
-				if (c[i].length == 1) {
-					c[i] = "0" + c[i];
-				}
-			}
-			orig = c.join(":");
-			value = dojo.date.fromRfc3339(d + "T" + orig);
-		}
-	}
-	var tpArgs = {widgetContainerId:this.widgetId, lang:this.lang, value:value};
-	this.timePicker = dojo.widget.createWidget("TimePicker", tpArgs, this.containerNode, "child");
-	dojo.event.connect(this.timePicker, "onValueChanged", this, "_updateText");
-	if (this.value) {
-		this._updateText();
-	}
-	this.containerNode.style.zIndex = this.zIndex;
-	this.containerNode.explodeClassName = "timeContainer";
-	this.valueNode.name = this.name;
-}, getValue:function () {
-	return this.valueNode.value;
-}, getTime:function () {
-	return this.timePicker.storedTime;
-}, setValue:function (rfcDate) {
-	this.setTime(rfcDate);
-}, setTime:function (dateObj) {
-	var value = "";
-	if (dateObj instanceof Date) {
-		value = dateObj;
-	} else {
-		if (this.value) {
-			var orig = this.value;
-			var d = dojo.date.format(new Date(), {selector:"dateOnly", datePattern:"yyyy-MM-dd"});
-			var c = orig.split(":");
-			for (var i = 0; i < c.length; ++i) {
-				if (c[i].length == 1) {
-					c[i] = "0" + c[i];
-				}
-			}
-			orig = c.join(":");
-			value = dojo.date.fromRfc3339(d + "T" + orig);
-		}
-	}
-	this.timePicker.setTime(value);
-	this._syncValueNode();
-}, _updateText:function () {
-	if (this.timePicker.selectedTime.anyTime) {
-		this.inputNode.value = "";
-	} else {
-		if (this.timeFormat) {
-			dojo.deprecated("dojo.widget.DropdownTimePicker", "Must use displayFormat attribute instead of timeFormat.  See dojo.date.format for specification.", "0.5");
-			this.inputNode.value = dojo.date.strftime(this.timePicker.time, this.timeFormat, this.lang);
-		} else {
-			this.inputNode.value = dojo.date.format(this.timePicker.time, {formatLength:this.formatLength, timePattern:this.displayFormat, selector:"timeOnly", locale:this.lang});
-		}
-	}
-	this._syncValueNode();
-	this.onValueChanged(this.getTime());
-	this.hideContainer();
-}, onValueChanged:function (dateObj) {
-}, onInputChange:function () {
-	if (this.dateFormat) {
-		dojo.deprecated("dojo.widget.DropdownTimePicker", "Cannot parse user input.  Must use displayFormat attribute instead of dateFormat.  See dojo.date.format for specification.", "0.5");
-	} else {
-		var input = dojo.string.trim(this.inputNode.value);
-		if (input) {
-			var inputTime = dojo.date.parse(input, {formatLength:this.formatLength, timePattern:this.displayFormat, selector:"timeOnly", locale:this.lang});
-			if (inputTime) {
-				this.setTime(inputTime);
-			}
-		} else {
-			this.valueNode.value = input;
-		}
-	}
-	if (input) {
-		this._updateText();
-	}
-}, _syncValueNode:function () {
-	var time = this.timePicker.time;
-	var value;
-	switch (this.saveFormat.toLowerCase()) {
-	  case "rfc":
-	  case "iso":
-	  case "":
-		value = dojo.date.toRfc3339(time, "timeOnly");
-		break;
-	  case "posix":
-	  case "unix":
-		value = Number(time);
-		break;
-	  default:
-		value = dojo.date.format(time, {datePattern:this.saveFormat, selector:"timeOnly", locale:this.lang});
-	}
-	this.valueNode.value = value;
-}, destroy:function (finalize) {
-	this.timePicker.destroy(finalize);
-	dojo.widget.DropdownTimePicker.superclass.destroy.apply(this, arguments);
-}});
-

http://git-wip-us.apache.org/repos/asf/struts/blob/17d73d21/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/widget/Editor.js
----------------------------------------------------------------------
diff --git a/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/widget/Editor.js b/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/widget/Editor.js
deleted file mode 100644
index 8c620eb..0000000
--- a/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/widget/Editor.js
+++ /dev/null
@@ -1,390 +0,0 @@
-/*
-	Copyright (c) 2004-2006, The Dojo Foundation
-	All Rights Reserved.
-
-	Licensed under the Academic Free License version 2.1 or above OR the
-	modified BSD license. For more information on Dojo licensing, see:
-
-		http://dojotoolkit.org/community/licensing.shtml
-*/
-
-
-
-dojo.provide("dojo.widget.Editor");
-dojo.deprecated("dojo.widget.Editor", "is replaced by dojo.widget.Editor2", "0.5");
-dojo.require("dojo.io.*");
-dojo.require("dojo.widget.*");
-dojo.require("dojo.widget.Toolbar");
-dojo.require("dojo.widget.RichText");
-dojo.require("dojo.widget.ColorPalette");
-dojo.require("dojo.string.extras");
-dojo.widget.tags.addParseTreeHandler("dojo:Editor");
-dojo.widget.Editor = function () {
-	dojo.widget.HtmlWidget.call(this);
-	this.contentFilters = [];
-	this._toolbars = [];
-};
-dojo.inherits(dojo.widget.Editor, dojo.widget.HtmlWidget);
-dojo.widget.Editor.itemGroups = {textGroup:["bold", "italic", "underline", "strikethrough"], blockGroup:["formatBlock", "fontName", "fontSize"], justifyGroup:["justifyleft", "justifycenter", "justifyright"], commandGroup:["save", "cancel"], colorGroup:["forecolor", "hilitecolor"], listGroup:["insertorderedlist", "insertunorderedlist"], indentGroup:["outdent", "indent"], linkGroup:["createlink", "insertimage", "inserthorizontalrule"]};
-dojo.widget.Editor.formatBlockValues = {"Normal":"p", "Main heading":"h2", "Sub heading":"h3", "Sub sub heading":"h4", "Preformatted":"pre"};
-dojo.widget.Editor.fontNameValues = {"Arial":"Arial, Helvetica, sans-serif", "Verdana":"Verdana, sans-serif", "Times New Roman":"Times New Roman, serif", "Courier":"Courier New, monospace"};
-dojo.widget.Editor.fontSizeValues = {"1 (8 pt)":"1", "2 (10 pt)":"2", "3 (12 pt)":"3", "4 (14 pt)":"4", "5 (18 pt)":"5", "6 (24 pt)":"6", "7 (36 pt)":"7"};
-dojo.widget.Editor.defaultItems = ["commandGroup", "|", "blockGroup", "|", "textGroup", "|", "colorGroup", "|", "justifyGroup", "|", "listGroup", "indentGroup", "|", "linkGroup"];
-dojo.widget.Editor.supportedCommands = ["save", "cancel", "|", "-", "/", " "];
-dojo.lang.extend(dojo.widget.Editor, {widgetType:"Editor", saveUrl:"", saveMethod:"post", saveArgName:"editorContent", closeOnSave:false, items:dojo.widget.Editor.defaultItems, formatBlockItems:dojo.lang.shallowCopy(dojo.widget.Editor.formatBlockValues), fontNameItems:dojo.lang.shallowCopy(dojo.widget.Editor.fontNameValues), fontSizeItems:dojo.lang.shallowCopy(dojo.widget.Editor.fontSizeValues), getItemProperties:function (name) {
-	var props = {};
-	switch (name.toLowerCase()) {
-	  case "bold":
-	  case "italic":
-	  case "underline":
-	  case "strikethrough":
-		props.toggleItem = true;
-		break;
-	  case "justifygroup":
-		props.defaultButton = "justifyleft";
-		props.preventDeselect = true;
-		props.buttonGroup = true;
-		break;
-	  case "listgroup":
-		props.buttonGroup = true;
-		break;
-	  case "save":
-	  case "cancel":
-		props.label = dojo.string.capitalize(name);
-		break;
-	  case "forecolor":
-	  case "hilitecolor":
-		props.name = name;
-		props.toggleItem = true;
-		props.icon = this.getCommandImage(name);
-		break;
-	  case "formatblock":
-		props.name = "formatBlock";
-		props.values = this.formatBlockItems;
-		break;
-	  case "fontname":
-		props.name = "fontName";
-		props.values = this.fontNameItems;
-	  case "fontsize":
-		props.name = "fontSize";
-		props.values = this.fontSizeItems;
-	}
-	return props;
-}, validateItems:true, focusOnLoad:true, minHeight:"1em", _richText:null, _richTextType:"RichText", _toolbarContainer:null, _toolbarContainerType:"ToolbarContainer", _toolbars:[], _toolbarType:"Toolbar", _toolbarItemType:"ToolbarItem", buildRendering:function (args, frag) {
-	var node = frag["dojo:" + this.widgetType.toLowerCase()]["nodeRef"];
-	var trt = dojo.widget.createWidget(this._richTextType, {focusOnLoad:this.focusOnLoad, minHeight:this.minHeight}, node);
-	var _this = this;
-	setTimeout(function () {
-		_this.setRichText(trt);
-		_this.initToolbar();
-		_this.fillInTemplate(args, frag);
-	}, 0);
-}, setRichText:function (richText) {
-	if (this._richText && this._richText == richText) {
-		dojo.debug("Already set the richText to this richText!");
-		return;
-	}
-	if (this._richText && !this._richText.isClosed) {
-		dojo.debug("You are switching richTexts yet you haven't closed the current one. Losing reference!");
-	}
-	this._richText = richText;
-	dojo.event.connect(this._richText, "close", this, "onClose");
-	dojo.event.connect(this._richText, "onLoad", this, "onLoad");
-	dojo.event.connect(this._richText, "onDisplayChanged", this, "updateToolbar");
-	if (this._toolbarContainer) {
-		this._toolbarContainer.enable();
-		this.updateToolbar(true);
-	}
-}, initToolbar:function () {
-	if (this._toolbarContainer) {
-		return;
-	}
-	this._toolbarContainer = dojo.widget.createWidget(this._toolbarContainerType);
-	var tb = this.addToolbar();
-	var last = true;
-	for (var i = 0; i < this.items.length; i++) {
-		if (this.items[i] == "\n") {
-			tb = this.addToolbar();
-		} else {
-			if ((this.items[i] == "|") && (!last)) {
-				last = true;
-			} else {
-				last = this.addItem(this.items[i], tb);
-			}
-		}
-	}
-	this.insertToolbar(this._toolbarContainer.domNode, this._richText.domNode);
-}, insertToolbar:function (tbNode, richTextNode) {
-	dojo.html.insertBefore(tbNode, richTextNode);
-}, addToolbar:function (toolbar) {
-	this.initToolbar();
-	if (!(toolbar instanceof dojo.widget.Toolbar)) {
-		toolbar = dojo.widget.createWidget(this._toolbarType);
-	}
-	this._toolbarContainer.addChild(toolbar);
-	this._toolbars.push(toolbar);
-	return toolbar;
-}, addItem:function (item, tb, dontValidate) {
-	if (!tb) {
-		tb = this._toolbars[0];
-	}
-	var cmd = ((item) && (!dojo.lang.isUndefined(item["getValue"]))) ? cmd = item["getValue"]() : item;
-	var groups = dojo.widget.Editor.itemGroups;
-	if (item instanceof dojo.widget.ToolbarItem) {
-		tb.addChild(item);
-	} else {
-		if (groups[cmd]) {
-			var group = groups[cmd];
-			var worked = true;
-			if (cmd == "justifyGroup" || cmd == "listGroup") {
-				var btnGroup = [cmd];
-				for (var i = 0; i < group.length; i++) {
-					if (dontValidate || this.isSupportedCommand(group[i])) {
-						btnGroup.push(this.getCommandImage(group[i]));
-					} else {
-						worked = false;
-					}
-				}
-				if (btnGroup.length) {
-					var btn = tb.addChild(btnGroup, null, this.getItemProperties(cmd));
-					dojo.event.connect(btn, "onClick", this, "_action");
-					dojo.event.connect(btn, "onChangeSelect", this, "_action");
-				}
-				return worked;
-			} else {
-				for (var i = 0; i < group.length; i++) {
-					if (!this.addItem(group[i], tb)) {
-						worked = false;
-					}
-				}
-				return worked;
-			}
-		} else {
-			if ((!dontValidate) && (!this.isSupportedCommand(cmd))) {
-				return false;
-			}
-			if (dontValidate || this.isSupportedCommand(cmd)) {
-				cmd = cmd.toLowerCase();
-				if (cmd == "formatblock") {
-					var select = dojo.widget.createWidget("ToolbarSelect", {name:"formatBlock", values:this.formatBlockItems});
-					tb.addChild(select);
-					var _this = this;
-					dojo.event.connect(select, "onSetValue", function (item, value) {
-						_this.onAction("formatBlock", value);
-					});
-				} else {
-					if (cmd == "fontname") {
-						var select = dojo.widget.createWidget("ToolbarSelect", {name:"fontName", values:this.fontNameItems});
-						tb.addChild(select);
-						dojo.event.connect(select, "onSetValue", dojo.lang.hitch(this, function (item, value) {
-							this.onAction("fontName", value);
-						}));
-					} else {
-						if (cmd == "fontsize") {
-							var select = dojo.widget.createWidget("ToolbarSelect", {name:"fontSize", values:this.fontSizeItems});
-							tb.addChild(select);
-							dojo.event.connect(select, "onSetValue", dojo.lang.hitch(this, function (item, value) {
-								this.onAction("fontSize", value);
-							}));
-						} else {
-							if (dojo.lang.inArray(cmd, ["forecolor", "hilitecolor"])) {
-								var btn = tb.addChild(dojo.widget.createWidget("ToolbarColorDialog", this.getItemProperties(cmd)));
-								dojo.event.connect(btn, "onSetValue", this, "_setValue");
-							} else {
-								var btn = tb.addChild(this.getCommandImage(cmd), null, this.getItemProperties(cmd));
-								if (cmd == "save") {
-									dojo.event.connect(btn, "onClick", this, "_save");
-								} else {
-									if (cmd == "cancel") {
-										dojo.event.connect(btn, "onClick", this, "_close");
-									} else {
-										dojo.event.connect(btn, "onClick", this, "_action");
-										dojo.event.connect(btn, "onChangeSelect", this, "_action");
-									}
-								}
-							}
-						}
-					}
-				}
-			}
-		}
-	}
-	return true;
-}, enableToolbar:function () {
-	if (this._toolbarContainer) {
-		this._toolbarContainer.domNode.style.display = "";
-		this._toolbarContainer.enable();
-	}
-}, disableToolbar:function (hide) {
-	if (hide) {
-		if (this._toolbarContainer) {
-			this._toolbarContainer.domNode.style.display = "none";
-		}
-	} else {
-		if (this._toolbarContainer) {
-			this._toolbarContainer.disable();
-		}
-	}
-}, _updateToolbarLastRan:null, _updateToolbarTimer:null, _updateToolbarFrequency:500, updateToolbar:function (force) {
-	if (!this._toolbarContainer) {
-		return;
-	}
-	var diff = new Date() - this._updateToolbarLastRan;
-	if (!force && this._updateToolbarLastRan && (diff < this._updateToolbarFrequency)) {
-		clearTimeout(this._updateToolbarTimer);
-		var _this = this;
-		this._updateToolbarTimer = setTimeout(function () {
-			_this.updateToolbar();
-		}, this._updateToolbarFrequency / 2);
-		return;
-	} else {
-		this._updateToolbarLastRan = new Date();
-	}
-	var items = this._toolbarContainer.getItems();
-	for (var i = 0; i < items.length; i++) {
-		var item = items[i];
-		if (item instanceof dojo.widget.ToolbarSeparator) {
-			continue;
-		}
-		var cmd = item._name;
-		if (cmd == "save" || cmd == "cancel") {
-			continue;
-		} else {
-			if (cmd == "justifyGroup") {
-				try {
-					if (!this._richText.queryCommandEnabled("justifyleft")) {
-						item.disable(false, true);
-					} else {
-						item.enable(false, true);
-						var jitems = item.getItems();
-						for (var j = 0; j < jitems.length; j++) {
-							var name = jitems[j]._name;
-							var value = this._richText.queryCommandValue(name);
-							if (typeof value == "boolean" && value) {
-								value = name;
-								break;
-							} else {
-								if (typeof value == "string") {
-									value = "justify" + value;
-								} else {
-									value = null;
-								}
-							}
-						}
-						if (!value) {
-							value = "justifyleft";
-						}
-						item.setValue(value, false, true);
-					}
-				}
-				catch (err) {
-				}
-			} else {
-				if (cmd == "listGroup") {
-					var litems = item.getItems();
-					for (var j = 0; j < litems.length; j++) {
-						this.updateItem(litems[j]);
-					}
-				} else {
-					this.updateItem(item);
-				}
-			}
-		}
-	}
-}, updateItem:function (item) {
-	try {
-		var cmd = item._name;
-		var enabled = this._richText.queryCommandEnabled(cmd);
-		item.setEnabled(enabled, false, true);
-		var active = this._richText.queryCommandState(cmd);
-		if (active && cmd == "underline") {
-			active = !this._richText.queryCommandEnabled("unlink");
-		}
-		item.setSelected(active, false, true);
-		return true;
-	}
-	catch (err) {
-		return false;
-	}
-}, supportedCommands:dojo.widget.Editor.supportedCommands.concat(), isSupportedCommand:function (cmd) {
-	var yes = dojo.lang.inArray(cmd, this.supportedCommands);
-	if (!yes) {
-		try {
-			var richText = this._richText || dojo.widget.HtmlRichText.prototype;
-			yes = richText.queryCommandAvailable(cmd);
-		}
-		catch (E) {
-		}
-	}
-	return yes;
-}, getCommandImage:function (cmd) {
-	if (cmd == "|") {
-		return cmd;
-	} else {
-		return dojo.uri.moduleUri("dojo.widget", "templates/buttons/" + cmd + ".gif");
-	}
-}, _action:function (e) {
-	this._fire("onAction", e.getValue());
-}, _setValue:function (a, b) {
-	this._fire("onAction", a.getValue(), b);
-}, _save:function (e) {
-	if (!this._richText.isClosed) {
-		if (this.saveUrl.length) {
-			var content = {};
-			content[this.saveArgName] = this.getHtml();
-			dojo.io.bind({method:this.saveMethod, url:this.saveUrl, content:content});
-		} else {
-			dojo.debug("please set a saveUrl for the editor");
-		}
-		if (this.closeOnSave) {
-			this._richText.close(e.getName().toLowerCase() == "save");
-		}
-	}
-}, _close:function (e) {
-	if (!this._richText.isClosed) {
-		this._richText.close(e.getName().toLowerCase() == "save");
-	}
-}, onAction:function (cmd, value) {
-	switch (cmd) {
-	  case "createlink":
-		if (!(value = prompt("Please enter the URL of the link:", "http://"))) {
-			return;
-		}
-		break;
-	  case "insertimage":
-		if (!(value = prompt("Please enter the URL of the image:", "http://"))) {
-			return;
-		}
-		break;
-	}
-	this._richText.execCommand(cmd, value);
-}, fillInTemplate:function (args, frag) {
-}, _fire:function (eventName) {
-	if (dojo.lang.isFunction(this[eventName])) {
-		var args = [];
-		if (arguments.length == 1) {
-			args.push(this);
-		} else {
-			for (var i = 1; i < arguments.length; i++) {
-				args.push(arguments[i]);
-			}
-		}
-		this[eventName].apply(this, args);
-	}
-}, getHtml:function () {
-	this._richText.contentFilters = this._richText.contentFilters.concat(this.contentFilters);
-	return this._richText.getEditorContent();
-}, getEditorContent:function () {
-	return this.getHtml();
-}, onClose:function (save, hide) {
-	this.disableToolbar(hide);
-	if (save) {
-		this._fire("onSave");
-	} else {
-		this._fire("onCancel");
-	}
-}, onLoad:function () {
-}, onSave:function () {
-}, onCancel:function () {
-}});
-


Mime
View raw message