[Dojo-checkins] alex - r3568 - trunk/src/widget

dojo-checkins-admin at dojotoolkit.org dojo-checkins-admin at dojotoolkit.org
Sun Apr 16 05:24:04 MDT 2006


Author: alex
Date: Sun Apr 16 05:24:03 2006
New Revision: 3568

Modified:
   trunk/src/widget/RichText.js
Log:
moving to defineWidget style


Modified: trunk/src/widget/RichText.js
==============================================================================
--- trunk/src/widget/RichText.js	(original)
+++ trunk/src/widget/RichText.js	Sun Apr 16 05:24:03 2006
@@ -15,1294 +15,1293 @@
 		'style="display:none;position:absolute;top:-100px;left:-100px;height:3px;width:3px;overflow:hidden;"></textarea>');
 }catch(e){ }
 
-dojo.widget.tags.addParseTreeHandler("dojo:richtext");
+dojo.widget.defineWidget(
+	"dojo.widget.html.RichText",
+	dojo.widget.HtmlWidget,
+	{
+		/** whether to inherit the parent's width or simply use 100% */
+		inheritWidth: false,
+		focusOnLoad: true,
+		
+		/**
+		 * If a save name is specified the content is saved and restored if the
+		 * editor is not properly closed after editing has started.
+		 */
+		saveName: "",
+		_content: "",
+		
+		/* set height to fix the editor at a specific height, with scrolling */
+		height: null,
+
+		/** The minimum height that the editor should have */
+		minHeight: "1em",
+		
+		isClosed: true,
+		isLoaded: false,
+		
+		/** whether to use the active-x object in IE */
+		useActiveX: false,
+		
+		_SEPARATOR: "@@**%%__RICHTEXTBOUNDRY__%%**@@",
 
-dojo.widget.html.RichText = function () {
-	dojo.widget.HtmlWidget.call(this);
-	this.contentFilters = [];
-	// this.contentFilters.push(this.defaultContentCleaner);
-	
-	this._keyHandlers = {};
-}
-dojo.inherits(dojo.widget.html.RichText, dojo.widget.HtmlWidget);
-
-dojo.lang.extend(dojo.widget.html.RichText, {
-
-	widgetType: "richtext",
-
-	/** whether to inherit the parent's width or simply use 100% */
-	inheritWidth: false,
-	focusOnLoad: true,
-	
-	/**
-	 * If a save name is specified the content is saved and restored if the
-	 * editor is not properly closed after editing has started.
-	 */
-	saveName: "",
-	_content: "",
-	
-	/* set height to fix the editor at a specific height, with scrolling */
-	height: null,
-
-	/** The minimum height that the editor should have */
-	minHeight: "1em",
-	
-	isClosed: true,
-	isLoaded: false,
-	
-	/** whether to use the active-x object in IE */
-	useActiveX: false,
-	
-	_SEPARATOR: "@@**%%__RICHTEXTBOUNDRY__%%**@@",
-
-	// contentFilters: [],
-
-	/*
-	defaultContentCleaner: function(content){
-		if(!dojo.render.html.ie){
-			return content;
-		}
+		// contentFilters: [],
 
-		content = content.replace(/\x20/g, " ");
-		// alert(content);
-		return content;
-	},
-	*/
+		/*
+		defaultContentCleaner: function(content){
+			if(!dojo.render.html.ie){
+				return content;
+			}
 
-/* Init
- *******/
+			content = content.replace(/\x20/g, " ");
+			// alert(content);
+			return content;
+		},
+		*/
 
-	fillInTemplate: function(){
-		this.open();
+	/* Init
+	 *******/
 
-		// add the formatting functions
-		var funcs = ["queryCommandEnabled", "queryCommandState",
-			"queryCommandValue", "execCommand"];
-		for (var i = 0; i < funcs.length; i++) {
-			dojo.event.connect("around", this, funcs[i], this, "_normalizeCommand");
-		}
-		
-		// backwards compatibility, needs to be removed
-		dojo.event.connect(this, "onKeyPressed", this, "afterKeyPress");
-		dojo.event.connect(this, "onKeyPress", this, "keyPress");
-		dojo.event.connect(this, "onKeyDown", this, "keyDown");
-		dojo.event.connect(this, "onKeyUp", this, "keyUp");
-
-		// add default some key handlers		
-		var ctrl = this.KEY_CTRL;
-		var exec = function (cmd, arg) {
-			return arguments.length == 1 ? function () { this.execCommand(cmd); } :
-				function () { this.execCommand(cmd, arg); }
-		}
+		fillInTemplate: function(){
+			this.open();
+
+			// add the formatting functions
+			var funcs = ["queryCommandEnabled", "queryCommandState",
+				"queryCommandValue", "execCommand"];
+			for (var i = 0; i < funcs.length; i++) {
+				dojo.event.connect("around", this, funcs[i], this, "_normalizeCommand");
+			}
 			
-		this.addKeyHandler("b", ctrl, exec("bold"));
-		this.addKeyHandler("i", ctrl, exec("italic"));
-		this.addKeyHandler("u", ctrl, exec("underline"));
-		this.addKeyHandler("a", ctrl, exec("selectall"));
-		//this.addKeyHandler("k", ctrl, exec("createlink", ""));
-		//this.addKeyHandler("K", ctrl, exec("unlink"));
-		this.addKeyHandler("Z", ctrl, exec("redo"));
-		this.addKeyHandler("s", ctrl, function () { this.save(true); });
-		
-		this.addKeyHandler("1", ctrl, exec("formatblock", "h1"));
-		this.addKeyHandler("2", ctrl, exec("formatblock", "h2"));
-		this.addKeyHandler("3", ctrl, exec("formatblock", "h3"));
-		this.addKeyHandler("4", ctrl, exec("formatblock", "h4"));
+			// backwards compatibility, needs to be removed
+			dojo.event.connect(this, "onKeyPressed", this, "afterKeyPress");
+			dojo.event.connect(this, "onKeyPress", this, "keyPress");
+			dojo.event.connect(this, "onKeyDown", this, "keyDown");
+			dojo.event.connect(this, "onKeyUp", this, "keyUp");
+
+			// add default some key handlers		
+			var ctrl = this.KEY_CTRL;
+			var exec = function (cmd, arg) {
+				return arguments.length == 1 ? function () { this.execCommand(cmd); } :
+					function () { this.execCommand(cmd, arg); }
+			}
 				
-		this.addKeyHandler("\\", ctrl, exec("insertunorderedlist"));
-	},
+			this.addKeyHandler("b", ctrl, exec("bold"));
+			this.addKeyHandler("i", ctrl, exec("italic"));
+			this.addKeyHandler("u", ctrl, exec("underline"));
+			this.addKeyHandler("a", ctrl, exec("selectall"));
+			//this.addKeyHandler("k", ctrl, exec("createlink", ""));
+			//this.addKeyHandler("K", ctrl, exec("unlink"));
+			this.addKeyHandler("Z", ctrl, exec("redo"));
+			this.addKeyHandler("s", ctrl, function () { this.save(true); });
+			
+			this.addKeyHandler("1", ctrl, exec("formatblock", "h1"));
+			this.addKeyHandler("2", ctrl, exec("formatblock", "h2"));
+			this.addKeyHandler("3", ctrl, exec("formatblock", "h3"));
+			this.addKeyHandler("4", ctrl, exec("formatblock", "h4"));
+					
+			this.addKeyHandler("\\", ctrl, exec("insertunorderedlist"));
+		},
 
-	/**
-	 * Transforms the node referenced in this.domNode into a rich text editing
-	 * node. This can result in the creation and replacement with an <iframe> if
-	 * designMode is used, an <object> and active-x component if inside of IE or
-	 * a reguler element if contentEditable is available.
-	 */
-	open: function (element) {
-		dojo.event.topic.publish("dojo.widget.RichText::open", this);
-
-		if (!this.isClosed) { this.close(); }
-		this._content = "";
-		if (arguments.length == 1) { this.domNode = element; } // else unchanged
-		
-		if(this.domNode.nodeName.toLowerCase() == "textarea"){
-			this.textarea = this.domNode;
-			var html = dojo.string.trim(this.textarea.value);
-			if(html == ""){ html = "&nbsp;"; }
-			this.domNode = document.createElement("div");
-			with(this.textarea.style){
-				display = "block";
-				position = "absolute";
-				width = "1px";
-				height = "1px";
-				border = margin = padding = "0px";
-				visiblity = "hidden";
-			}
-			dojo.dom.insertBefore(this.domNode, this.textarea);
-			// this.domNode.innerHTML = html;
-			
-			if(this.textarea.form){
-				dojo.event.connect(this.textarea.form, "onsubmit", 
-					// FIXME: should we be calling close() here instead?
-					dojo.lang.hitch(this, function(){
-						this.textarea.value = this.getEditorContent();
-					})
-				);
-			}
-			
-			// dojo plucks our original domNode from the document so we need
-			// to go back and put ourselves back in
-			var editor = this;
-			dojo.event.connect(this, "postCreate", function (){
-				dojo.dom.insertAfter(editor.textarea, editor.domNode);
-			});
-		} else {
-			var html = dojo.string.trim(this.domNode.innerHTML);
-			if(html == ""){ html = "&nbsp;"; }
-		}
+		/**
+		 * Transforms the node referenced in this.domNode into a rich text editing
+		 * node. This can result in the creation and replacement with an <iframe> if
+		 * designMode is used, an <object> and active-x component if inside of IE or
+		 * a reguler element if contentEditable is available.
+		 */
+		open: function (element) {
+			dojo.event.topic.publish("dojo.widget.RichText::open", this);
+
+			if (!this.isClosed) { this.close(); }
+			this._content = "";
+			if (arguments.length == 1) { this.domNode = element; } // else unchanged
+
+			if(this.domNode.nodeName.toLowerCase() == "textarea"){
+				this.textarea = this.domNode;
+				var html = dojo.string.trim(this.textarea.value);
+				if(html == ""){ html = "&nbsp;"; }
+				this.domNode = document.createElement("div");
+				with(this.textarea.style){
+					display = "block";
+					position = "absolute";
+					width = "1px";
+					height = "1px";
+					border = margin = padding = "0px";
+					visiblity = "hidden";
+				}
+				dojo.dom.insertBefore(this.domNode, this.textarea);
+				// this.domNode.innerHTML = html;
 				
-		this._oldHeight = dojo.style.getContentHeight(this.domNode);
-		this._oldWidth = dojo.style.getContentWidth(this.domNode);
-
-		this._firstChildContributingMargin = this._getContributingMargin(this.domNode, "top");
-		this._lastChildContributingMargin = this._getContributingMargin(this.domNode, "bottom");
-
-		this.savedContent = document.createElement("div");
-		while (this.domNode.hasChildNodes()) {
-			this.savedContent.appendChild(this.domNode.firstChild);
-		}
-		
-		// If we're a list item we have to put in a blank line to force the
-		// bullet to nicely align at the top of text
-		if (this.domNode.nodeName == "LI") { this.domNode.innerHTML = " <br>"; }
+				if(this.textarea.form){
+					dojo.event.connect(this.textarea.form, "onsubmit", 
+						// FIXME: should we be calling close() here instead?
+						dojo.lang.hitch(this, function(){
+							this.textarea.value = this.getEditorContent();
+						})
+					);
+				}
 				
-		if(this.saveName != ""){
-			var saveTextarea = document.getElementById("dojo.widget.RichText.savedContent");
-			if (saveTextarea.value != "") {
-				var datas = saveTextarea.value.split(this._SEPARATOR);
-				for (var i = 0; i < datas.length; i++) {
-					var data = datas[i].split(":");
-					if (data[0] == this.saveName) {
-						html = data[1];
-						datas.splice(i, 1);
-						break;
-					}
-				}				
+				// dojo plucks our original domNode from the document so we need
+				// to go back and put ourselves back in
+				var editor = this;
+				dojo.event.connect(this, "postCreate", function (){
+					dojo.dom.insertAfter(editor.textarea, editor.domNode);
+				});
+			}else{
+				var html = dojo.string.trim(this.domNode.innerHTML);
+				if(html == ""){ html = "&nbsp;"; }
+			}
+					
+			this._oldHeight = dojo.style.getContentHeight(this.domNode);
+			this._oldWidth = dojo.style.getContentWidth(this.domNode);
+
+			this._firstChildContributingMargin = this._getContributingMargin(this.domNode, "top");
+			this._lastChildContributingMargin = this._getContributingMargin(this.domNode, "bottom");
+
+			this.savedContent = document.createElement("div");
+			while (this.domNode.hasChildNodes()) {
+				this.savedContent.appendChild(this.domNode.firstChild);
+			}
+			
+			// If we're a list item we have to put in a blank line to force the
+			// bullet to nicely align at the top of text
+			if (this.domNode.nodeName == "LI") { this.domNode.innerHTML = " <br>"; }
+					
+			if(this.saveName != ""){
+				var saveTextarea = document.getElementById("dojo.widget.RichText.savedContent");
+				if (saveTextarea.value != "") {
+					var datas = saveTextarea.value.split(this._SEPARATOR);
+					for (var i = 0; i < datas.length; i++) {
+						var data = datas[i].split(":");
+						if (data[0] == this.saveName) {
+							html = data[1];
+							datas.splice(i, 1);
+							break;
+						}
+					}				
+				}
+				dojo.event.connect("before", window, "onunload", this, "_saveContent");
+				// dojo.event.connect(window, "onunload", this, "_saveContent");
 			}
-			dojo.event.connect("before", window, "onunload", this, "_saveContent");
-		}
-
-		// Safari's selections go all out of whack if we do it inline,
-		// so for now IE is our only hero
-		//if (typeof document.body.contentEditable != "undefined") {
-		if (this.useActiveX && dojo.render.html.ie) { // active-x
-			this._drawObject(html);
-		} else if (dojo.render.html.ie) { // contentEditable, easy
-			this.editNode = document.createElement("div");
-			with (this.editNode) {
-				innerHTML = html;
-				contentEditable = true;
-				style.height = this.height ? this.height : this.minHeight;
-			}
-
-			if (this.height) this.editNode.style.overflowY="scroll";
-			// FIXME: setting contentEditable on switches this element to
-			// IE's hasLayout mode, triggering weird margin collapsing
-			// behavior. It's particularly bad if the element you're editing
-			// contains childnodes that don't have margin: defined in local
-			// css rules. It would be nice if it was possible to hack around
-			// this. Sadly _firstChildContributingMargin and 
-			// _lastChildContributingMargin don't work on IE unless all
-			// elements have margins set in CSS :-(
-
-			this.domNode.appendChild(this.editNode);
-
-			var events = ["onBlur", "onFocus", "onKeyPress",
-				"onKeyDown", "onKeyUp", "onClick"];
-			for (var i = 0; i < events.length; i++) {
-				this.connect(this.editNode, events[i].toLowerCase(), events[i]);
-			}
-		
-			this.window = window;
-			this.document = document;
-			
-			this.onLoad();
-		} else { // designMode in iframe
-			this._drawIframe(html);
-		}
-
-		// TODO: this is a guess at the default line-height, kinda works
-		if (this.domNode.nodeName == "LI") { this.domNode.lastChild.style.marginTop = "-1.2em"; }
-		dojo.html.addClass(this.domNode, "RichTextEditable");
-		
-		this.isClosed = false;
-	},
-
-	_hasCollapseableMargin: function(element, side) {
-		// check if an element has padding or borders on the given side
-		// which would prevent it from collapsing margins
-		if (dojo.style.getPixelValue(element, 
-									 'border-'+side+'-width', 
-									 false)) {
-			return false;
-		} else if (dojo.style.getPixelValue(element, 
-											'padding-'+side,
-											false)) {
-			return false;
-		} else {
-			return true;
-		}
-	},
 
-	_getContributingMargin:	function(element, topOrBottom) {
-		// calculate how much margin this element and its first or last
-		// child are contributing to the total margin between this element
-		// and the adjacent node. CSS border collapsing makes this
-		// necessary.
-
-		if (topOrBottom == "top") {
-			var siblingAttr = "previousSibling";
-			var childSiblingAttr = "nextSibling";
-			var childAttr = "firstChild";
-			var marginProp = "margin-top";
-			var siblingMarginProp = "margin-bottom";
-		} else {
-			var siblingAttr = "nextSibling";
-			var childSiblingAttr = "previousSibling";
-			var childAttr = "lastChild";
-			var marginProp = "margin-bottom";
-			var siblingMarginProp = "margin-top";
-		}
+			// Safari's selections go all out of whack if we do it inline,
+			// so for now IE is our only hero
+			//if (typeof document.body.contentEditable != "undefined") {
+			if (this.useActiveX && dojo.render.html.ie) { // active-x
+				this._drawObject(html);
+			} else if (dojo.render.html.ie) { // contentEditable, easy
+				this.editNode = document.createElement("div");
+				with (this.editNode) {
+					innerHTML = html;
+					contentEditable = true;
+					style.height = this.height ? this.height : this.minHeight;
+				}
 
-		var elementMargin = dojo.style.getPixelValue(element, marginProp, false);
+				if (this.height) this.editNode.style.overflowY="scroll";
+				// FIXME: setting contentEditable on switches this element to
+				// IE's hasLayout mode, triggering weird margin collapsing
+				// behavior. It's particularly bad if the element you're editing
+				// contains childnodes that don't have margin: defined in local
+				// css rules. It would be nice if it was possible to hack around
+				// this. Sadly _firstChildContributingMargin and 
+				// _lastChildContributingMargin don't work on IE unless all
+				// elements have margins set in CSS :-(
+
+				this.domNode.appendChild(this.editNode);
+
+				var events = ["onBlur", "onFocus", "onKeyPress",
+					"onKeyDown", "onKeyUp", "onClick"];
+				for (var i = 0; i < events.length; i++) {
+					this.connect(this.editNode, events[i].toLowerCase(), events[i]);
+				}
+			
+				this.window = window;
+				this.document = document;
+				
+				this.onLoad();
+			} else { // designMode in iframe
+				this._drawIframe(html);
+			}
 
-		function isSignificantNode(element) {
-			// see if an node is significant in the current context
-			// for calulating margins
-			return !(element.nodeType==3 && dojo.string.isBlank(element.data)) 
-				&& dojo.style.getStyle(element, "display") != "none" 
-				&& !dojo.style.isPositionAbsolute(element);
-		}
+			// TODO: this is a guess at the default line-height, kinda works
+			if (this.domNode.nodeName == "LI") { this.domNode.lastChild.style.marginTop = "-1.2em"; }
+			dojo.html.addClass(this.domNode, "RichTextEditable");
+			
+			this.isClosed = false;
+		},
 
-		// walk throuh first/last children to find total collapsed margin size
-		var childMargin = 0;
-		var child = element[childAttr];
-		while (child) {
-			// skip over insignificant elements (whitespace, etc)
-			while ((!isSignificantNode(child)) && child[childSiblingAttr]) {
-				child = child[childSiblingAttr];
-			}
-					  
-			childMargin = Math.max(childMargin, dojo.style.getPixelValue(child, marginProp, false));
-			// stop if we hit a bordered/padded element
-			if (!this._hasCollapseableMargin(child, topOrBottom)) break;
-			child = child[childAttr];								   
-		}
+		_hasCollapseableMargin: function(element, side) {
+			// check if an element has padding or borders on the given side
+			// which would prevent it from collapsing margins
+			if (dojo.style.getPixelValue(element, 
+										 'border-'+side+'-width', 
+										 false)) {
+				return false;
+			} else if (dojo.style.getPixelValue(element, 
+												'padding-'+side,
+												false)) {
+				return false;
+			} else {
+				return true;
+			}
+		},
 
-		// if this element has a border, return full child margin immediately
-		// as there won't be any margin collapsing
-		if (!this._hasCollapseableMargin(element, topOrBottom)){ return parseInt(childMargin); }
-
-		// find margin supplied by nearest sibling
-		var contextMargin = 0;
-		var sibling = element[siblingAttr];
-		while (sibling) {
-			if (isSignificantNode(sibling)) {
-				contextMargin = dojo.style.getPixelValue(sibling, 
-														 siblingMarginProp, 
-														 false);
-				break;
+		_getContributingMargin:	function(element, topOrBottom) {
+			// calculate how much margin this element and its first or last
+			// child are contributing to the total margin between this element
+			// and the adjacent node. CSS border collapsing makes this
+			// necessary.
+
+			if (topOrBottom == "top") {
+				var siblingAttr = "previousSibling";
+				var childSiblingAttr = "nextSibling";
+				var childAttr = "firstChild";
+				var marginProp = "margin-top";
+				var siblingMarginProp = "margin-bottom";
+			} else {
+				var siblingAttr = "nextSibling";
+				var childSiblingAttr = "previousSibling";
+				var childAttr = "lastChild";
+				var marginProp = "margin-bottom";
+				var siblingMarginProp = "margin-top";
+			}
+
+			var elementMargin = dojo.style.getPixelValue(element, marginProp, false);
+
+			function isSignificantNode(element) {
+				// see if an node is significant in the current context
+				// for calulating margins
+				return !(element.nodeType==3 && dojo.string.isBlank(element.data)) 
+					&& dojo.style.getStyle(element, "display") != "none" 
+					&& !dojo.style.isPositionAbsolute(element);
+			}
+
+			// walk throuh first/last children to find total collapsed margin size
+			var childMargin = 0;
+			var child = element[childAttr];
+			while (child) {
+				// skip over insignificant elements (whitespace, etc)
+				while ((!isSignificantNode(child)) && child[childSiblingAttr]) {
+					child = child[childSiblingAttr];
+				}
+						  
+				childMargin = Math.max(childMargin, dojo.style.getPixelValue(child, marginProp, false));
+				// stop if we hit a bordered/padded element
+				if (!this._hasCollapseableMargin(child, topOrBottom)) break;
+				child = child[childAttr];								   
+			}
+
+			// if this element has a border, return full child margin immediately
+			// as there won't be any margin collapsing
+			if (!this._hasCollapseableMargin(element, topOrBottom)){ return parseInt(childMargin); }
+
+			// find margin supplied by nearest sibling
+			var contextMargin = 0;
+			var sibling = element[siblingAttr];
+			while (sibling) {
+				if (isSignificantNode(sibling)) {
+					contextMargin = dojo.style.getPixelValue(sibling, 
+															 siblingMarginProp, 
+															 false);
+					break;
+				}
+				sibling = sibling[siblingAttr];
+			}
+			if (!sibling) { // no sibling, look at parent's margin instead
+				contextMargin = dojo.style.getPixelValue(element.parentNode, 
+												marginProp, false);
 			}
-			sibling = sibling[siblingAttr];
-		}
-		if (!sibling) { // no sibling, look at parent's margin instead
-			contextMargin = dojo.style.getPixelValue(element.parentNode, 
-											marginProp, false);
-		}
 
-		if (childMargin > elementMargin) {
-			return parseInt(Math.max((childMargin-elementMargin)-contextMargin, 0));
-		} else {
-			return 0;
-		}
+			if (childMargin > elementMargin) {
+				return parseInt(Math.max((childMargin-elementMargin)-contextMargin, 0));
+			} else {
+				return 0;
+			}
+			
+		},
 		
-	},
-	
-	/** Draws an iFrame using the existing one if one exists. 
-		Used by Mozilla, Safari, and Opera */
-	_drawIframe: function (html) {
-
-		// detect firefox < 1.5, which has some iframe loading issues
-		var oldMoz = Boolean(dojo.render.html.moz && (
-								typeof window.XML == 'undefined'))
-
-		if (!this.iframe) {
-			var currentDomain = (new dojo.uri.Uri(document.location)).host;
-			this.iframe = document.createElement("iframe");
-			with (this.iframe) {
-				scrolling = this.height ? "auto" : "no";
-				style.border = "none";
-				style.lineHeight = "0"; // squash line height
-				style.verticalAlign = "bottom";
+		/** Draws an iFrame using the existing one if one exists. 
+			Used by Mozilla, Safari, and Opera */
+		_drawIframe: function (html) {
+
+			// detect firefox < 1.5, which has some iframe loading issues
+			var oldMoz = Boolean(dojo.render.html.moz && (
+									typeof window.XML == 'undefined'))
+
+			if (!this.iframe) {
+				var currentDomain = (new dojo.uri.Uri(document.location)).host;
+				this.iframe = document.createElement("iframe");
+				with (this.iframe) {
+					scrolling = this.height ? "auto" : "no";
+					style.border = "none";
+					style.lineHeight = "0"; // squash line height
+					style.verticalAlign = "bottom";
+				}
 			}
-		}
-		// opera likes this to be outside the with block
-		this.iframe.src = dojo.uri.dojoUri("src/widget/templates/richtextframe.html") + "#" + ((document.domain != currentDomain) ? document.domain : "");
-		this.iframe.width = this.inheritWidth ? this._oldWidth : "100%";
-		if (this.height) {
-			this.iframe.style.height = this.height;
-		} else {
-			var height = this._oldHeight;
-			if (this._hasCollapseableMargin(this.domNode, 'top')) {
-				height += this._firstChildContributingMargin;
+			// opera likes this to be outside the with block
+			this.iframe.src = dojo.uri.dojoUri("src/widget/templates/richtextframe.html") + "#" + ((document.domain != currentDomain) ? document.domain : "");
+			this.iframe.width = this.inheritWidth ? this._oldWidth : "100%";
+			if (this.height) {
+				this.iframe.style.height = this.height;
+			} else {
+				var height = this._oldHeight;
+				if (this._hasCollapseableMargin(this.domNode, 'top')) {
+					height += this._firstChildContributingMargin;
+				}
+				if (this._hasCollapseableMargin(this.domNode, 'bottom')) {
+					height += this._lastChildContributingMargin;
+				}
+				this.iframe.height = height;
 			}
-			if (this._hasCollapseableMargin(this.domNode, 'bottom')) {
-				height += this._lastChildContributingMargin;
+
+			// show existing content behind iframe for now
+			var tmpContent = document.createElement('div');
+			tmpContent.style.position = "absolute";
+			tmpContent.innerHTML = html;
+			if (tmpContent.firstChild && tmpContent.firstChild.style) {
+				tmpContent.firstChild.style.marginTop = this._firstChildContributingMargin+"px";
+				tmpContent.lastChild.style.marginBottom = this._lastChildContributingMargin+"px";
+				
 			}
-			this.iframe.height = height;
-		}
+			this.domNode.appendChild(tmpContent);
+			this.domNode.appendChild(this.iframe);
 
-		// show existing content behind iframe for now
-		var tmpContent = document.createElement('div');
-		tmpContent.style.position = "absolute";
-		tmpContent.innerHTML = html;
-		if (tmpContent.firstChild && tmpContent.firstChild.style) {
-			tmpContent.firstChild.style.marginTop = this._firstChildContributingMargin+"px";
-			tmpContent.lastChild.style.marginBottom = this._lastChildContributingMargin+"px";
-			
-		}
-		this.domNode.appendChild(tmpContent);
-		this.domNode.appendChild(this.iframe);
+			var _iframeInitialized = false;
 
-		var _iframeInitialized = false;
+			// now we wait for onload. Janky hack!
+			var ifrFunc = dojo.lang.hitch(this, function(){
+				if(!_iframeInitialized){
+					_iframeInitialized = true;
+				}else{ return; }
+				if(!this.editNode){
+					if(this.iframe.contentWindow){
+						this.window = this.iframe.contentWindow;
+					}else{
+						// for opera
+						this.window = this.iframe.contentDocument.window;
+					}
+					this.document = this.iframe.contentDocument;
+								// curry the getStyle function
 
-		// now we wait for onload. Janky hack!
-		var ifrFunc = dojo.lang.hitch(this, function(){
-			if(!_iframeInitialized){
-				_iframeInitialized = true;
-			}else{ return; }
-			if(!this.editNode){
-				if(this.iframe.contentWindow){
-					this.window = this.iframe.contentWindow;
+					var getStyle = (function (domNode) { return function (style) {
+						return dojo.style.getStyle(domNode, style);
+					}; })(this.domNode);
+
+					var font =
+						getStyle('font-weight') + " " +
+						getStyle('font-size') + " " +
+						getStyle('font-family');
+					
+					// line height is tricky - applying a units value will mess things up.
+					// if we can't get a non-units value, bail out.
+					var lineHeight = "1.0";
+					var lineHeightStyle = dojo.style.getUnitValue(this.domNode, 'line-height');
+					if (lineHeightStyle.value && lineHeightStyle.units=="") {
+						lineHeight = lineHeightStyle.value;
+					}
+
+					dojo.style.insertCssText(
+						'    body,html { background: transparent; padding: 0; margin: 0; }\n' +
+						// TODO: left positioning will case contents to disappear out of view
+						//       if it gets too wide for the visible area
+						'    body { top: 0; left: 0; right: 0;' +
+						(this.height ? '' : ' position: fixed; ') + 
+						'        font: ' + font + ';\n' + 
+						'        min-height: ' + this.minHeight + '; \n' +
+						'        line-height: ' + lineHeight + '} \n' +
+						'    p { margin: 1em 0 !important; }\n' +
+						'    body > *:first-child { padding-top: 0 !important; margin-top: ' + this._firstChildContributingMargin + 'px !important; }\n' + // FIXME: test firstChild nodeType
+						'    body > *:last-child { padding-bottom: 0 !important; margin-bottom: ' + this._lastChildContributingMargin + 'px !important; }\n' +
+						'    li > ul:-moz-first-node, li > ol:-moz-first-node { padding-top: 1.2em; }\n' +
+						'    li { min-height: 1.2em; }\n' +
+						//'    p,ul,li { padding-top: 0; padding-bottom: 0; margin-top:0; margin-bottom: 0; }\n' + 
+						'', this.document);
+
+					tmpContent.parentNode.removeChild(tmpContent);
+					this.document.body.innerHTML = html;
+					this.onLoad();
 				}else{
-					// for opera
-					this.window = this.iframe.contentDocument.window;
+					tmpContent.parentNode.removeChild(tmpContent);
+					this.editNode.innerHTML = html;
+					this.onDisplayChanged();
 				}
-				this.document = this.iframe.contentDocument;
-							// curry the getStyle function
-
-				var getStyle = (function (domNode) { return function (style) {
-					return dojo.style.getStyle(domNode, style);
-				}; })(this.domNode);
-
-				var font =
-					getStyle('font-weight') + " " +
-					getStyle('font-size') + " " +
-					getStyle('font-family');
-				
-				// line height is tricky - applying a units value will mess things up.
-				// if we can't get a non-units value, bail out.
-				var lineHeight = "1.0";
-				var lineHeightStyle = dojo.style.getUnitValue(this.domNode, 'line-height');
-				if (lineHeightStyle.value && lineHeightStyle.units=="") {
-					lineHeight = lineHeightStyle.value;
-				}
-
-				dojo.style.insertCssText(
-					'    body,html { background: transparent; padding: 0; margin: 0; }\n' +
-					// TODO: left positioning will case contents to disappear out of view
-					//       if it gets too wide for the visible area
-					'    body { top: 0; left: 0; right: 0;' +
-					(this.height ? '' : ' position: fixed; ') + 
-					'        font: ' + font + ';\n' + 
-					'        min-height: ' + this.minHeight + '; \n' +
-					'        line-height: ' + lineHeight + '} \n' +
-					'    p { margin: 1em 0 !important; }\n' +
-					'    body > *:first-child { padding-top: 0 !important; margin-top: ' + this._firstChildContributingMargin + 'px !important; }\n' + // FIXME: test firstChild nodeType
-					'    body > *:last-child { padding-bottom: 0 !important; margin-bottom: ' + this._lastChildContributingMargin + 'px !important; }\n' +
-					'    li > ul:-moz-first-node, li > ol:-moz-first-node { padding-top: 1.2em; }\n' +
-					'    li { min-height: 1.2em; }\n' +
-					//'    p,ul,li { padding-top: 0; padding-bottom: 0; margin-top:0; margin-bottom: 0; }\n' + 
-					'', this.document);
+			});
 
-				tmpContent.parentNode.removeChild(tmpContent);
-				this.document.body.innerHTML = html;
-				this.onLoad();
-			}else{
-				tmpContent.parentNode.removeChild(tmpContent);
-				this.editNode.innerHTML = html;
-				this.onDisplayChanged();
-			}
-		});
-
-		if(this.editNode){
-			ifrFunc(); // iframe already exists, just set content
-		}else if(oldMoz){
-			this.iframe.onload = function(){
-		    	setTimeout(ifrFunc, 250);
+			if(this.editNode){
+				ifrFunc(); // iframe already exists, just set content
+			}else if(oldMoz){
+				this.iframe.onload = function(){
+					setTimeout(ifrFunc, 250);
+				}
+			}else{ // new mozillas, opera, safari
+				this.iframe.onload = ifrFunc;
 			}
-		}else{ // new mozillas, opera, safari
-			this.iframe.onload = ifrFunc;
-		}
-	},
-	
-	/** Draws an active x object, used by IE */
-	_drawObject: function (html) {
-		this.object = document.createElement("object");
-
-		with (this.object) {
-			classid = "clsid:2D360201-FFF5-11D1-8D03-00A0C959BC0A";
-			width = this.inheritWidth ? this._oldWidth : "100%";
-			style.height = this.height ? this.height : (this._oldHeight+"px");
-			Scrollbars = this.height ? true : false;
-			Appearance = this._activeX.appearance.flat;
-		}
-		this.domNode.appendChild(this.object);
+		},
+		
+		/** Draws an active x object, used by IE */
+		_drawObject: function (html) {
+			this.object = document.createElement("object");
+
+			with (this.object) {
+				classid = "clsid:2D360201-FFF5-11D1-8D03-00A0C959BC0A";
+				width = this.inheritWidth ? this._oldWidth : "100%";
+				style.height = this.height ? this.height : (this._oldHeight+"px");
+				Scrollbars = this.height ? true : false;
+				Appearance = this._activeX.appearance.flat;
+			}
+			this.domNode.appendChild(this.object);
+
+			this.object.attachEvent("DocumentComplete", dojo.lang.hitch(this, "onLoad"));
+			this.object.attachEvent("DisplayChanged", dojo.lang.hitch(this, "_updateHeight"));
+			this.object.attachEvent("DisplayChanged", dojo.lang.hitch(this, "onDisplayChanged"));
+
+			this.object.DocumentHTML = '<!doctype HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">' +
+				'<title></title>' +
+				'<style type="text/css">' +
+				'    body,html { padding: 0; margin: 0; }' + //font: ' + font + '; }' +
+				(this.height ? '' : '    body { overflow: hidden; }') +
+				//'    #bodywrapper {  }' +
+				'</style>' +
+				//'<base href="' + window.location + '">' +
+				'<body><div id="bodywrapper">' + html + '</div></body>';
+		},
 
-		this.object.attachEvent("DocumentComplete", dojo.lang.hitch(this, "onLoad"));
-		this.object.attachEvent("DisplayChanged", dojo.lang.hitch(this, "_updateHeight"));
-		this.object.attachEvent("DisplayChanged", dojo.lang.hitch(this, "onDisplayChanged"));
-
-		this.object.DocumentHTML = '<!doctype HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">' +
-			'<title></title>' +
-			'<style type="text/css">' +
-			'    body,html { padding: 0; margin: 0; }' + //font: ' + font + '; }' +
-			(this.height ? '' : '    body { overflow: hidden; }') +
-			//'    #bodywrapper {  }' +
-			'</style>' +
-			//'<base href="' + window.location + '">' +
-			'<body><div id="bodywrapper">' + html + '</div></body>';
-	},
+	/* Event handlers
+	 *****************/
 
-/* Event handlers
- *****************/
+		onLoad: function(e){
+			this.isLoaded = true;
+			if (this.object){
+				this.document = this.object.DOM;
+				this.editNode = this.document.body.firstChild;
+			}else if (this.iframe){
+				this.editNode = this.document.body;
+				this.connect(this, "onDisplayChanged", "_updateHeight");
+		
+				try { // sanity check for Mozilla
+					this.document.execCommand("useCSS", false, true); // old moz call
+					this.document.execCommand("styleWithCSS", false, false); // new moz call
+					//this.document.execCommand("insertBrOnReturn", false, false); // new moz call
+				}catch(e2){ }
+				
+				if (dojo.render.html.safari) {
+					/*
+					this.iframe.style.visiblity = "visible";
+					this.iframe.style.border = "1px solid black";
+					this.editNode.style.visiblity = "visible";
+					this.editNode.style.border = "1px solid black";
+					*/
+					// this.onDisplayChanged();
+					this.connect(this.editNode, "onblur", "onBlur");
+					this.connect(this.editNode, "onfocus", "onFocus");
+				
+					this.interval = setInterval(dojo.lang.hitch(this, "onDisplayChanged"), 750);
+					// dojo.raise("onload");
+					// dojo.debug(this.editNode.parentNode.parentNode.parentNode.nodeName);
+				} else if (dojo.render.html.mozilla || dojo.render.html.opera) {
+
+					// We need to unhook the blur event listener on close as we
+					// can encounter a garunteed crash in FF if another event is
+					// also fired
+					var doc = this.document;
+					var blurfp = dojo.event.browser.addListener(this.document, "blur", dojo.lang.hitch(this, "onBlur"));
+					var unBlur = { unBlur: function(e){
+							dojo.event.browser.removeListener(doc, "blur", blurfp);
+					} };
+					dojo.event.connect("before", this, "close", unBlur, "unBlur");
+					dojo.event.browser.addListener(this.document, "focus", dojo.lang.hitch(this, "onFocus"));
+				
+					// safari can't handle key listeners, it kills the speed
+					var addListener = dojo.event.browser.addListener;
+					addListener(this.document, "keypress", dojo.lang.hitch(this, "onKeyPress"));
+					addListener(this.document, "keydown", dojo.lang.hitch(this, "onKeyDown"));
+					addListener(this.document, "keyup", dojo.lang.hitch(this, "onKeyUp"));
+					addListener(this.document, "click", dojo.lang.hitch(this, "onClick"));
+				}
 
-	onLoad: function(e){
-		this.isLoaded = true;
-		if (this.object){
-			this.document = this.object.DOM;
-			this.editNode = this.document.body.firstChild;
-		}else if (this.iframe){
-			this.editNode = this.document.body;
-			this.connect(this, "onDisplayChanged", "_updateHeight");
-	
-			try { // sanity check for Mozilla
-				this.document.execCommand("useCSS", false, true); // old moz call
-				this.document.execCommand("styleWithCSS", false, false); // new moz call
-				//this.document.execCommand("insertBrOnReturn", false, false); // new moz call
-			}catch(e2){ }
+				// FIXME: when scrollbars appear/disappear this needs to be fired						
+			}
 			
-			if (dojo.render.html.safari) {
-				/*
-				this.iframe.style.visiblity = "visible";
-				this.iframe.style.border = "1px solid black";
-				this.editNode.style.visiblity = "visible";
-				this.editNode.style.border = "1px solid black";
-				*/
-				// this.onDisplayChanged();
-				this.connect(this.editNode, "onblur", "onBlur");
-				this.connect(this.editNode, "onfocus", "onFocus");
-			
-				this.interval = setInterval(dojo.lang.hitch(this, "onDisplayChanged"), 750);
-				// dojo.raise("onload");
-				// dojo.debug(this.editNode.parentNode.parentNode.parentNode.nodeName);
-			} else if (dojo.render.html.mozilla || dojo.render.html.opera) {
-
-				// We need to unhook the blur event listener on close as we
-				// can encounter a garunteed crash in FF if another event is
-				// also fired
-				var doc = this.document;
-				var blurfp = dojo.event.browser.addListener(this.document, "blur", dojo.lang.hitch(this, "onBlur"));
-				var unBlur = { unBlur: function(e){
-						dojo.event.browser.removeListener(doc, "blur", blurfp);
-				} };
-				dojo.event.connect("before", this, "close", unBlur, "unBlur");
-				dojo.event.browser.addListener(this.document, "focus", dojo.lang.hitch(this, "onFocus"));
-			
-				// safari can't handle key listeners, it kills the speed
-				var addListener = dojo.event.browser.addListener;
-				addListener(this.document, "keypress", dojo.lang.hitch(this, "onKeyPress"));
-				addListener(this.document, "keydown", dojo.lang.hitch(this, "onKeyDown"));
-				addListener(this.document, "keyup", dojo.lang.hitch(this, "onKeyUp"));
-				addListener(this.document, "click", dojo.lang.hitch(this, "onClick"));
+			if(this.focusOnLoad){
+				this.focus();
 			}
+			this.onDisplayChanged(e);
+		},
 
-			// FIXME: when scrollbars appear/disappear this needs to be fired						
-		}
+		/** Fired on keydown */
+		onKeyDown: function (e) {
+			// we need this event at the moment to get the events from control keys
+			// such as the backspace. It might be possible to add this to Dojo, so that
+			// keyPress events can be emulated by the keyDown and keyUp detection.
+		},
 		
-		if(this.focusOnLoad){
-			this.focus();
-		}
-		this.onDisplayChanged(e);
-	},
-
-	/** Fired on keydown */
-	onKeyDown: function (e) {
-		// we need this event at the moment to get the events from control keys
-		// such as the backspace. It might be possible to add this to Dojo, so that
-		// keyPress events can be emulated by the keyDown and keyUp detection.
-	},
-	
-	/** Fired on keyup */
-	onKeyUp: function (e) {
-	},
-	
-	KEY_CTRL: 1,
-	
-	/** Fired on keypress. */
-	onKeyPress: function (e) {
-		// handle the various key events
-
-		var character = e.charCode > 0 ? String.fromCharCode(e.charCode) : null;
-		var code = e.keyCode;
-
-		var modifiers = e.ctrlKey ? this.KEY_CTRL : 0;
-
-		if (this._keyHandlers[character]) {
-			var handlers = this._keyHandlers[character], i = 0, handler;
-			while (handler = handlers[i++]) {
-				if (modifiers == handler.modifiers) {
-					handler.handler.call(this);
-					e.preventDefault();
-					break;
-				}
-			}
-		}
+		/** Fired on keyup */
+		onKeyUp: function (e) {
+		},
 		
+		KEY_CTRL: 1,
 		
-		/*
-		// define some key combos
-		if (e.ctrlKey || e.metaKey) { // modifier pressed
-			switch (character) {
-				case "b": this.execCommand("bold"); break;
-				case "i": this.execCommand("italic"); break;
-				case "u": this.execCommand("underline"); break;
-				//case "a": this.execCommand("selectall"); break;
-				//case "k": this.execCommand("createlink", ""); break;
-				//case "K": this.execCommand("unlink"); break;
-				case "Z": this.execCommand("redo"); break;
-				case "s": this.close(true); break; // saves
-				
-				case "1": this.execCommand("formatblock", "h1"); break;
-				case "2": this.execCommand("formatblock", "h2"); break;
-				case "3": this.execCommand("formatblock", "h3"); break;
-				case "4": this.execCommand("formatblock", "h4"); break;
-				
-				case "\\": this.execCommand("insertunorderedlist"); break;
-				
-				default: switch (code) {
-					case e.KEY_LEFT_ARROW:
-					case e.KEY_RIGHT_ARROW:
-						//break; // preventDefault stops the browser
-						       // going through its history
+		/** Fired on keypress. */
+		onKeyPress: function (e) {
+			// handle the various key events
+
+			var character = e.charCode > 0 ? String.fromCharCode(e.charCode) : null;
+			var code = e.keyCode;
+
+			var modifiers = e.ctrlKey ? this.KEY_CTRL : 0;
+
+			if (this._keyHandlers[character]) {
+				var handlers = this._keyHandlers[character], i = 0, handler;
+				while (handler = handlers[i++]) {
+					if (modifiers == handler.modifiers) {
+						handler.handler.call(this);
+						e.preventDefault();
+						break;
+					}
+				}
+			}
+			
+			
+			/*
+			// define some key combos
+			if (e.ctrlKey || e.metaKey) { // modifier pressed
+				switch (character) {
+					case "b": this.execCommand("bold"); break;
+					case "i": this.execCommand("italic"); break;
+					case "u": this.execCommand("underline"); break;
+					//case "a": this.execCommand("selectall"); break;
+					//case "k": this.execCommand("createlink", ""); break;
+					//case "K": this.execCommand("unlink"); break;
+					case "Z": this.execCommand("redo"); break;
+					case "s": this.close(true); break; // saves
+					
+					case "1": this.execCommand("formatblock", "h1"); break;
+					case "2": this.execCommand("formatblock", "h2"); break;
+					case "3": this.execCommand("formatblock", "h3"); break;
+					case "4": this.execCommand("formatblock", "h4"); break;
+					
+					case "\\": this.execCommand("insertunorderedlist"); break;
+					
+					default: switch (code) {
+						case e.KEY_LEFT_ARROW:
+						case e.KEY_RIGHT_ARROW:
+							//break; // preventDefault stops the browser
+								   // going through its history
+						default:
+							preventDefault = false; break; // didn't handle here
+					}
+				}
+			} else {
+				switch (code) {
+					case e.KEY_TAB:
+					  // commenting out bcs it's crashing FF
+						// this.execCommand(e.shiftKey ? "unindent" : "indent");
+						// break;
 					default:
 						preventDefault = false; break; // didn't handle here
 				}
 			}
-		} else {
-			switch (code) {
-				case e.KEY_TAB:
-				  // commenting out bcs it's crashing FF
-					// this.execCommand(e.shiftKey ? "unindent" : "indent");
-					// break;
-				default:
-					preventDefault = false; break; // didn't handle here
-			}
-		}
-		
-		if (preventDefault) { e.preventDefault(); }
-		*/
-
-		// function call after the character has been inserted
-		dojo.lang.setTimeout(this, this.onKeyPressed, 1, e);
-	},
-	
-	addKeyHandler: function (key, modifiers, handler) {
-		if (!(this._keyHandlers[key] instanceof Array)) { this._keyHandlers[key] = []; }
-		this._keyHandlers[key].push({
-			modifiers: modifiers || 0,
-			handler: handler
-		});
-	},
-	
-	
-	
-	/**
-	 * Fired after a keypress event has occured and it's action taken. This
-	 * is useful if action needs to be taken after text operations have
-	 * finished
-	 */
-	onKeyPressed: function (e) {
-		// Mozilla adds a single <p> with an embedded <br> when you hit enter once:
-		//   <p><br>\n</p>
-		// when you hit enter again it adds another <br> inside your enter
-		//   <p><br>\n<br>\n</p>
-		// and if you hit enter again it splits the <br>s over 2 <p>s
-		//   <p><br>\n</p>\n<p><br>\n</p>
-		// now this assumes that <p>s have double the line-height of <br>s to work
-		// and so we need to remove the <p>s to ensure the position of the cursor
-		// changes from the users perspective when they hit enter, as the second two
-		// html snippets render the same when margins are set to 0.
-		
-		// TODO: doesn't really work; is this really needed?
-		//if (dojo.render.html.moz) {
-		//	for (var i = 0; i < this.document.getElementsByTagName("p").length; i++) {
-		//		var p = this.document.getElementsByTagName("p")[i];
-		//		if (p.innerHTML.match(/^<br>\s$/m)) {
-		//			while (p.hasChildNodes()) { p.parentNode.insertBefore(p.firstChild, p); }
-		//			p.parentNode.removeChild(p);
-		//		}
-		//	}
-		//}
-		this.onDisplayChanged(/*e*/); // can't pass in e
-	},
-	
-	onClick: function(e){ this.onDisplayChanged(e); },
-	onBlur: function(e){ },
-	_initialFocus: true,
-	onFocus: function(e){ 
-		if( (dojo.render.html.mozilla)&&(this._initialFocus) ){
-			this._initialFocus = false;
-			if(dojo.string.trim(this.editNode.innerHTML) == "&nbsp;"){
-				this.execCommand("selectall");
-				this.window.getSelection().collapseToStart();
-			}
-		}
-	},
+			
+			if (preventDefault) { e.preventDefault(); }
+			*/
 
-	blur: function () {
-		if (this.iframe) { this.window.blur(); }
-		else if (this.editNode) { this.editNode.blur(); }
-	},
-	
-	focus: function () {
-		if(this.iframe){
-			this.window.focus();
-		}else if(this.editNode){
-			this.editNode.focus();
-		}
-	},
-	
-	/** this event will be fired everytime the display context changes and the
-	 result needs to be reflected in the UI */
-	onDisplayChanged: function (e){ },
-	
-
-/* Formatting commands
- **********************/
-	
-	/** IE's Active X codes */
-	_activeX: {
-		command: {
-			bold: 5000,
-			italic: 5023,
-			underline: 5048,
-
-			justifycenter: 5024,
-			justifyleft: 5025,
-			justifyright: 5026,
-
-			cut: 5003,
-			copy: 5002,
-			paste: 5032,
-			"delete": 5004,
-
-			undo: 5049,
-			redo: 5033,
-
-			removeformat: 5034,
-			selectall: 5035,
-			unlink: 5050,
-
-			indent: 5018,
-			outdent: 5031,
-
-			insertorderedlist: 5030,
-			insertunorderedlist: 5051,
-
-			// table commands
-			inserttable: 5022,
-			insertcell: 5019,
-			insertcol: 5020,
-			insertrow: 5021,
-			deletecells: 5005,
-			deletecols: 5006,
-			deleterows: 5007,
-			mergecells: 5029,
-			splitcell: 5047,
-			
-			// the command need mapping, they don't translate directly
-			// to the contentEditable commands
-			setblockformat: 5043,
-			getblockformat: 5011,
-			getblockformatnames: 5012,
-			setfontname: 5044,
-			getfontname: 5013,
-			setfontsize: 5045,
-			getfontsize: 5014,
-			setbackcolor: 5042,
-			getbackcolor: 5010,
-			setforecolor: 5046,
-			getforecolor: 5015,
-			
-			findtext: 5008,
-			font: 5009,
-			hyperlink: 5016,
-			image: 5017,
-			
-			lockelement: 5027,
-			makeabsolute: 5028,
-			sendbackward: 5036,
-			bringforward: 5037,
-			sendbelowtext: 5038,
-			bringabovetext: 5039,
-			sendtoback: 5040,
-			bringtofront: 5041,
-			
-			properties: 5052
-		},
-		
-		ui: {
-			"default": 0,
-			prompt: 1,
-			noprompt: 2
-		},
-		
-		status: {
-			notsupported: 0,
-			disabled: 1,
-			enabled: 3,
-			latched: 7,
-			ninched: 11
-		},
-		
-		appearance: {
-			flat: 0,
-			inset: 1
-		},
-		
-		state: {
-			unchecked: 0,
-			checked: 1,
-			gray: 2
-		}
-	},
-	
-	/**
-	 * Used as the advice function by dojo.event.connect to map our
-	 * normalized set of commands to those supported by the target
-	 * browser
-	 *
-	 * @param arugments The arguments Array, containing at least one
-	 *                  item, the command and an optional second item,
-	 *                  an argument.
-	 */
-	_normalizeCommand: function (joinObject){
-		var drh = dojo.render.html;
-		
-		var command = joinObject.args[0].toLowerCase();
-		if(command == "formatblock"){
-			if(drh.safari){ command = "heading"; }
-			if(drh.ie){ joinObject.args[1] = "<"+joinObject.args[1]+">"; }
-		}
-		if (command == "hilitecolor" && !drh.mozilla) { command = "backcolor"; }
-		joinObject.args[0] = command;
+			// function call after the character has been inserted
+			dojo.lang.setTimeout(this, this.onKeyPressed, 1, e);
+		},
 		
-		if (joinObject.args.length > 1) { // a command was specified
-			var argument = joinObject.args[1];
-			if (command == "heading") { throw new Error("unimplemented"); }
-			joinObject.args[1] = argument;
-		}
+		addKeyHandler: function (key, modifiers, handler) {
+			if (!(this._keyHandlers[key] instanceof Array)) { this._keyHandlers[key] = []; }
+			this._keyHandlers[key].push({
+				modifiers: modifiers || 0,
+				handler: handler
+			});
+		},
 		
-		return joinObject.proceed();
-	},
-	
-	/**
-	 * Tests whether a command is supported by the host. Clients SHOULD check
-	 * whether a command is supported before attempting to use it, behaviour
-	 * for unsupported commands is undefined.
-	 *
-	 * @param command The command to test for
-	 * @return true if the command is supported, false otherwise
-	 */
-	queryCommandAvailable: function (command) {
-		var ie = 1;
-		var mozilla = 1 << 1;
-		var safari = 1 << 2;
-		var opera = 1 << 3;
-		function isSupportedBy (browsers) {
-			return {
-				ie: Boolean(browsers & ie),
-				mozilla: Boolean(browsers & mozilla),
-				safari: Boolean(browsers & safari),
-				opera: Boolean(browsers & opera)
+		
+		
+		/**
+		 * Fired after a keypress event has occured and it's action taken. This
+		 * is useful if action needs to be taken after text operations have
+		 * finished
+		 */
+		onKeyPressed: function (e) {
+			// Mozilla adds a single <p> with an embedded <br> when you hit enter once:
+			//   <p><br>\n</p>
+			// when you hit enter again it adds another <br> inside your enter
+			//   <p><br>\n<br>\n</p>
+			// and if you hit enter again it splits the <br>s over 2 <p>s
+			//   <p><br>\n</p>\n<p><br>\n</p>
+			// now this assumes that <p>s have double the line-height of <br>s to work
+			// and so we need to remove the <p>s to ensure the position of the cursor
+			// changes from the users perspective when they hit enter, as the second two
+			// html snippets render the same when margins are set to 0.
+			
+			// TODO: doesn't really work; is this really needed?
+			//if (dojo.render.html.moz) {
+			//	for (var i = 0; i < this.document.getElementsByTagName("p").length; i++) {
+			//		var p = this.document.getElementsByTagName("p")[i];
+			//		if (p.innerHTML.match(/^<br>\s$/m)) {
+			//			while (p.hasChildNodes()) { p.parentNode.insertBefore(p.firstChild, p); }
+			//			p.parentNode.removeChild(p);
+			//		}
+			//	}
+			//}
+			this.onDisplayChanged(/*e*/); // can't pass in e
+		},
+		
+		onClick: function(e){ this.onDisplayChanged(e); },
+		onBlur: function(e){ },
+		_initialFocus: true,
+		onFocus: function(e){ 
+			if( (dojo.render.html.mozilla)&&(this._initialFocus) ){
+				this._initialFocus = false;
+				if(dojo.string.trim(this.editNode.innerHTML) == "&nbsp;"){
+					this.execCommand("selectall");
+					this.window.getSelection().collapseToStart();
+				}
 			}
-		}
+		},
 
-		var supportedBy = null;
+		blur: function () {
+			if (this.iframe) { this.window.blur(); }
+			else if (this.editNode) { this.editNode.blur(); }
+		},
 		
-		switch (command.toLowerCase()) {
-			case "bold": case "italic": case "underline":
-			case "subscript": case "superscript":
-			case "fontname": case "fontsize":
-			case "forecolor": case "hilitecolor":
-			case "justifycenter": case "justifyfull": case "justifyleft": 
-			case "justifyright": case "delete": case "undo": case "redo":
-				supportedBy = isSupportedBy(mozilla | ie | safari | opera);
-				break;
+		focus: function () {
+			if(this.iframe){
+				this.window.focus();
+			}else if(this.editNode){
+				this.editNode.focus();
+			}
+		},
+		
+		/** this event will be fired everytime the display context changes and the
+		 result needs to be reflected in the UI */
+		onDisplayChanged: function (e){ },
+		
+
+	/* Formatting commands
+	 **********************/
+		
+		/** IE's Active X codes */
+		_activeX: {
+			command: {
+				bold: 5000,
+				italic: 5023,
+				underline: 5048,
+
+				justifycenter: 5024,
+				justifyleft: 5025,
+				justifyright: 5026,
+
+				cut: 5003,
+				copy: 5002,
+				paste: 5032,
+				"delete": 5004,
+
+				undo: 5049,
+				redo: 5033,
+
+				removeformat: 5034,
+				selectall: 5035,
+				unlink: 5050,
+
+				indent: 5018,
+				outdent: 5031,
+
+				insertorderedlist: 5030,
+				insertunorderedlist: 5051,
+
+				// table commands
+				inserttable: 5022,
+				insertcell: 5019,
+				insertcol: 5020,
+				insertrow: 5021,
+				deletecells: 5005,
+				deletecols: 5006,
+				deleterows: 5007,
+				mergecells: 5029,
+				splitcell: 5047,
 				
-			case "createlink": case "unlink": case "removeformat":
-			case "inserthorizontalrule": case "insertimage":
-			case "insertorderedlist": case "insertunorderedlist":
-			case "indent": case "outdent": case "formatblock": case "strikethrough": 
-			case "inserthtml":
-				supportedBy = isSupportedBy(mozilla | ie | opera);
-				break;
+				// the command need mapping, they don't translate directly
+				// to the contentEditable commands
+				setblockformat: 5043,
+				getblockformat: 5011,
+				getblockformatnames: 5012,
+				setfontname: 5044,
+				getfontname: 5013,
+				setfontsize: 5045,
+				getfontsize: 5014,
+				setbackcolor: 5042,
+				getbackcolor: 5010,
+				setforecolor: 5046,
+				getforecolor: 5015,
 				
-			case "blockdirltr": case "blockdirrtl":
-			case "dirltr": case "dirrtl":
-			case "inlinedirltr": case "inlinedirrtl":
-			case "cut": case "copy": case "paste": 
-				supportedBy = isSupportedBy(ie);
-				break;
-			
-			case "inserttable":
-				supportedBy = isSupportedBy(mozilla | (this.object ? ie : 0));
-				break;
-			
-			case "insertcell": case "insertcol": case "insertrow":
-			case "deletecells": case "deletecols": case "deleterows":
-			case "mergecells": case "splitcell":
-				supportedBy = isSupportedBy(this.object ? ie : 0);
-				break;
+				findtext: 5008,
+				font: 5009,
+				hyperlink: 5016,
+				image: 5017,
+				
+				lockelement: 5027,
+				makeabsolute: 5028,
+				sendbackward: 5036,
+				bringforward: 5037,
+				sendbelowtext: 5038,
+				bringabovetext: 5039,
+				sendtoback: 5040,
+				bringtofront: 5041,
+				
+				properties: 5052
+			},
 			
-			default: return false;
-		}
+			ui: {
+				"default": 0,
+				prompt: 1,
+				noprompt: 2
+			},
+			
+			status: {
+				notsupported: 0,
+				disabled: 1,
+				enabled: 3,
+				latched: 7,
+				ninched: 11
+			},
+			
+			appearance: {
+				flat: 0,
+				inset: 1
+			},
+			
+			state: {
+				unchecked: 0,
+				checked: 1,
+				gray: 2
+			}
+		},
 		
-		return (dojo.render.html.ie && supportedBy.ie) ||
-			(dojo.render.html.mozilla && supportedBy.mozilla) ||
-			(dojo.render.html.safari && supportedBy.safari) ||
-			(dojo.render.html.opera && supportedBy.opera);
-	},
-	
-	/**
-	 * Executes a command in the Rich Text area
-	 *
-	 * @param command The command to execute
-	 * @param argument An optional argument to the command
-	 */
-	execCommand: function (command, argument) {
-		var returnValue;
-		if (this.object) {
-			if (command == "forecolor") { command = "setforecolor"; }
-			else if (command == "backcolor") { command = "setbackcolor"; }
-		
-			//if (typeof this._activeX.command[command] == "undefined") { return null; }
-		
-			if (command == "inserttable") {
-				var tableInfo = this.constructor._tableInfo;
-				if (!tableInfo) {
-					tableInfo = document.createElement("object");
-					tableInfo.classid = "clsid:47B0DFC7-B7A3-11D1-ADC5-006008A5848C";
-					document.body.appendChild(tableInfo);
-					this.constructor._table = tableInfo;
+		/**
+		 * Used as the advice function by dojo.event.connect to map our
+		 * normalized set of commands to those supported by the target
+		 * browser
+		 *
+		 * @param arugments The arguments Array, containing at least one
+		 *                  item, the command and an optional second item,
+		 *                  an argument.
+		 */
+		_normalizeCommand: function (joinObject){
+			var drh = dojo.render.html;
+			
+			var command = joinObject.args[0].toLowerCase();
+			if(command == "formatblock"){
+				if(drh.safari){ command = "heading"; }
+				if(drh.ie){ joinObject.args[1] = "<"+joinObject.args[1]+">"; }
+			}
+			if (command == "hilitecolor" && !drh.mozilla) { command = "backcolor"; }
+			joinObject.args[0] = command;
+			
+			if (joinObject.args.length > 1) { // a command was specified
+				var argument = joinObject.args[1];
+				if (command == "heading") { throw new Error("unimplemented"); }
+				joinObject.args[1] = argument;
+			}
+			
+			return joinObject.proceed();
+		},
+		
+		/**
+		 * Tests whether a command is supported by the host. Clients SHOULD check
+		 * whether a command is supported before attempting to use it, behaviour
+		 * for unsupported commands is undefined.
+		 *
+		 * @param command The command to test for
+		 * @return true if the command is supported, false otherwise
+		 */
+		queryCommandAvailable: function (command) {
+			var ie = 1;
+			var mozilla = 1 << 1;
+			var safari = 1 << 2;
+			var opera = 1 << 3;
+			function isSupportedBy (browsers) {
+				return {
+					ie: Boolean(browsers & ie),
+					mozilla: Boolean(browsers & mozilla),
+					safari: Boolean(browsers & safari),
+					opera: Boolean(browsers & opera)
 				}
+			}
+
+			var supportedBy = null;
+			
+			switch (command.toLowerCase()) {
+				case "bold": case "italic": case "underline":
+				case "subscript": case "superscript":
+				case "fontname": case "fontsize":
+				case "forecolor": case "hilitecolor":
+				case "justifycenter": case "justifyfull": case "justifyleft": 
+				case "justifyright": case "delete": case "undo": case "redo":
+					supportedBy = isSupportedBy(mozilla | ie | safari | opera);
+					break;
+					
+				case "createlink": case "unlink": case "removeformat":
+				case "inserthorizontalrule": case "insertimage":
+				case "insertorderedlist": case "insertunorderedlist":
+				case "indent": case "outdent": case "formatblock": case "strikethrough": 
+				case "inserthtml":
+					supportedBy = isSupportedBy(mozilla | ie | opera);
+					break;
+					
+				case "blockdirltr": case "blockdirrtl":
+				case "dirltr": case "dirrtl":
+				case "inlinedirltr": case "inlinedirrtl":
+				case "cut": case "copy": case "paste": 
+					supportedBy = isSupportedBy(ie);
+					break;
+				
+				case "inserttable":
+					supportedBy = isSupportedBy(mozilla | (this.object ? ie : 0));
+					break;
 				
-				tableInfo.NumRows = argument.rows;
-				tableInfo.NumCols = argument.cols;
-				tableInfo.TableAttrs = argument["TableAttrs"];
-				tableInfo.CellAttrs = arr["CellAttrs"];
-				tableInfo.Caption = arr["Caption"];
+				case "insertcell": case "insertcol": case "insertrow":
+				case "deletecells": case "deletecols": case "deleterows":
+				case "mergecells": case "splitcell":
+					supportedBy = isSupportedBy(this.object ? ie : 0);
+					break;
+				
+				default: return false;
 			}
+			
+			return (dojo.render.html.ie && supportedBy.ie) ||
+				(dojo.render.html.mozilla && supportedBy.mozilla) ||
+				(dojo.render.html.safari && supportedBy.safari) ||
+				(dojo.render.html.opera && supportedBy.opera);
+		},
 		
-			if (arguments.length == 1) {
-				return this.object.ExecCommand(this._activeX.command[command],
-					this._activeX.ui.noprompt);
-			} else {
-				return this.object.ExecCommand(this._activeX.command[command],
-					this._activeX.ui.noprompt, argument);
-			}
-	
-		/* */
-		}else if(command == "inserthtml"){
-			// on IE, we can use the pasteHTML method of the textRange object
-			// to get an undo-able innerHTML modification
-			if(dojo.render.html.ie){
-				var insertRange = this.document.selection.createRange();
-				insertRange.collapse(true);
-				/*
-				insertRange.pasteHTML("&nbsp;");
-				insertRange.select();
-				*/
+		/**
+		 * Executes a command in the Rich Text area
+		 *
+		 * @param command The command to execute
+		 * @param argument An optional argument to the command
+		 */
+		execCommand: function (command, argument) {
+			var returnValue;
+			if (this.object) {
+				if (command == "forecolor") { command = "setforecolor"; }
+				else if (command == "backcolor") { command = "setbackcolor"; }
+			
+				//if (typeof this._activeX.command[command] == "undefined") { return null; }
+			
+				if (command == "inserttable") {
+					var tableInfo = this.constructor._tableInfo;
+					if (!tableInfo) {
+						tableInfo = document.createElement("object");
+						tableInfo.classid = "clsid:47B0DFC7-B7A3-11D1-ADC5-006008A5848C";
+						document.body.appendChild(tableInfo);
+						this.constructor._table = tableInfo;
+					}
+					
+					tableInfo.NumRows = argument.rows;
+					tableInfo.NumCols = argument.cols;
+					tableInfo.TableAttrs = argument["TableAttrs"];
+					tableInfo.CellAttrs = arr["CellAttrs"];
+					tableInfo.Caption = arr["Caption"];
+				}
+			
+				if (arguments.length == 1) {
+					return this.object.ExecCommand(this._activeX.command[command],
+						this._activeX.ui.noprompt);
+				} else {
+					return this.object.ExecCommand(this._activeX.command[command],
+						this._activeX.ui.noprompt, argument);
+				}
+		
+			/* */
+			}else if(command == "inserthtml"){
+				// on IE, we can use the pasteHTML method of the textRange object
+				// to get an undo-able innerHTML modification
+				if(dojo.render.html.ie){
+					var insertRange = this.document.selection.createRange();
+					insertRange.collapse(true);
+					/*
+					insertRange.pasteHTML("&nbsp;");
+					insertRange.select();
+					*/
+
+					/*
+					argument = argument.replace(/</g, "&#060;");
+					argument = argument.replace(/>/g, "&#060;");
+					alert(argument);
+					*/
+					// FIXME: this never inserts actual. It does not appear
+					// possible to provide an HTML serialization to the clipboard
+					// via setData from script
+					this.window.clipboardData.setData("Text", argument);
+					this.document.execCommand("paste");
+
+					// var range = this.document.selection.createRange();
+
+					// alert(range.pasteHTML);
+					// this.document.body.fireEvent("ondragstart");
+
+					// range.pasteHTML(argument);
+
+					// this.window.clipboardData.setData("Text", argument);
+					// var tevt = document.createEventObject();
+					// tevt.ctrlKey = true;
+					// tevt.keyCode = 67;
+					// this.document.body.fireEvent("onkeydown", tevt);
+					// this.document.body.fireEvent("onkeyup", tevt);
 
-				/*
-				argument = argument.replace(/</g, "&#060;");
-				argument = argument.replace(/>/g, "&#060;");
-				alert(argument);
-				*/
-				// FIXME: this never inserts actual. It does not appear
-				// possible to provide an HTML serialization to the clipboard
-				// via setData from script
-				this.window.clipboardData.setData("Text", argument);
-				this.document.execCommand("paste");
-
-				// var range = this.document.selection.createRange();
-
-				// alert(range.pasteHTML);
-				// this.document.body.fireEvent("ondragstart");
-
-				// range.pasteHTML(argument);
-
-				// this.window.clipboardData.setData("Text", argument);
-				// var tevt = document.createEventObject();
-				// tevt.ctrlKey = true;
-				// tevt.keyCode = 67;
-				// this.document.body.fireEvent("onkeydown", tevt);
-				// this.document.body.fireEvent("onkeyup", tevt);
+					return true;
+				}else{
+					return this.document.execCommand(command, false, argument);			
+				}
+			/* */
+			// fix up unlink in Mozilla to unlink the link and not just the selection
+			} else if (command == "unlink" &&
+				this.queryCommandEnabled("unlink") && dojo.render.html.mozilla) {
+				// grab selection
+				// Mozilla gets upset if we just store the range so we have to
+				// get the basic properties and recreate to save the selection
+				var selection = this.window.getSelection();
+				var selectionRange = selection.getRangeAt(0);
+				var selectionStartContainer = selectionRange.startContainer;
+				var selectionStartOffset = selectionRange.startOffset;
+				var selectionEndContainer = selectionRange.endContainer;
+				var selectionEndOffset = selectionRange.endOffset;
+				
+				// select our link and unlink
+				var range = document.createRange();
+				var a = this.getSelectedNode();
+				while (a.nodeName != "A") { a = a.parentNode; }
+				range.selectNode(a);
+				selection.removeAllRanges();
+				selection.addRange(range);
+				
+				returnValue = this.document.execCommand("unlink", false, null);
+				
+				// restore original selection
+				var selectionRange = document.createRange();
+				selectionRange.setStart(selectionStartContainer, selectionStartOffset);
+				selectionRange.setEnd(selectionEndContainer, selectionEndOffset);
+				selection.removeAllRanges();
+				selection.addRange(selectionRange);
+				
+				return returnValue;
+			} else if (command == "inserttable" && dojo.render.html.mozilla) {
 
-				return true;
-			}else{
-				return this.document.execCommand(command, false, argument);			
+				var cols = "<tr>";
+				for (var i = 0; i < argument.cols; i++) { cols += "<td></td>"; }
+				cols += "</tr>";
+			
+				var table = "<table><tbody>";
+				for (var i = 0; i < argument.rows; i++) { table += cols; }
+				table += "</tbody></table>";
+				returnValue = this.document.execCommand("inserthtml", false, table);
+
+			} else if (command == "hilitecolor" && dojo.render.html.mozilla) {
+				// mozilla doesn't support hilitecolor properly when useCSS is
+				// set to false (bugzilla #279330)
+				
+				this.document.execCommand("useCSS", false, false);
+				returnValue = this.document.execCommand(command, false, argument);			
+				this.document.execCommand("useCSS", false, true);
+			
+			} else {
+				// dojo.debug("command:", command, "arg:", argument);
+				argument = arguments.length > 1 ? argument : null;
+				// try{
+					returnValue = this.document.execCommand(command, false, argument);
+				// }catch(e){
+				// 	dojo.debug(e);
+				// }
 			}
-		/* */
-		// fix up unlink in Mozilla to unlink the link and not just the selection
-		} else if (command == "unlink" &&
-			this.queryCommandEnabled("unlink") && dojo.render.html.mozilla) {
-			// grab selection
-			// Mozilla gets upset if we just store the range so we have to
-			// get the basic properties and recreate to save the selection
-			var selection = this.window.getSelection();
-			var selectionRange = selection.getRangeAt(0);
-			var selectionStartContainer = selectionRange.startContainer;
-			var selectionStartOffset = selectionRange.startOffset;
-			var selectionEndContainer = selectionRange.endContainer;
-			var selectionEndOffset = selectionRange.endOffset;
-			
-			// select our link and unlink
-			var range = document.createRange();
-			var a = this.getSelectedNode();
-			while (a.nodeName != "A") { a = a.parentNode; }
-			range.selectNode(a);
-			selection.removeAllRanges();
-			selection.addRange(range);
-			
-			returnValue = this.document.execCommand("unlink", false, null);
-			
-			// restore original selection
-			var selectionRange = document.createRange();
-			selectionRange.setStart(selectionStartContainer, selectionStartOffset);
-			selectionRange.setEnd(selectionEndContainer, selectionEndOffset);
-			selection.removeAllRanges();
-			selection.addRange(selectionRange);
 			
+			this.onDisplayChanged();
 			return returnValue;
-		} else if (command == "inserttable" && dojo.render.html.mozilla) {
+		},
 
-			var cols = "<tr>";
-			for (var i = 0; i < argument.cols; i++) { cols += "<td></td>"; }
-			cols += "</tr>";
-		
-			var table = "<table><tbody>";
-			for (var i = 0; i < argument.rows; i++) { table += cols; }
-			table += "</tbody></table>";
-			returnValue = this.document.execCommand("inserthtml", false, table);
-
-		} else if (command == "hilitecolor" && dojo.render.html.mozilla) {
-			// mozilla doesn't support hilitecolor properly when useCSS is
-			// set to false (bugzilla #279330)
-			
-			this.document.execCommand("useCSS", false, false);
-			returnValue = this.document.execCommand(command, false, argument);			
-			this.document.execCommand("useCSS", false, true);
-		
-		} else {
-			argument = arguments.length > 1 ? argument : null;
-			// try{
-				returnValue = this.document.execCommand(command, false, argument);
-			// }catch(e){
-			// 	dojo.debug(e);
-			// }
-		}
-		
-		this.onDisplayChanged();
-		return returnValue;
-	},
+		queryCommandEnabled: function (command, argument) {
+			if (this.object) {
+				if (command == "forecolor") { command = "setforecolor"; }
+				else if (command == "backcolor") { command = "setbackcolor"; }
+
+				if (typeof this._activeX.command[command] == "undefined") { return false; }
+				var status = this.object.QueryStatus(this._activeX.command[command]);
+				return (status != this.activeX.status.notsupported && 
+					status != this.activeX.status.diabled);
+			} else {
+				// mozilla returns true always
+				if (command == "unlink" && dojo.render.html.mozilla) {
+					var node = this.getSelectedNode();
+					while (node.parentNode && node.nodeName != "A") { node = node.parentNode; }
+					return node.nodeName == "A";
+				} else if (command == "inserttable" && dojo.render.html.mozilla) {
+					return true;
+				}
 
-	queryCommandEnabled: function (command, argument) {
-		if (this.object) {
-			if (command == "forecolor") { command = "setforecolor"; }
-			else if (command == "backcolor") { command = "setbackcolor"; }
-
-			if (typeof this._activeX.command[command] == "undefined") { return false; }
-			var status = this.object.QueryStatus(this._activeX.command[command]);
-			return (status != this.activeX.status.notsupported && 
-				status != this.activeX.status.diabled);
-		} else {
-			// mozilla returns true always
-			if (command == "unlink" && dojo.render.html.mozilla) {
-				var node = this.getSelectedNode();
-				while (node.parentNode && node.nodeName != "A") { node = node.parentNode; }
-				return node.nodeName == "A";
-			} else if (command == "inserttable" && dojo.render.html.mozilla) {
-				return true;
+				// return this.document.queryCommandEnabled(command);
+				var elem = (dojo.render.html.ie) ? this.document.selection.createRange() : this.document;
+				return elem.queryCommandEnabled(command);
 			}
+		},
 
-			// return this.document.queryCommandEnabled(command);
-			var elem = (dojo.render.html.ie) ? this.document.selection.createRange() : this.document;
-			return elem.queryCommandEnabled(command);
-		}
-	},
+		queryCommandState: function (command, argument) {
+			if (this.object) {
+				if (command == "forecolor") { command = "setforecolor"; }
+				else if (command == "backcolor") { command = "setbackcolor"; }
+
+				if (typeof this._activeX.command[command] == "undefined") { return null; }
+				var status = this.object.QueryStatus(this._activeX.command[command]);
+				return (status == this._activeX.status.enabled ||
+					status == this._activeX.status.ninched);
+			} else {
+				return this.document.queryCommandState(command);
+			}
+		},
 
-	queryCommandState: function (command, argument) {
-		if (this.object) {
-			if (command == "forecolor") { command = "setforecolor"; }
-			else if (command == "backcolor") { command = "setbackcolor"; }
-
-			if (typeof this._activeX.command[command] == "undefined") { return null; }
-			var status = this.object.QueryStatus(this._activeX.command[command]);
-			return (status == this._activeX.status.enabled ||
-				status == this._activeX.status.ninched);
-		} else {
-			return this.document.queryCommandState(command);
-		}
-	},
+		queryCommandValue: function (command, argument) {
+			if (this.object) {
+				switch (command) {
+					case "forecolor":
+					case "backcolor":
+					case "fontsize":
+					case "fontname":
+					case "blockformat":
+						command = "get" + command;
+						return this.object.execCommand(
+							this._activeX.command[command],
+							this._activeX.ui.noprompt);
+				}			
+			
+				//var status = this.object.QueryStatus(this._activeX.command[command]);
+			} else {
+				return this.document.queryCommandValue(command);
+			}
+		},
+		
+		
+	/* Misc.
+	 ********/
 
-	queryCommandValue: function (command, argument) {
-		if (this.object) {
-			switch (command) {
-				case "forecolor":
-				case "backcolor":
-				case "fontsize":
-				case "fontname":
-				case "blockformat":
-					command = "get" + command;
-					return this.object.execCommand(
-						this._activeX.command[command],
-						this._activeX.ui.noprompt);
-			}			
+		getSelectedNode: function () {
+			if(!this.isLoaded){ return; }
+			if (this.document.selection) {
+				return this.document.selection.createRange().parentElement();
+			} else if (dojo.render.html.mozilla) {
+				return this.window.getSelection().getRangeAt(0).commonAncestorContainer;
+			}
+			return this.editNode;
+		},
 		
-			//var status = this.object.QueryStatus(this._activeX.command[command]);
-		} else {
-			return this.document.queryCommandValue(command);
-		}
-	},
-	
-	
-/* Misc.
- ********/
-
-	getSelectedNode: function () {
-		if(!this.isLoaded){ return; }
-		if (this.document.selection) {
-			return this.document.selection.createRange().parentElement();
-		} else if (dojo.render.html.mozilla) {
-			return this.window.getSelection().getRangeAt(0).commonAncestorContainer;
-		}
-		return this.editNode;
-	},
-	
-	placeCursorAtStart: function () {
-		if(!this.isLoaded){
-			dojo.event.connect(this, "onLoad", this, "placeCursorAtEnd");
-			return;
-		}
-		dojo.event.disconnect(this, "onLoad", this, "placeCursorAtEnd");
-		if (this.window.getSelection) {
-			var selection = this.window.getSelection;
-			if (selection.removeAllRanges) { // Mozilla			
-				var range = this.document.createRange();
-				range.selectNode(this.editNode.firstChild);
-				range.collapse(true);
-				var selection = this.window.getSelection();
-				selection.removeAllRanges();
-				selection.addRange(range);
-			} else { // Safari
-				// not a great deal we can do
+		placeCursorAtStart: function () {
+			if(!this.isLoaded){
+				dojo.event.connect(this, "onLoad", this, "placeCursorAtEnd");
+				return;
 			}
-		} else if (this.document.selection) { // IE
-			var range = this.document.body.createTextRange();
-			range.moveToElementText(this.editNode);
-			range.collapse(true);
-			range.select();
-		}
-	},
-	
-	placeCursorAtEnd: function () {
-		if(!this.isLoaded){
-			dojo.event.connect(this, "onLoad", this, "placeCursorAtEnd");
-			return;
-		}
-		dojo.event.disconnect(this, "onLoad", this, "placeCursorAtEnd");
-		if (this.window.getSelection) {
-			var selection = this.window.getSelection;
-			if (selection.removeAllRanges) { // Mozilla			
-				var range = this.document.createRange();
-				range.selectNode(this.editNode.lastChild);
-				range.collapse(false);
-				var selection = this.window.getSelection();
-				selection.removeAllRanges();
-				selection.addRange(range);
-			} else { // Safari
-				// not a great deal we can do
+			dojo.event.disconnect(this, "onLoad", this, "placeCursorAtEnd");
+			if (this.window.getSelection) {
+				var selection = this.window.getSelection;
+				if (selection.removeAllRanges) { // Mozilla			
+					var range = this.document.createRange();
+					range.selectNode(this.editNode.firstChild);
+					range.collapse(true);
+					var selection = this.window.getSelection();
+					selection.removeAllRanges();
+					selection.addRange(range);
+				} else { // Safari
+					// not a great deal we can do
+				}
+			} else if (this.document.selection) { // IE
+				var range = this.document.body.createTextRange();
+				range.moveToElementText(this.editNode);
+				range.collapse(true);
+				range.select();
 			}
-		} else if (this.document.selection) { // IE
-			var range = this.document.body.createTextRange();
-			range.moveToElementText(this.editNode);
-			range.collapse(true);
-			range.select();
-		}
-	},
-
-	_lastHeight: 0,
-
-	/** Updates the height of the iframe to fit the contents. */
-	_updateHeight: function () {
-		if (this.height) return;
-		if (this.iframe) {
-			/*
-			if(!this.document.body["offsetHeight"]){
+		},
+		
+		placeCursorAtEnd: function () {
+			if(!this.isLoaded){
+				dojo.event.connect(this, "onLoad", this, "placeCursorAtEnd");
 				return;
 			}
-			*/
-			// The height includes the padding, borders and margins so these
-			// need to be added on
-			var heights = ["margin-top", "margin-bottom",
-				"padding-bottom", "padding-top",
-				"border-width-bottom", "border-width-top"];
-			for (var i = 0, chromeheight = 0; i < heights.length; i++) {
-				var height = dojo.style.getStyle(this.iframe, heights[i]);
-				// Safari doesn't have all the heights so we have to test
-				if (height) {
-					chromeheight += Number(height.replace(/[^0-9]/g, ""));
+			dojo.event.disconnect(this, "onLoad", this, "placeCursorAtEnd");
+			if (this.window.getSelection) {
+				var selection = this.window.getSelection;
+				if (selection.removeAllRanges) { // Mozilla			
+					var range = this.document.createRange();
+					range.selectNode(this.editNode.lastChild);
+					range.collapse(false);
+					var selection = this.window.getSelection();
+					selection.removeAllRanges();
+					selection.addRange(range);
+				} else { // Safari
+					// not a great deal we can do
 				}
+			} else if (this.document.selection) { // IE
+				var range = this.document.body.createTextRange();
+				range.moveToElementText(this.editNode);
+				range.collapse(true);
+				range.select();
 			}
+		},
 
-			if(this.document.body["offsetHeight"]){
-				this._lastHeight = Math.max(this.document.body.scrollHeight, this.document.body.offsetHeight) + chromeheight;
-				this.iframe.height = this._lastHeight + "px";
-				this.window.scrollTo(0, 0);
-			}
-			// dojo.debug(this.iframe.height);
-		} else if (this.object) {
-			this.object.height = dojo.style.getInnerHeight(this.editNode);
-		}
-	},
-	
-	/**
-	 * Saves the content in an onunload event if the editor has not been closed
-	 */
-	_saveContent: function(e){
-		var saveTextarea = document.getElementById("dojo.widget.RichText.savedContent");
-		saveTextarea.value += this._SEPARATOR + this.saveName + ":" + this.getEditorContent();
-	},
+		_lastHeight: 0,
 
-	getEditorContent: function(){
-		var ec = "";
-		try{
-			ec = (this._content.length > 0) ? this._content : this.editNode.innerHTML;
-			if(dojo.string.trim(ec) == "&nbsp;"){ ec = ""; }
-		}catch(e){ /* squelch */ }
-
-		dojo.lang.forEach(this.contentFilters, function(ef){
-			ec = ef(ec);
-		});
-		return ec;
-	},
-	
-	/**
-	 * Kills the editor and optionally writes back the modified contents to the 
-	 * element from which it originated.
-	 *
-	 * @param save Whether or not to save the changes. If false, the changes are
-	 *             discarded.
-	 * @return true if the contents has been modified, false otherwise
-	 */
-	close: function(save, force){
-		if(this.isClosed){return false; }
-
-		if (arguments.length == 0) { save = true; }
-		this._content = this.editNode.innerHTML;
-		var changed = (this.savedContent.innerHTML != this._content);
-		
-		// line height is squashed for iframes
-		// FIXME: why was this here? if (this.iframe){ this.domNode.style.lineHeight = null; }
+		/** Updates the height of the iframe to fit the contents. */
+		_updateHeight: function () {
+			if (this.height) return;
+			if (this.iframe) {
+				/*
+				if(!this.document.body["offsetHeight"]){
+					return;
+				}
+				*/
+				// The height includes the padding, borders and margins so these
+				// need to be added on
+				var heights = ["margin-top", "margin-bottom",
+					"padding-bottom", "padding-top",
+					"border-width-bottom", "border-width-top"];
+				for (var i = 0, chromeheight = 0; i < heights.length; i++) {
+					var height = dojo.style.getStyle(this.iframe, heights[i]);
+					// Safari doesn't have all the heights so we have to test
+					if (height) {
+						chromeheight += Number(height.replace(/[^0-9]/g, ""));
+					}
+				}
 
-		if(this.interval){ clearInterval(this.interval); }
+				if(this.document.body["offsetHeight"]){
+					this._lastHeight = Math.max(this.document.body.scrollHeight, this.document.body.offsetHeight) + chromeheight;
+					this.iframe.height = this._lastHeight + "px";
+					this.window.scrollTo(0, 0);
+				}
+				// dojo.debug(this.iframe.height);
+			} else if (this.object) {
+				this.object.height = dojo.style.getInnerHeight(this.editNode);
+			}
+		},
 		
-		if(dojo.render.html.ie && !this.object){
-			dojo.event.browser.clean(this.editNode);
-		}
+		/**
+		 * Saves the content in an onunload event if the editor has not been closed
+		 */
+		_saveContent: function(e){
+			var saveTextarea = document.getElementById("dojo.widget.RichText.savedContent");
+			saveTextarea.value += this._SEPARATOR + this.saveName + ":" + this.getEditorContent();
+		},
+
+		getEditorContent: function(){
+			var ec = "";
+			try{
+				ec = (this._content.length > 0) ? this._content : this.editNode.innerHTML;
+				if(dojo.string.trim(ec) == "&nbsp;"){ ec = ""; }
+			}catch(e){ /* squelch */ }
+
+			dojo.lang.forEach(this.contentFilters, function(ef){
+				ec = ef(ec);
+			});
+			return ec;
+		},
 		
-		if (this.iframe) {
-			// FIXME: should keep iframe around for later re-use
-			delete this.iframe;
-		}
-		this.domNode.innerHTML = "";
+		/**
+		 * Kills the editor and optionally writes back the modified contents to the 
+		 * element from which it originated.
+		 *
+		 * @param save Whether or not to save the changes. If false, the changes are
+		 *             discarded.
+		 * @return true if the contents has been modified, false otherwise
+		 */
+		close: function(save, force){
+			if(this.isClosed){return false; }
+
+			if (arguments.length == 0) { save = true; }
+			this._content = this.editNode.innerHTML;
+			var changed = (this.savedContent.innerHTML != this._content);
+			
+			// line height is squashed for iframes
+			// FIXME: why was this here? if (this.iframe){ this.domNode.style.lineHeight = null; }
 
-		if(save){
-			// kill listeners on the saved content
-			dojo.event.browser.clean(this.savedContent);
-			if(dojo.render.html.moz){
-				var nc = document.createElement("span");
-				this.domNode.appendChild(nc);
-				nc.innerHTML = this.editNode.innerHTML;
-			}else{
-				this.domNode.innerHTML = this._content;
+			if(this.interval){ clearInterval(this.interval); }
+			
+			if(dojo.render.html.ie && !this.object){
+				dojo.event.browser.clean(this.editNode);
 			}
-		} else {
-			while (this.savedContent.hasChildNodes()) {
-				this.domNode.appendChild(this.savedContent.firstChild);
+			
+			if (this.iframe) {
+				// FIXME: should keep iframe around for later re-use
+				delete this.iframe;
+			}
+			this.domNode.innerHTML = "";
+
+			if(save){
+				// kill listeners on the saved content
+				dojo.event.browser.clean(this.savedContent);
+				if(dojo.render.html.moz){
+					var nc = document.createElement("span");
+					this.domNode.appendChild(nc);
+					nc.innerHTML = this.editNode.innerHTML;
+				}else{
+					this.domNode.innerHTML = this._content;
+				}
+			} else {
+				while (this.savedContent.hasChildNodes()) {
+					this.domNode.appendChild(this.savedContent.firstChild);
+				}
 			}
-		}
-		delete this.savedContent;
-		
-		dojo.html.removeClass(this.domNode, "RichTextEditable");
-		this.isClosed = true;
-		this.isLoaded = false;
+			delete this.savedContent;
+			
+			dojo.html.removeClass(this.domNode, "RichTextEditable");
+			this.isClosed = true;
+			this.isLoaded = false;
 
-		return changed;
-	},
+			return changed;
+		},
 
-	destroyRendering: function(){}, // stub!
-	
-	destroy: function (){
-		this.destroyRendering();
-		if(!this.isClosed){ this.close(false); }
-	
-		// disconnect those listeners.
-		while(this._connected.length){
-			this.disconnect(this._connected[0],
-				this._connected[1], this._connected[2]);
-		}
-	},
+		destroyRendering: function(){}, // stub!
+		
+		destroy: function (){
+			this.destroyRendering();
+			if(!this.isClosed){ this.close(false); }
+		
+			// disconnect those listeners.
+			while(this._connected.length){
+				this.disconnect(this._connected[0],
+					this._connected[1], this._connected[2]);
+			}
+		},
 
-	_connected: [],
-	connect: function (targetObj, targetFunc, thisFunc) {
-		dojo.event.connect(targetObj, targetFunc, this, thisFunc);
-		// this._connected.push([targetObj, targetFunc, thisFunc]);	
-	},
-	
-	// FIXME: below two functions do not work with the above line commented out
-	disconnect: function (targetObj, targetFunc, thisFunc) {
-		for (var i = 0; i < this._connected.length; i++) {
-			if (this._connected[0] == targetObj &&
-				this._connected[1] == targetFunc &&
-				this._connected[2] == thisFunc) {
-				dojo.event.disconnect(targetObj, targetFunc, this, thisFunc);
-				this._connected.splice(i, 1);
-				break;
+		_connected: [],
+		connect: function (targetObj, targetFunc, thisFunc) {
+			dojo.event.connect(targetObj, targetFunc, this, thisFunc);
+			// this._connected.push([targetObj, targetFunc, thisFunc]);	
+		},
+		
+		// FIXME: below two functions do not work with the above line commented out
+		disconnect: function (targetObj, targetFunc, thisFunc) {
+			for (var i = 0; i < this._connected.length; i++) {
+				if (this._connected[0] == targetObj &&
+					this._connected[1] == targetFunc &&
+					this._connected[2] == thisFunc) {
+					dojo.event.disconnect(targetObj, targetFunc, this, thisFunc);
+					this._connected.splice(i, 1);
+					break;
+				}
 			}
+		},
+		
+		disconnectAllWithRoot: function (targetObj) {
+			for (var i = 0; i < this._connected.length; i++) {
+				if (this._connected[0] == targetObj) {
+					dojo.event.disconnect(targetObj,
+						this._connected[1], this, this._connected[2]);
+					this._connected.splice(i, 1);
+				}
+			}	
 		}
+		
 	},
-	
-	disconnectAllWithRoot: function (targetObj) {
-		for (var i = 0; i < this._connected.length; i++) {
-			if (this._connected[0] == targetObj) {
-				dojo.event.disconnect(targetObj,
-					this._connected[1], this, this._connected[2]);
-				this._connected.splice(i, 1);
-			}
-		}	
+	"html",
+	function(){
+		this.contentFilters = [];
+		// this.contentFilters.push(this.defaultContentCleaner);
+		
+		this._keyHandlers = {};
 	}
-	
-});
+);


More information about the Dojo-checkins mailing list