dojo_src 1.4.102 → 1.5.0

data/dojo/dijit/_editor/nls/ro/FontChoice.js

@@ -0,0 +1,27 @@
+({
+	fontSize: "Dimensiune",
+	fontName: "Font",
+	formatBlock: "Format",
+
+	serif: "serif",
+	"sans-serif": "sans-serif",
+	monospace: "monospace",
+	cursive: "cursive",
+	fantasy: "fantasy",
+
+	noFormat: "Fără",
+	p: "Paragraf",
+	h1: "Titlu",
+	h2: "Subtitlu",
+	h3: "Sub-subtitlu",
+	pre: "Preformatat",
+
+	1: "xxs (xx-small)",
+	2: "xs (x-small)",
+	3: "s (small)",
+	4: "m (medium)",
+	5: "l (large)",
+	6: "xl (x-large)",
+	7: "xxl (xx-large)"
+})
+

data/dojo/dijit/_editor/nls/ro/LinkDialog.js

@@ -0,0 +1,13 @@
+({
+	createLinkTitle: "Proprietăţi legătură",
+	insertImageTitle: "Proprietăţi imagine",
+	url: "URL:",
+	text: "Descriere:",
+	target: "Ţintă:",
+	set: "Setare",
+	currentWindow: "Fereastra curentă",
+	parentWindow: "Fereastra părinte",
+	topWindow: "Fereastra cea mai de sus",
+	newWindow: "Fereastră nouă"
+})
+

data/dojo/dijit/_editor/nls/ro/commands.js

@@ -0,0 +1,48 @@
+({
+	'bold': 'Aldine',
+	'copy': 'Copiere',
+	'cut': 'Tăiere',
+	'delete': 'Ştergere',
+	'indent': 'Indentare',
+	'insertHorizontalRule': 'Regulă orizontală',
+	'insertOrderedList': 'Listă numerotată',
+	'insertUnorderedList': 'Listă cu marcaje',
+	'italic': 'Cursive',
+	'justifyCenter': 'Aliniere pe centru',
+	'justifyFull': 'Aliniere',
+	'justifyLeft': 'Aliniere la stânga',
+	'justifyRight': 'Aliniere la dreapta',
+	'outdent': 'Outdentare',
+	'paste': 'Lipire',
+	'redo': 'Repetare acţiune',
+	'removeFormat': 'Înlăturare format',
+	'selectAll': 'Selectare toate',
+	'strikethrough': 'Suprascriere linie',
+	'subscript': 'Scriere indice inferior',
+	'superscript': 'Scriere indice superior',
+	'underline': 'Subliniere',
+	'undo': 'Anulare acţiune',
+	'unlink': 'Înlăturare legătură',
+	'createLink': 'Creare legătură',
+	'toggleDir': 'Comutare direcţie',
+	'insertImage': 'Inserare imagine',
+	'insertTable': 'Inserare/Editare tabelă',
+	'toggleTableBorder': 'Comutare bordură tabelă',
+	'deleteTable': 'Ştergere tabelă',
+	'tableProp': 'Proprietăţi tabelă',
+	'htmlToggle': 'Sursă HTML',
+	'foreColor': 'Culoare prim plan',
+	'hiliteColor': 'Culoare fundal',
+	'plainFormatBlock': 'Stil paragraf',
+	'formatBlock': 'Stil paragraf',
+	'fontSize': 'Dimensiune font',
+	'fontName': 'Nume font',
+	'tabIndent': 'Indentare cu tab',
+	"fullScreen": "Comutare ecran complet",
+	"viewSource": "Vizualizare sursă HTML",
+	"print": "Tipărire",
+	"newPage": "Pagină nouă",
+	/* Error messages */
+	'systemShortcut': 'Acţiunea "${0}" este disponibilă în browser folosind o scurtătură de la tastatură. Folosiţi ${1}.'
+})
+

data/dojo/dijit/_editor/nls/sk/LinkDialog.js

@@ -1,8 +1,13 @@
 ({
-	createLinkTitle: "Vlastnosti odkazu",
-	insertImageTitle: "Vlastnosti obrázku",
+	createLinkTitle: "Pripojiť vlastnosti",
+	insertImageTitle: "Vlastnosti obrázka ",
 	url: "URL:",
-	text: "Popis:",
-	set: "Nastaviť"
+	text: "Opis:",
+	target: "Cieľ:",
+	set: "Nastaviť",
+	currentWindow: "Aktuálne okno ",
+	parentWindow: "Rodičovské okno ",
+	topWindow: "Najvrchnejšie okno ",
+	newWindow: "Nové okno "
 })
 

data/dojo/dijit/_editor/nls/sk/commands.js

@@ -38,6 +38,10 @@
 	'fontSize': 'Veľkosť písma',
 	'fontName': 'Názov písma',
 	'tabIndent': 'Odsadenie tabulátora',
+	"fullScreen": "Zobraziť na celú obrazovku",
+	"viewSource": "Zobraziť zdrojový kód HTML ",
+	"print": "Tlačiť",
+	"newPage": "Nová stránka ",
 	/* Error messages */
 	'systemShortcut': 'Akcia "${0}" je vo vašom prehliadači dostupná len s použitím klávesovej skratky. Použite ${1}.'
 })

data/dojo/dijit/_editor/nls/sl/LinkDialog.js

@@ -3,6 +3,11 @@
 	insertImageTitle: "Lastnosti slike",
 	url: "URL:",
 	text: "Opis:",
-	set: "Nastavi"
+	target: "Cilj:",
+	set: "Nastavi",
+	currentWindow: "Trenutno okno",
+	parentWindow: "Nadrejeno okno",
+	topWindow: "Najvišje okno",
+	newWindow: "Novo okno"
 })
 

data/dojo/dijit/_editor/nls/sl/commands.js

@@ -4,15 +4,15 @@
 	'cut': 'Izreži',
 	'delete': 'Izbriši',
 	'indent': 'Zamik',
-	'insertHorizontalRule': 'Horizontalno pravilo',
+	'insertHorizontalRule': 'Vodoravno ravnilo',
 	'insertOrderedList': 'Oštevilčen seznam',
 	'insertUnorderedList': 'Naštevni seznam',
 	'italic': 'Ležeče',
-	'justifyCenter': 'Sredinska poravnava',
-	'justifyFull': 'Obojestranka poravnava',
+	'justifyCenter': 'Poravnaj na sredino',
+	'justifyFull': 'Obojestranska poravnava',
 	'justifyLeft': 'Poravnaj levo',
 	'justifyRight': 'Poravnaj desno',
-	'outdent': 'Zamik navzven',
+	'outdent': 'Viseč odstavek',
 	'paste': 'Prilepi',
 	'redo': 'Znova uveljavi',
 	'removeFormat': 'Odstrani obliko zapisa',
@@ -24,13 +24,13 @@
 	'undo': 'Razveljavi',
 	'unlink': 'Odstrani povezavo',
 	'createLink': 'Ustvari povezavo',
-	'toggleDir': 'Preklopi usmeritev',
+	'toggleDir': 'Preklopi na usmeritev',
 	'insertImage': 'Vstavi sliko',
-	'insertTable': 'Vstavi/Uredi tabelo',
-	'toggleTableBorder': 'Preklopi obrobo tabele',
+	'insertTable': 'Vstavi/uredi tabelo',
+	'toggleTableBorder': 'Preklopi na rob tabele',
 	'deleteTable': 'Izbriši tabelo',
 	'tableProp': 'Lastnost tabele',
-	'htmlToggle': 'Izvor HTML',
+	'htmlToggle': 'Izvorna koda HTML',
 	'foreColor': 'Barva ospredja',
 	'hiliteColor': 'Barva ozadja',
 	'plainFormatBlock': 'Slog odstavka',
@@ -38,6 +38,10 @@
 	'fontSize': 'Velikost pisave',
 	'fontName': 'Ime pisave',
 	'tabIndent': 'Zamik tabulatorja',
+	"fullScreen": "Preklopi na celozaslonski način",
+	"viewSource": "Prikaži izvorno kodo HTML",
+	"print": "Natisni",
+	"newPage": "Nova stran",
 	/* Error messages */
 	'systemShortcut': 'Dejanje "${0}" lahko v vašem brskalniku uporabite samo z bližnjico na tipkovnici. Uporabite ${1}.'
 })

data/dojo/dijit/_editor/nls/sv/LinkDialog.js

@@ -3,5 +3,11 @@
 	insertImageTitle: "Bildegenskaper",
 	url: "URL-adress:",
 	text: "Beskrivning:",
-	set: "Ange"
+	target: "Mål:",
+	set: "Ange",
+	currentWindow: "aktuellt fönster",
+	parentWindow: "överordnat fönster",
+	topWindow: "översta fönstret",
+	newWindow: "nytt fönster"
 })
+

data/dojo/dijit/_editor/nls/sv/commands.js

@@ -38,7 +38,13 @@
 	'fontSize': 'Teckenstorlek',
 	'fontName': 'Teckensnittsnamn',
 	'tabIndent': 'Tabbindrag',
+	"fullScreen": "Växla helskärm",
+	"viewSource": "Visa HTML-kod",
+	"print": "Skriv ut",
+	"newPage": "Ny sida",
 	/* Error messages */
-	'systemShortcut': 'Åtgärden "${0}" är endast tillgänglig i webbläsarenmed hjälp av ett kortkommando. Använd ${1}.',
-	'ctrlKey':'Ctrl+${0}'
+	'systemShortcut': 'Åtgärden "${0}" är endast tillgänglig i webbläsaren med hjälp av ett kortkommando. Använd ${1}.',
+	'ctrlKey':'Ctrl+${0}',
+	'appleKey':'\u2318+${0}' // "command" or open-apple key on Macintosh
 })
+

data/dojo/dijit/_editor/nls/th/LinkDialog.js

@@ -3,6 +3,11 @@
 	insertImageTitle: "คุณสมบัติอิมเมจ",
 	url: "URL:",
 	text: "รายละเอียด",
-	set: "ตั้งค่า"
+	target: "เป้าหมาย:",
+	set: "ตั้งค่า",
+	currentWindow: "หน้าต่างปัจจุบัน",
+	parentWindow: "หน้าต่างหลัก",
+	topWindow: "หน้าต่างบนสุด",
+	newWindow: "หน้าต่างใหม่"
 })
 

data/dojo/dijit/_editor/nls/th/commands.js

@@ -26,7 +26,7 @@
 	'createLink': 'สร้างลิงก์',
 	'toggleDir': 'สลับทิศทาง',
 	'insertImage': 'แทรกอิมเมจ',
-	'insertTable': 'แทรก/แก้ไข ตาราง',
+	'insertTable': 'แทรก/แก้ไขตาราง',
 	'toggleTableBorder': 'สลับเส้นขอบตาราง',
 	'deleteTable': 'ลบตาราง',
 	'tableProp': 'คุณสมบัติตาราง',
@@ -38,7 +38,11 @@
 	'fontSize': 'ขนาดฟอนต์',
 	'fontName': 'ชื่อฟอนต์',
 	'tabIndent': 'เยื้องแท็บ',
+	"fullScreen": "สลับจอภาพแบบเต็ม",
+	"viewSource": "ดูซอร์ส HTML",
+	"print": "พิมพ์",
+	"newPage": "หน้าใหม่",
 	/* Error messages */
-	'systemShortcut': 'แอ็กชัน "${0}" ใช้งานได้เฉพาะกับเบราว์เซอร์ของคุณโดยใช้แป้นพิมพ์ลัด ใช้ ${1}'
+	'systemShortcut': 'การดำเนินการ"${0}" ใช้งานได้เฉพาะกับเบราว์เซอร์ของคุณโดยใช้แป้นพิมพ์ลัด ใช้ ${1}'
 })
 

data/dojo/dijit/_editor/nls/tr/LinkDialog.js

@@ -3,5 +3,11 @@
 	insertImageTitle: "Resim Özellikleri",
 	url: "URL:",
 	text: "Açıklama:",
-	set: "Ayarla"
+	target: "Hedef:",
+	set: "Ayarla",
+	currentWindow: "Geçerli Pencere",
+	parentWindow: "Üst Pencere",
+	topWindow: "En Üst Pencere",
+	newWindow: "Yeni Pencere"
 })
+

data/dojo/dijit/_editor/nls/tr/commands.js

@@ -38,6 +38,11 @@
 	'fontSize': 'Yazı Tipi Boyutu',
 	'fontName': 'Yazı Tipi Adı',
 	'tabIndent': 'Sekme Girintisi',
+	"fullScreen": "Tam Ekranı Aç/Kapat",
+	"viewSource": "HTML Kaynağını Görüntüle",
+	"print": "Yazdır",
+	"newPage": "Yeni Sayfa",
 	/* Error messages */
 	'systemShortcut': '"${0}" işlemi yalnızca tarayıcınızda bir klavye kısayoluyla birlikte kullanılabilir. Şunu kullanın: ${1}.'
 })
+

data/dojo/dijit/_editor/nls/zh-tw/LinkDialog.js

@@ -7,7 +7,7 @@
 	set: "設定",
 	currentWindow: "現行視窗",
 	parentWindow: "上層視窗",
-	topWindow: "最上層視窗",
+	topWindow: "最上面的視窗",
 	newWindow: "新視窗"
 })
 

data/dojo/dijit/_editor/nls/zh/commands.js

@@ -24,7 +24,7 @@
 	'undo': '撤销',
 	'unlink': '除去链接',
 	'createLink': '创建链接',
-	'toggleDir': '切换方向',
+	'toggleDir': '固定方向',
 	'insertImage': '插入图像',
 	'insertTable': '插入/编辑表',
 	'toggleTableBorder': '切换表边框',
@@ -38,11 +38,11 @@
 	'fontSize': '字体大小',
 	'fontName': '字体名称',
 	'tabIndent': '制表符缩进',
-	"fullScreen": "切换全屏",
+	"fullScreen": "切换全屏幕",
 	"viewSource": "查看 HTML 源代码",
 	"print": "打印",
 	"newPage": "新建页面",
 	/* Error messages */
-	'systemShortcut': '只能通过使用键盘快捷键在浏览器中执行 "${0}" 操作。请使用 ${1}。'
+	'systemShortcut': '只能在浏览器中通过键盘快捷方式执行“${0}”操作。使用 ${1}。'
 })
 

data/dojo/dijit/_editor/plugins/AlwaysShowToolbar.js

@@ -90,7 +90,7 @@ dojo.declare("dijit._editor.plugins.AlwaysShowToolbar", dijit._editor._Plugin,
 
 		var isIE6 = dojo.isIE < 7;
 		if(!this._handleScroll){ return; }
-		var tdn = this.editor.toolbar.domNode;
+		var tdn = this.editor.header;
 		var db = dojo.body;
 
 		if(!this._scrollSetUp){
@@ -171,7 +171,7 @@ dojo.declare("dijit._editor.plugins.AlwaysShowToolbar", dijit._editor._Plugin,
 //		clearInterval(this.scrollInterval);
 
 		if(dojo.isIE < 7){
-			dojo.removeClass(this.editor.toolbar.domNode, 'dijitIEFixedToolbar');
+			dojo.removeClass(this.editor.header, 'dijitIEFixedToolbar');
 		}
 	}
 });

data/dojo/dijit/_editor/plugins/EnterKeyHandling.js

@@ -1,6 +1,6 @@
 dojo.provide("dijit._editor.plugins.EnterKeyHandling");
 
-dojo.require("dijit._base.scroll");
+dojo.require("dojo.window");
 
 dojo.declare("dijit._editor.plugins.EnterKeyHandling", dijit._editor._Plugin, {
 	// summary:
@@ -344,7 +344,7 @@ dojo.declare("dijit._editor.plugins.EnterKeyHandling", dijit._editor._Plugin, {
 			selection.removeAllRanges();
 			selection.addRange(newrange);
 			if(this.editor.height){
-				dijit.scrollIntoView(newblock);
+				dojo.window.scrollIntoView(newblock);
 			}
 		}else if(dijit.range.atBeginningOfContainer(block.blockNode,
 				range.startContainer, range.startOffset)){
@@ -356,10 +356,91 @@ dojo.declare("dijit._editor.plugins.EnterKeyHandling", dijit._editor._Plugin, {
 				selection.removeAllRanges();
 				selection.addRange(newrange);
 				// browser does not scroll the caret position into view, do it manually
-				dijit.scrollIntoView(newblock.nextSibling);
+				dojo.window.scrollIntoView(newblock.nextSibling);
+			}
+			_letBrowserHandle = false;
+		}else{ //press enter in the middle of P/DIV/Whatever/
+			if(block.blockNode === block.blockContainer){
+				block.blockNode.appendChild(newblock);
+			}else{
+				dojo.place(newblock, block.blockNode, "after");
 			}
 			_letBrowserHandle = false;
-		}else{ // press enter in the middle of P
+
+			// Clone any block level styles.
+			if(block.blockNode.style){
+				if(newblock.style){
+					if(block.blockNode.style.cssText){
+						newblock.style.cssText = block.blockNode.style.cssText;
+					}
+				}
+			}
+			
+			// Okay, we probably have to split.
+			var rs = range.startContainer;
+			if(rs && rs.nodeType == 3){
+				// Text node, we have to split it.
+				var nodeToMove, tNode;
+				var txt = rs.nodeValue;
+				var startNode = doc.createTextNode(txt.substring(0, range.startOffset));
+				var endNode = doc.createTextNode(txt.substring(range.startOffset, txt.length));
+
+				// Place the split, then remove original nodes.
+				dojo.place(startNode, rs, "before");
+				dojo.place(endNode, rs, "after");
+				dojo.destroy(rs);
+
+				// Okay, we split the text.  Now we need to see if we're
+				// parented to the block element we're splitting and if
+				// not, we have to split all the way up.  Ugh.
+				var parentC = startNode.parentNode;
+				while(parentC !== block.blockNode){
+					var tg = parentC.tagName;
+					var newTg = doc.createElement(tg);
+					// Clone over any 'style' data. 
+					if(parentC.style){
+						if(newTg.style){
+							if(parentC.style.cssText){
+								newTg.style.cssText = parentC.style.cssText;
+							}
+						}
+					}
+
+					nodeToMove = endNode;
+					while(nodeToMove){
+						tNode = nodeToMove.nextSibling;
+						newTg.appendChild(nodeToMove);
+						nodeToMove = tNode;
+					}
+					dojo.place(newTg, parentC, "after");
+					startNode = parentC;
+					endNode = newTg;
+					parentC = parentC.parentNode;
+				}
+
+				// Lastly, move the split out tags to the new block.
+				// as they should now be split properly.
+				nodeToMove = endNode;
+				if(nodeToMove.nodeType == 1 || (nodeToMove.nodeType == 3 && nodeToMove.nodeValue)){
+					// Non-blank text and non-text nodes need to clear out that blank space
+					// before moving the contents.
+					newblock.innerHTML = "";
+				}
+				while(nodeToMove){
+					tNode = nodeToMove.nextSibling;
+					newblock.appendChild(nodeToMove);
+					nodeToMove = tNode;
+				}
+			}
+			
+			//lets move caret to the newly created block
+			newrange = dijit.range.create(this.editor.window);
+			newrange.setStart(newblock, 0);
+			selection.removeAllRanges();
+			selection.addRange(newrange);
+			if(this.editor.height){
+				dijit.scrollIntoView(newblock);
+			}
 			if(dojo.isMoz){
 				// press enter in middle of P may leave a trailing <br/>, let's remove it later
 				this._pressedEnterInBlock = block.blockNode;

data/dojo/dijit/_editor/plugins/FontChoice.js

@@ -2,6 +2,7 @@ dojo.provide("dijit._editor.plugins.FontChoice");
 
 dojo.require("dijit._editor._Plugin");
 dojo.require("dijit._editor.range");
+dojo.require("dijit._editor.selection");
 dojo.require("dijit.form.FilteringSelect");
 dojo.require("dojo.data.ItemFileReadStore");
 dojo.require("dojo.i18n");
@@ -75,8 +76,8 @@ dojo.declare("dijit._editor.plugins._FontDropDown",
 			}
 		});
 
-		this.select.attr("value", "", false);
-		this.disabled = this.select.attr("disabled");
+		this.select.set("value", "", false);
+		this.disabled = this.select.get("disabled");
 	},
 
 	_setValueAttr: function(value, priorityChange){
@@ -91,7 +92,7 @@ dojo.declare("dijit._editor.plugins._FontDropDown",
 
 		//if the value is not a permitted value, just set empty string to prevent showing the warning icon
 		priorityChange = priorityChange !== false?true:false;
-		this.select.attr('value', dojo.indexOf(this.values,value) < 0 ? "" : value, priorityChange);
+		this.select.set('value', dojo.indexOf(this.values,value) < 0 ? "" : value, priorityChange);
 		if(!priorityChange){
 			// Clear the last state in case of updateState calls.  Ref: #10466
 			this.select._lastValueReported=null;
@@ -100,9 +101,9 @@ dojo.declare("dijit._editor.plugins._FontDropDown",
 
 	_getValueAttr: function(){
 		// summary:
-		//		Allow retreving the value from the composite select on
-		//		call to button.attr("value");
-		return this.select.attr('value');
+		//		Allow retreiving the value from the composite select on
+		//		call to button.get("value");
+		return this.select.get('value');
 	},
 
 	focus: function(){
@@ -120,7 +121,7 @@ dojo.declare("dijit._editor.plugins._FontDropDown",
 		// Save off ths disabled state so the get retrieves it correctly
 		//without needing to have a function proxy it.
 		this.disabled = value;
-		this.select.attr("disabled", value);
+		this.select.set("disabled", value);
 	}
 });
 
@@ -245,7 +246,14 @@ dojo.declare("dijit._editor.plugins._FormatBlockDropDown", dijit._editor.plugins
 
 	// values: [public] Array
 	//		The HTML format tags supported by this plugin
-	values: ["p", "h1", "h2", "h3", "pre"],
+	values: ["noFormat", "p", "h1", "h2", "h3", "pre"],
+
+	postCreate: function(){
+		// Init and set the default value to no formatting.  Update state will adjust it
+		// as needed.
+		this.inherited(arguments);
+		this.set("value", "noFormat", false);
+	},
 
 	getLabel: function(value, name){
 		// summary:
@@ -261,6 +269,138 @@ dojo.declare("dijit._editor.plugins._FormatBlockDropDown", dijit._editor.plugins
 		}else{
 			return "<" + value + ">" + name + "</" + value + ">";
 		}
+	},
+
+	_execCommand: function(editor, command, choice){
+		// summary:
+		//		Over-ride for default exec-command label.
+		// 		Allows us to treat 'none' as special.
+		if(choice === "noFormat"){
+			var start;
+			var end;
+			var sel = dijit.range.getSelection(editor.window);
+			if(sel && sel.rangeCount > 0){
+				var range = sel.getRangeAt(0);
+				var node, tag;
+				if(range){
+					start = range.startContainer;
+					end = range.endContainer;
+
+					// find containing nodes of start/end.
+					while(start && start !== editor.editNode && 
+						  start !== editor.document.body && 
+						  start.nodeType !== 1){
+						start = start.parentNode;
+					}
+
+					while(end && end !== editor.editNode && 
+						  end !== editor.document.body && 
+						  end.nodeType !== 1){
+						end = end.parentNode;
+					}
+
+					var processChildren = dojo.hitch(this, function(node, array){
+						if(node.childNodes && node.childNodes.length){
+							var i;
+							for(i = 0; i < node.childNodes.length; i++){
+								var c = node.childNodes[i];
+								if(c.nodeType == 1){
+									if(dojo.withGlobal(editor.window, "inSelection", dijit._editor.selection, [c])){
+										var tag = c.tagName? c.tagName.toLowerCase(): "";
+										if(dojo.indexOf(this.values, tag) !== -1){
+											array.push(c);
+										}
+										processChildren(c,array);
+									}
+								}
+							}
+						}
+					});
+
+					var unformatNodes = dojo.hitch(this, function(nodes){
+						// summary:
+						//		Internal function to clear format nodes.
+						// nodes:
+						//		The array of nodes to strip formatting from.
+						if(nodes && nodes.length){
+							editor.beginEditing();
+							while(nodes.length){
+								this._removeFormat(editor, nodes.pop());
+							}
+							editor.endEditing();
+						}
+					});
+
+					var clearNodes = [];
+					if(start == end){
+						//Contained within the same block, may be collapsed, but who cares, see if we
+						// have a block element to remove.
+						var block;
+						node = start;
+						while(node && node !== editor.editNode && node !== editor.document.body){
+							if(node.nodeType == 1){
+								tag = node.tagName? node.tagName.toLowerCase(): "";
+								if(dojo.indexOf(this.values, tag) !== -1){
+									block = node;
+									break;
+								}
+							}
+							node = node.parentNode;
+						}
+
+						//Also look for all child nodes in the selection that may need to be 
+						//cleared of formatting
+						processChildren(start, clearNodes);
+						if(block) { clearNodes = [block].concat(clearNodes); }
+						unformatNodes(clearNodes);
+					}else{
+						// Probably a multi select, so we have to process it.  Whee.
+						node = start;
+						while(dojo.withGlobal(editor.window, "inSelection", dijit._editor.selection, [node])){
+							if(node.nodeType == 1){
+								tag = node.tagName? node.tagName.toLowerCase(): "";
+								if(dojo.indexOf(this.values, tag) !== -1){
+									clearNodes.push(node);
+								}
+								processChildren(node,clearNodes);
+							}
+							node = node.nextSibling;
+						}
+						unformatNodes(clearNodes);
+					}
+					editor.onDisplayChanged();
+				}
+			}
+		}else{
+			editor.execCommand(command, choice);
+		}
+	},
+
+	_removeFormat: function(editor, node){
+		// summary:
+		//		function to remove the block format node.
+		// node:
+		//		The block format node to remove (and leave the contents behind)
+		if(editor.customUndo){
+			// So of course IE doesn't work right with paste-overs.
+			// We have to do this manually, which is okay since IE already uses
+			// customUndo and we turned it on for WebKit.  WebKit pasted funny, 
+			// so couldn't use the execCommand approach
+			while(node.firstChild){
+				dojo.place(node.firstChild, node, "before");
+			}
+			node.parentNode.removeChild(node);
+		}else{
+			// Everyone else works fine this way, a paste-over and is native
+			// undo friendly.
+			dojo.withGlobal(editor.window, 
+				 "selectElementChildren", dijit._editor.selection, [node]);
+			var html = 	dojo.withGlobal(editor.window, 
+				 "getSelectedHtml", dijit._editor.selection, [null]);
+			dojo.withGlobal(editor.window, 
+				 "selectElement", dijit._editor.selection, [node]);
+			editor.execCommand("inserthtml", html||"");
+		}
 	}
 });
 
@@ -324,19 +464,28 @@ dojo.declare("dijit._editor.plugins.FontChoice", dijit._editor._Plugin,{
 			params.values = this.params.custom;
 		}
 
-		this.button = new clazz(params);
+		var editor = this.editor;
+		this.button = new clazz(dojo.delegate({dir: editor.dir, lang: editor.lang}, params));
 
 		// Reflect changes to the drop down in the editor
 		this.connect(this.button.select, "onChange", function(choice){
 			// User invoked change, since all internal updates set priorityChange to false and will
 			// not trigger an onChange event.
 			this.editor.focus();
-
+			
 			if(this.command == "fontName" && choice.indexOf(" ") != -1){ choice = "'" + choice + "'"; }
 
 			// Invoke, the editor already normalizes commands called through its
 			// execCommand.
-			this.editor.execCommand(this.command, choice);
+			if(this.button._execCommand){
+				this.button._execCommand(this.editor, this.command, choice);
+			}else{
+				this.editor.execCommand(this.command, choice);
+			}
+			
+			// Enable custom undo for webkit, needed for noFormat to work properly
+			// and still undo.
+			this.editor.customUndo = this.editor.customUndo || dojo.isWebKit;
 		});
 	},
 
@@ -365,34 +514,47 @@ dojo.declare("dijit._editor.plugins.FontChoice", dijit._editor._Plugin,{
 			var quoted = dojo.isString(value) && value.match(/'([^']*)'/);
 			if(quoted){ value = quoted[1]; }
 
-			if(!value && _c === "formatBlock"){
-				// Some browsers (WebKit) doesn't actually get the tag info right.
-				// So ... lets double-check it.
-				var elem;
-				// Try to find the current element where the caret is.
-				var sel = dijit.range.getSelection(this.editor.window);
-				if(sel && sel.rangeCount > 0){
-					var range = sel.getRangeAt(0);
-					if(range){
-						elem = range.endContainer;
+			if(_c === "formatBlock"){
+				if(!value || value == "p"){
+					// Some browsers (WebKit) doesn't actually get the tag info right.
+					// and IE returns paragraph when in a DIV!, so incorrect a lot,
+					// so we have double-check it.
+					value = null;
+					var elem;
+					// Try to find the current element where the caret is.
+					var sel = dijit.range.getSelection(this.editor.window);
+					if(sel && sel.rangeCount > 0){
+						var range = sel.getRangeAt(0);
+						if(range){
+							elem = range.endContainer;
+						}
 					}
-				}
 
-				// Okay, now see if we can find one of the formatting types we're in.
-				while(elem && elem !== _e.editNode && elem !== _e.document){
-					var tg = elem.tagName?elem.tagName.toLowerCase():"";
-					if(tg && dojo.indexOf(this.button.values, tg) > -1){
-						value = tg;
-						break;
+					// Okay, now see if we can find one of the formatting types we're in.
+					while(elem && elem !== _e.editNode && elem !== _e.document){
+						var tg = elem.tagName?elem.tagName.toLowerCase():"";
+						if(tg && dojo.indexOf(this.button.values, tg) > -1){
+							value = tg;
+							break;
+						}
+						elem = elem.parentNode;
+					}
+					if(!value){
+						// Still no value, so lets select 'none'.
+						value = "noFormat";
+					}
+				}else{
+					// Check that the block format is one allowed, if not,
+					// null it so that it gets set to empty.
+					if(dojo.indexOf(this.button.values, value) < 0){
+						value = "noFormat";
 					}
-					elem = elem.parentNode;
 				}
 			}
-
-			if(value !== this.button.attr("value")){
+			if(value !== this.button.get("value")){
 				// Set the value, but denote it is not a priority change, so no
 				// onchange fires.
-				this.button.attr('value', value, false);
+				this.button.set('value', value, false);
 			}
 		}
 	}