Enano CMS (1.1.x): comparison includes/clientside/tinymce/tiny_mce_src.js

Mercurial Mercurial > repos > enano-1.1 / comparison

summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help

includes/clientside/tinymce/tiny_mce_src.js

changeset 543	dffcbfbc4e59
parent 476	f26a69c40431
child 588	20484deb89cd

equal deleted inserted replaced

-:5841df0ab575
+:dffcbfbc4e59
 /* file:jscripts/tiny_mce/classes/tinymce.js */
 var tinymce = {
 	majorVersion : '3',
-	minorVersion : '0.3',
+	minorVersion : '0.8',
-	releaseDate : '2008-03-03',
+	releaseDate : '2008-04-30',
 	_init : function() {
-		var t = this, ua = navigator.userAgent, i, nl, n, base;
+		var t = this, d = document, w = window, na = navigator, ua = na.userAgent, i, nl, n, base, p;
 		// Browser checks
-		t.isOpera = window.opera && opera.buildNumber;
+		t.isOpera = w.opera && opera.buildNumber;
 		t.isWebKit = /WebKit/.test(ua);
-		t.isOldWebKit = t.isWebKit && !window.getSelection().getRangeAt;
+		t.isOldWebKit = t.isWebKit && !w.getSelection().getRangeAt;
-		t.isIE = !t.isWebKit && !t.isOpera && (/MSIE/gi).test(ua) && (/Explorer/gi).test(navigator.appName);
+		t.isIE = !t.isWebKit && !t.isOpera && (/MSIE/gi).test(ua) && (/Explorer/gi).test(na.appName);
 		t.isIE6 = t.isIE && /MSIE [56]/.test(ua);
 		t.isGecko = !t.isWebKit && /Gecko/.test(ua);
 		t.isMac = ua.indexOf('Mac') != -1;
 		// TinyMCE .NET webcontrol might be setting the values for TinyMCE
-		if (window.tinyMCEPreInit) {
+		if (w.tinyMCEPreInit) {
 			t.suffix = tinyMCEPreInit.suffix;
 			t.baseURL = tinyMCEPreInit.base;
+			t.query = tinyMCEPreInit.query;
 			return;
 		}
 		// Get suffix and base
 		t.suffix = '';
 		// If base element found, add that infront of baseURL
-		nl = document.getElementsByTagName('base');
+		nl = d.getElementsByTagName('base');
 		for (i=0; i<nl.length; i++) {
 			if (nl[i].href)
 				base = nl[i].href;
 		}
 		function getBase(n) {
 			if (n.src && /tiny_mce(|_dev|_src|_gzip|_jquery|_prototype).js/.test(n.src)) {
 				if (/_(src|dev)\.js/g.test(n.src))
 					t.suffix = '_src';
+				if ((p = n.src.indexOf('?')) != -1)
+					t.query = n.src.substring(p + 1);
 				t.baseURL = n.src.substring(0, n.src.lastIndexOf('/'));
 				// If path to script is relative and a base href was found add that one infront
 				if (base && t.baseURL.indexOf('://') == -1)
 					t.baseURL = base + t.baseURL;
 			return null;
 		};
 		// Check document
-		nl = document.getElementsByTagName('script');
+		nl = d.getElementsByTagName('script');
 		for (i=0; i<nl.length; i++) {
 			if (getBase(nl[i]))
 				return;
 		}
 		// Check head
-		n = document.getElementsByTagName('head')[0];
+		n = d.getElementsByTagName('head')[0];
 		if (n) {
 			nl = n.getElementsByTagName('script');
 			for (i=0; i<nl.length; i++) {
 				if (getBase(nl[i]))
 					return;
 			}
 			ns[cn].prototype[cn] = ns[cn];
 			// Add super methods
 			t.each(sp, function(f, n) {
-				if (n != scn)
+				ns[cn].prototype[n] = sp[n];
-					ns[cn].prototype[n] = sp[n];
 			});
 			// Add overridden methods
 			t.each(p, function(f, n) {
 				// Extend methods if needed
 		return o;
 	},
 	addUnload : function(f, s) {
-		var t = this, w = window, unload;
+		var t = this, w = window;
 		f = {func : f, scope : s || this};
 		if (!t.unloads) {
-			unload = function() {
+			function unload() {
 				var li = t.unloads, o, n;
-				// Call unload handlers
+				if (li) {
-				for (n in li) {
+					// Call unload handlers
-					o = li[n];
+					for (n in li) {
+						o = li[n];
-					if (o && o.func)
-						o.func.call(o.scope);
+						if (o && o.func)
-				}
+							o.func.call(o.scope, 1); // Send in one arg to distinct unload and user destroy
+					}
-				// Detach unload function
-				if (w.detachEvent)
+					// Detach unload function
-					w.detachEvent('onunload', unload);
+					if (w.detachEvent) {
-				else if (w.removeEventListener)
+						w.detachEvent('onbeforeunload', fakeUnload);
-					w.removeEventListener('unload', unload, false);
+						w.detachEvent('onunload', unload);
+					} else if (w.removeEventListener)
-				// Destroy references
+						w.removeEventListener('unload', unload, false);
-				o = li = w = unload = null;
+					// Destroy references
-				// Run garbarge collector on IE
+					t.unloads = o = li = w = unload = null;
-				if (window.CollectGarbage)
-					window.CollectGarbage();
+					// Run garbarge collector on IE
+					if (window.CollectGarbage)
+						window.CollectGarbage();
+				}
 			};
+			function fakeUnload() {
+				var d = document;
+				// Is there things still loading, then do some magic
+				if (d.readyState == 'interactive') {
+					function stop() {
+						// Prevent memory leak
+						d.detachEvent('onstop', stop);
+						// Call unload handler
+						unload();
+						d = null;
+					};
+					// Fire unload when the currently loading page is stopped
+					d.attachEvent('onstop', stop);
+					// Remove onstop listener after a while to prevent the unload function
+					// to execute if the user presses cancel in an onbeforeunload
+					// confirm dialog and then presses the browser stop button
+					window.setTimeout(function() {
+						d.detachEvent('onstop', stop);
+					}, 0);
+				}
+			};
 			// Attach unload handler
-			if (w.attachEvent)
+			if (w.attachEvent) {
 				w.attachEvent('onunload', unload);
-			else if (w.addEventListener)
+				w.attachEvent('onbeforeunload', fakeUnload);
+			} else if (w.addEventListener)
 				w.addEventListener('unload', unload, false);
 			// Setup initial unload handler array
 			t.unloads = [f];
 		} else
 				return false;
 			}
 		});
 		return r;
+	},
+	explode : function(s, d) {
+		return s ? tinymce.map(s.split(d || ','), tinymce.trim) : s;
+	},
+	_addVer : function(u) {
+		var v;
+		if (!this.query)
+			return u;
+		v = (u.indexOf('?') == -1 ? '?' : '&') + this.query;
+		if (u.indexOf('#') == -1)
+			return u + v;
+		return u.replace('#', v + '#');
 	}
 	};
 // Required for GZip AJAX loading
 		return o;
 	},
 	dispatch : function() {
-		var s, a = arguments;
+		var s, a = arguments, i, li = this.listeners, c;
-		tinymce.each(this.listeners, function(c) {
+		// Needs to be a real loop since the listener count might change while looping
-			return s = c.cb.apply(c.scope, a);
+		// And this is also more efficient
-		});
+		for (i = 0; i<li.length; i++) {
+			c = li[i];
+			s = c.cb.apply(c.scope, a);
+			if (s === false)
+				break;
+		}
 		return s;
 	}
 	});
 		DOMUtils : function(d, s) {
 			var t = this;
 			t.doc = d;
+			t.win = window;
 			t.files = {};
 			t.cssFlicker = false;
 			t.counter = 0;
 			t.boxModel = !tinymce.isIE || d.compatMode == "CSS1Compat";
+			t.stdMode = d.documentMode === 8;
 			this.settings = s = tinymce.extend({
 				keep_values : false,
 				hex_colors : 1,
 				process_html : 1
 				} catch (e) {
 					t.cssFlicker = true;
 				}
 			}
-			tinymce.addUnload(function() {
+			tinymce.addUnload(t.destroy, t);
-				t.doc = t.root = null;
-			});
 		},
 		getRoot : function() {
 			var t = this, s = t.settings;
 		},
 		getViewPort : function(w) {
 			var d, b;
-			w = !w ? window : w;
+			w = !w ? this.win : w;
 			d = w.document;
 			b = this.boxModel ? d.documentElement : d.body;
 			// Returns viewport size excluding scrollbars
 			return {
 		},
 		get : function(e) {
 			var n;
-			if (typeof(e) == 'string') {
+			if (e && this.doc && typeof(e) == 'string') {
 				n = e;
 				e = this.doc.getElementById(e);
 				// IE and Opera returns meta elements when they match the specified input ID, but getElementsByName seems to do the trick
 				if (e && e.id !== n)
 				// Select elements
 				l = tinymce.grep(s.querySelectorAll(pa));
 				// Restore old id
-				if (i)
+				s.id = i;
-					s.id = i;
 				return l;
 			}
 			if (t.settings.strict) {
 			return o + ' />';
 		},
 		remove : function(n, k) {
 			return this.run(n, function(n) {
-				var p;
+				var p, g;
 				p = n.parentNode;
 				if (!p)
 					return null;
 				if (k) {
 					each (n.childNodes, function(c) {
 						p.insertBefore(c.cloneNode(true), n);
 					});
 				}
+				// Fix IE psuedo leak
+		/*		if (isIE) {
+					p = n.cloneNode(true);
+					n.outerHTML = '';
+					return p;
+				}*/
 				return p.removeChild(n);
 			});
 		},
 			return this.run(e, function(e) {
 				var s = t.settings;
 				switch (n) {
 					case "style":
+						// No mce_style for elements with these since they might get resized by the user
 						if (s.keep_values) {
-							if (v)
+							if (v && !t._isRes(v))
 								e.setAttribute('mce_style', v, 2);
 							else
 								e.removeAttribute('mce_style', 2);
 						}
 						e.style.cssText = v;
 						break;
 					case "class":
-						e.className = v;
+						e.className = v || ''; // Fix IE null bug
 						break;
 					case "src":
 					case "href":
 						if (s.keep_values) {
 		getAttrib : function(e, n, dv) {
 			var v, t = this;
 			e = t.get(e);
-			if (!e)
+			if (!e || e.nodeType !== 1)
 				return false;
 			if (!is(dv))
 				dv = "";
 					v = v || e.style.cssText;
 					if (v) {
 						v = t.serializeStyle(t.parseStyle(v));
-						if (t.settings.keep_values)
+						if (t.settings.keep_values && !t._isRes(v))
 							e.setAttribute('mce_style', v);
 					}
 					break;
 			}
 			if (n && isIE) {
 				n = n.getBoundingClientRect();
 				e = t.boxModel ? d.documentElement : d.body;
 				x = t.getStyle(t.select('html')[0], 'borderWidth'); // Remove border
 				x = (x == 'medium' || t.boxModel && !t.isIE6) && 2 || x;
-				n.top += window.self != window.top ? 2 : 0; // IE adds some strange extra cord if used in a frameset
+				n.top += t.win.self != t.win.top ? 2 : 0; // IE adds some strange extra cord if used in a frameset
 				return {x : n.left + e.scrollLeft - x, y : n.top + e.scrollTop - x};
 			}
 			r = n;
 			while (r) {
 				x += r.offsetLeft || 0;
 				y += r.offsetTop || 0;
 				r = r.offsetParent;
 			}
 			r = n;
 			while (r) {
-				// Opera 9.25 bug fix, fixed in 9.50 seems to be fixed in Opera 9.26 too
+				// Opera 9.25 bug fix, fixed in 9.50
-			/*	if (!tinymce.isOpera || r.nodeName != 'TR') {
+				if (!/^table-row|inline.*/i.test(t.getStyle(r, "display", 1))) {
 					x -= r.scrollLeft || 0;
 					y -= r.scrollTop || 0;
-				}*/
+				}
 				r = r.parentNode;
 				if (r == d.body)
 					break;
 			return s;
 		},
 		loadCSS : function(u) {
-			var t = this, d = this.doc;
+			var t = this, d = t.doc;
 			if (!u)
 				u = '';
 			each(u.split(','), function(u) {
 				if (t.files[u])
 					return;
 				t.files[u] = true;
+				t.add(t.select('head')[0], 'link', {rel : 'stylesheet', href : tinymce._addVer(u)});
-				if (!d.createStyleSheet)
-					t.add(t.select('head')[0], 'link', {rel : 'stylesheet', href : u});
-				else
-					d.createStyleSheet(u);
 			});
 		},
 		// #if !jquery
 									// Create new paragraph
 									p = t.doc.createElement('p');
 									// Copy all attributes
 									n.cloneNode(false).outerHTML.replace(/([a-z0-9\-_]+)=/gi, function(a, b) {
-										if (b !== 'mce_tmp')
+										var v;
-											p.setAttribute(b, n.getAttribute(b));
+										if (b !== 'mce_tmp') {
+											v = n.getAttribute(b);
+											if (!v && b === 'class')
+												v = n.className;
+											p.setAttribute(b, v);
+										}
 									});
 									// Append all children to new paragraph
 									for (x = 0; x<n.childNodes.length; x++)
 										p.appendChild(n.childNodes[x].cloneNode(true));
 			// Convert strong and em to b and i in FF since it can't handle them
 			if (tinymce.isGecko) {
 				h = h.replace(/<(\/?)strong>|<strong( [^>]+)>/gi, '<$1b$2>');
 				h = h.replace(/<(\/?)em>|<em( [^>]+)>/gi, '<$1i$2>');
-			}
+			} else if (isIE)
+				h = h.replace(/&apos;/g, '&#39;'); // IE can't handle apos
 			// Fix some issues
 			h = h.replace(/<a( )([^>]+)\/>|<a\/>/gi, '<a$1$2></a>'); // Force open
 			// Store away src and href in mce_src and mce_href since browsers mess them up
 						if (b == 'style') {
 							// Why did I need this one?
 							//if (isIE)
 							//	u = t.serializeStyle(t.parseStyle(u));
+							// No mce_style for elements with these since they might get resized by the user
+							if (t._isRes(c))
+								return m;
 							if (s.hex_colors) {
 								u = u.replace(/rgb\([^\)]+\)/g, function(v) {
 									return t.toHex(v);
 								});
 					each(o.childNodes, function(c) {
 						n.appendChild(c.cloneNode(true));
 					});
 				}
+				// Fix IE psuedo leak for elements since replacing elements if fairly common
+				// Will break parentNode for some unknown reason
+	/*			if (isIE && o.nodeType === 1) {
+					o.parentNode.insertBefore(n, o);
+					o.outerHTML = '';
+					return n;
+				}*/
 				return o.parentNode.replaceChild(n, o);
 			});
 		},
 		// #endif
 		},
 		run : function(e, f, s) {
 			var t = this, o;
-			if (typeof(e) === 'string')
+			if (t.doc && typeof(e) === 'string')
 				e = t.doc.getElementById(e);
 			if (!e)
 				return false;
 				return o;
 			}
 			return f.call(s, e);
+		},
+		getAttribs : function(n) {
+			var o;
+			n = this.get(n);
+			if (!n)
+				return [];
+			if (isIE) {
+				o = [];
+				// Object will throw exception in IE
+				if (n.nodeName == 'OBJECT')
+					return n.attributes;
+				// It's crazy that this is faster in IE but it's because it returns all attributes all the time
+				n.cloneNode(false).outerHTML.replace(/([a-z0-9\:\-_]+)=/gi, function(a, b) {
+					o.push({specified : 1, nodeName : b});
+				});
+				return o;
+			}
+			return n.attributes;
+		},
+		destroy : function(s) {
+			var t = this;
+			t.win = t.doc = t.root = null;
+			// Manual destroy then remove unload handler
+			if (!s)
+				tinymce.removeUnload(t.destroy);
+		},
+		_isRes : function(c) {
+			// Is live resizble element
+			return /^(top|left|bottom|right|width|height)/i.test(c) || /^[;\s](top|left|bottom|right|width|height)/i.test(c);
 		}
 		/*
 		walk : function(n, f, s) {
 			var d = this.doc, w;
 			});
 			return s;
 		},
+		clear : function(o) {
+			var t = this, a = t.events, i, e;
+			if (o) {
+				o = DOM.get(o);
+				for (i = a.length - 1; i >= 0; i--) {
+					e = a[i];
+					if (e.obj === o) {
+						t._remove(e.obj, e.name, e.cfunc);
+						e.obj = e.cfunc = null;
+						a.splice(i, 1);
+					}
+				}
+			}
+		},
 		// #endif
 		cancel : function(e) {
 			if (!e)
 				return false;
 			else
 				o['on' + n] = f;
 		},
 		_remove : function(o, n, f) {
-			if (o.detachEvent)
+			if (o) {
-				o.detachEvent('on' + n, f);
+				try {
-			else if (o.removeEventListener)
+					if (o.detachEvent)
-				o.removeEventListener(n, f, false);
+						o.detachEvent('on' + n, f);
-			else
+					else if (o.removeEventListener)
-				o['on' + n] = null;
+						o.removeEventListener(n, f, false);
+					else
+						o['on' + n] = null;
+				} catch (ex) {
+					// Might fail with permission denined on IE so we just ignore that
+				}
+			}
 		},
 		_pageInit : function() {
 			var e = Event;
 })();
 /* file:jscripts/tiny_mce/classes/dom/Selection.js */
 (function() {
+	function trimNl(s) {
+		return s.replace(/[\n\r]+/g, '');
+	};
 	// Shorten names
 	var is = tinymce.is, isIE = tinymce.isIE, each = tinymce.each;
 	tinymce.create('tinymce.dom.Selection', {
 		Selection : function(dom, win, serializer) {
 			t.dom = dom;
 			t.win = win;
 			t.serializer = serializer;
 			// Prevent leaks
-			tinymce.addUnload(function() {
+			tinymce.addUnload(t.destroy, t);
-				t.win = null;
-			});
 		},
 		getContent : function(s) {
 			var t = this, r = t.getRng(), e = t.dom.create("body"), se = t.getSel(), wb, wa, n;
 				r = r.duplicate();
 				r.collapse(1);
 				e = r.parentElement();
-				if (e.nodeName == 'BODY')
+				if (e && e.nodeName == 'BODY')
 					return e.firstChild;
 				return e;
 			} else {
 				e = r.startContainer;
 				r = r.duplicate();
 				r.collapse(0);
 				e = r.parentElement();
-				if (e.nodeName == 'BODY')
+				if (e && e.nodeName == 'BODY')
 					return e.lastChild;
 				return e;
 			} else {
 				e = r.endContainer;
 				return t.dom.getParent(e, function(n) {return n.nodeType == 1;});
 			}
 		},
 		getBookmark : function(si) {
-			var t = this, r = t.getRng(), tr, sx, sy, vp = t.dom.getViewPort(t.win), e, sp, bp, le, c = -0xFFFFFF, s, ro = t.dom.getRoot();
+			var t = this, r = t.getRng(), tr, sx, sy, vp = t.dom.getViewPort(t.win), e, sp, bp, le, c = -0xFFFFFF, s, ro = t.dom.getRoot(), wb = 0, wa = 0, nv;
 			sx = vp.x;
 			sy = vp.y;
 			// Simple bookmark fast but not as persistent
 			if (si == 'simple')
 			}
 			// Text selection
 			function getPos(r, sn, en) {
-				var w = document.createTreeWalker(r, NodeFilter.SHOW_TEXT, null, false), n, p = 0, d = {};
+				var w = t.dom.doc.createTreeWalker(r, NodeFilter.SHOW_TEXT, null, false), n, p = 0, d = {};
 				while ((n = w.nextNode()) != null) {
 					if (n == sn)
 						d.start = p;
 					if (n == en) {
 						d.end = p;
 						return d;
 					}
-					p += n.nodeValue ? tinymce.trim(n.nodeValue).length : 0;
+					p += (n.nodeValue || '').length;
 				}
 				return null;
 			};
 				e = getPos(ro, s.anchorNode, s.focusNode);
 				if (!e)
 					return {scrollX : sx, scrollY : sy};
+				// Count whitespace before
+				trimNl(s.anchorNode.nodeValue || '').replace(/^\s+/, function(a) {wb = a.length;});
 				return {
-					start : e.start + s.anchorOffset,
+					start : Math.max(e.start + s.anchorOffset - wb, 0),
-					end : e.end + s.focusOffset,
+					end : Math.max(e.end + s.focusOffset - wb, 0),
 					scrollX : sx,
 					scrollY : sy,
-					beg : s.anchorOffset == 0
+					beg : s.anchorOffset - wb == 0
 				};
 			} else {
 				e = getPos(ro, r.startContainer, r.endContainer);
+				// Count whitespace before start and end container
+				//(r.startContainer.nodeValue || '').replace(/^\s+/, function(a) {wb = a.length;});
+				//(r.endContainer.nodeValue || '').replace(/^\s+/, function(a) {wa = a.length;});
 				if (!e)
 					return {scrollX : sx, scrollY : sy};
 				return {
-					start : e.start + r.startOffset,
+					start : Math.max(e.start + r.startOffset - wb, 0),
-					end : e.end + r.endOffset,
+					end : Math.max(e.end + r.endOffset - wa, 0),
 					scrollX : sx,
 					scrollY : sy,
-					beg : r.startOffset == 0
+					beg : r.startOffset - wb == 0
 				};
 			}
 		},
 		moveToBookmark : function(b) {
-			var t = this, r = t.getRng(), s = t.getSel(), ro = t.dom.getRoot(), sd;
+			var t = this, r = t.getRng(), s = t.getSel(), ro = t.dom.getRoot(), sd, nvl, nv;
 			function getPos(r, sp, ep) {
-				var w = document.createTreeWalker(r, NodeFilter.SHOW_TEXT, null, false), n, p = 0, d = {}, o, v;
+				var w = t.dom.doc.createTreeWalker(r, NodeFilter.SHOW_TEXT, null, false), n, p = 0, d = {}, o, v, wa, wb;
 				while ((n = w.nextNode()) != null) {
-					p += n.nodeValue ? tinymce.trim(n.nodeValue).length : 0;
+					wa = wb = 0;
+					nv = n.nodeValue || '';
+					//nv.replace(/^\s+[^\s]/, function(a) {wb = a.length - 1;});
+					//nv.replace(/[^\s]\s+$/, function(a) {wa = a.length - 1;});
+					nvl = trimNl(nv).length;
+					p += nvl;
 					if (p >= sp && !d.startNode) {
-						o = sp - (p - n.nodeValue.length);
+						o = sp - (p - nvl);
 						// Fix for odd quirk in FF
-						if (b.beg && o >= n.nodeValue.length)
+						if (b.beg && o >= nvl)
 							continue;
 						d.startNode = n;
-						d.startOffset = o;
+						d.startOffset = o + wb;
 					}
 					if (p >= ep) {
 						d.endNode = n;
-						d.endOffset = ep - (p - n.nodeValue.length);
+						d.endOffset = ep - (p - nvl) + wb;
 						return d;
 					}
 				}
 				return null;
 					return n.nodeType == 1;
 				});
 			}
 			return r.item ? r.item(0) : r.parentElement();
+		},
+		destroy : function(s) {
+			var t = this;
+			t.win = null;
+			// Manual destroy then remove unload handler
+			if (!s)
+				tinymce.removeUnload(t.destroy);
 		}
 		});
 })();
 		writeCDATA : function(v) {
 			this.node.appendChild(this.doc.createCDATA(v));
 		},
 		writeComment : function(v) {
-			this.node.appendChild(this.doc.createComment(v));
+			this.node.appendChild(this.doc.createComment(v.replace(/\-\-/g, ' ')));
 		},
 		getContent : function() {
 			var h;
 /* file:jscripts/tiny_mce/classes/dom/Serializer.js */
 (function() {
 	// Shorten names
-	var extend = tinymce.extend, each = tinymce.each, Dispatcher = tinymce.util.Dispatcher, isIE = tinymce.isIE;
+	var extend = tinymce.extend, each = tinymce.each, Dispatcher = tinymce.util.Dispatcher, isIE = tinymce.isIE, isGecko = tinymce.isGecko;
 	// Returns only attribites that have values not all attributes in IE
 	function getIEAtts(n) {
 		var o = [];
 		// Object will throw exception in IE
 		if (n.nodeName == 'OBJECT')
 			return n.attributes;
-		n.cloneNode(false).outerHTML.replace(/([a-z0-9\-_]+)=/gi, function(a, b) {
+		n.cloneNode(false).outerHTML.replace(/([a-z0-9\:\-_]+)=/gi, function(a, b) {
 			o.push({specified : 1, nodeName : b});
 		});
 		return o;
 	};
 						at = at || [];
 						// Parse attribute rule
 						s = s.replace(/::/g, '~');
-						s = /^([!\-])?([\w*.?~]+|)([=:<])?(.+)?$/.exec(s);
+						s = /^([!\-])?([\w*.?~_\-]+|)([=:<])?(.+)?$/.exec(s);
 						s[2] = s[2].replace(/~/g, ':');
 						// Add required attributes
 						if (s[1] == '!') {
 							ra = ra || [];
 			each(t.validElements, function(v, k) {
 				if (s)
 					s += '|';
 				if (k != '@')
-				s += k;
+					s += k;
 			});
 			t.validElementsRE = new RegExp('^(' + wildcardToRE(s.toLowerCase()) + ')$');
 			//console.debug(t.validElementsRE.toString());
 			//console.dir(t.rules);
 		},
 		// Internal functions
 		_postProcess : function(o) {
-			var t = this, s = t.settings, h = o.content, sc = [], p, l;
+			var t = this, s = t.settings, h = o.content, sc = [], p;
 			if (o.format == 'html') {
 				// Protect some elements
 				p = t._protect({
 					content : h,
 					patterns : [
-						/(<script[^>]*>)(.*?)(<\/script>)/g,
+						{pattern : /(<script[^>]*>)(.*?)(<\/script>)/g},
-						/(<style[^>]*>)(.*?)(<\/style>)/g,
+						{pattern : /(<style[^>]*>)(.*?)(<\/style>)/g},
-						/(<pre[^>]*>)(.*?)(<\/pre>)/g
+						{pattern : /(<pre[^>]*>)(.*?)(<\/pre>)/g, encode : 1}
 					]
 				});
 				h = p.content;
 				// Entity encode
-				if (s.entity_encoding !== 'raw') {
+				if (s.entity_encoding !== 'raw')
-					if (s.entity_encoding.indexOf('named') != -1) {
+					h = t._encode(h);
-						t.setEntities(s.entities);
-						l = t.entityLookup;
-						h = h.replace(t.entitiesRE, function(a) {
-							var v;
-							if (v = l[a])
-								a = '&' + v + ';';
-							return a;
-						});
-					}
-					if (s.entity_encoding.indexOf('numeric') != -1) {
-						h = h.replace(/[\u007E-\uFFFF]/g, function(a) {
-							return '&#' + a.charCodeAt(0) + ';';
-						});
-					}
-				}
 				// Use BR instead of &nbsp; padded P elements inside editor and use <p>&nbsp;</p> outside editor
-				if (o.set)
+/*				if (o.set)
 					h = h.replace(/<p>\s+(&nbsp;|&#160;|\u00a0|<br \/>)\s+<\/p>/g, '<p><br /></p>');
 				else
-					h = h.replace(/<p>\s+(&nbsp;|&#160;|\u00a0|<br \/>)\s+<\/p>/g, '<p>$1</p>');
+					h = h.replace(/<p>\s+(&nbsp;|&#160;|\u00a0|<br \/>)\s+<\/p>/g, '<p>$1</p>');*/
 				// Since Gecko and Safari keeps whitespace in the DOM we need to
 				// remove it inorder to match other browsers. But I think Gecko and Safari is right.
 				// This process is only done when getting contents out from the editor.
 				if (!o.set) {
+					// We need to replace paragraph whitespace with an nbsp before indentation to keep the \u00a0 char
+					h = h.replace(/<p>\s+<\/p>|<p([^>]+)>\s+<\/p>/g, s.entity_encoding == 'numeric' ? '<p$1>&#160;</p>' : '<p$1>&nbsp;</p>');
 					if (s.remove_linebreaks) {
+						h = h.replace(/\r?\n|\r/g, ' ');
 						h = h.replace(/(<[^>]+>)\s+/g, '$1 ');
 						h = h.replace(/\s+(<\/[^>]+>)/g, ' $1');
 						h = h.replace(/<(p|h[1-6]|blockquote|hr|div|table|tbody|tr|td|body|head|html|title|meta|style|pre|script|link|object) ([^>]+)>\s+/g, '<$1 $2>'); // Trim block start
 						h = h.replace(/<(p|h[1-6]|blockquote|hr|div|table|tbody|tr|td|body|head|html|title|meta|style|pre|script|link|object)>\s+/g, '<$1>'); // Trim block start
 						h = h.replace(/\s+<\/(p|h[1-6]|blockquote|hr|div|table|tbody|tr|td|body|head|html|title|meta|style|pre|script|link|object)>/g, '</$1>'); // Trim block end
 						h = h.replace(/\n\n/g, '\n');
 					}
 				}
 				h = t._unprotect(h, p);
+				// Restore the \u00a0 character if raw mode is enabled
+				if (s.entity_encoding == 'raw')
+					h = h.replace(/<p>&nbsp;<\/p>|<p([^>]+)>&nbsp;<\/p>/g, '<p$1>\u00a0</p>');
 			}
 			o.content = h;
 		},
 							}
 							// IE sometimes adds a / infront of the node name
 							if (nn.charAt(0) == '/')
 								nn = nn.substring(1);
+						} else if (isGecko) {
+							// Ignore br elements
+							if (n.nodeName === 'BR' && n.getAttribute('type') == '_moz')
+								return;
 						}
 						// Check if valid child
 						if (t.childRules) {
 							if (t.parentElementsRE.test(t.elementName)) {
 					w.writeEndElement();
 			}
 		},
 		_protect : function(o) {
+			var t = this;
 			o.items = o.items || [];
 			function enc(s) {
 				return s.replace(/[\r\n\\]/g, function(c) {
 					if (c === '\n')
 					return '\r';
 				});
 			};
 			each(o.patterns, function(p) {
-				o.content = dec(enc(o.content).replace(p, function(x, a, b, c) {
+				o.content = dec(enc(o.content).replace(p.pattern, function(x, a, b, c) {
-					o.items.push(dec(b));
+					b = dec(b);
+					if (p.encode)
+						b = t._encode(b);
+					o.items.push(b);
 					return a + '<!--mce:' + (o.items.length - 1) + '-->' + c;
 				}));
 			});
 			return o;
 			h = h.replace(/\<!--mce:([0-9]+)--\>/g, function(a, b) {
 				return o.items[parseInt(b)];
 			});
 			o.items = [];
+			return h;
+		},
+		_encode : function(h) {
+			var t = this, s = t.settings, l;
+			// Entity encode
+			if (s.entity_encoding !== 'raw') {
+				if (s.entity_encoding.indexOf('named') != -1) {
+					t.setEntities(s.entities);
+					l = t.entityLookup;
+					h = h.replace(t.entitiesRE, function(a) {
+						var v;
+						if (v = l[a])
+							a = '&' + v + ';';
+						return a;
+					});
+				}
+				if (s.entity_encoding.indexOf('numeric') != -1) {
+					h = h.replace(/[\u007E-\uFFFF]/g, function(a) {
+						return '&#' + a.charCodeAt(0) + ';';
+					});
+				}
+			}
 			return h;
 		},
 		_setup : function() {
 		},
 		load : function(u, cb, s) {
 			var t = this, o;
+			if (o = t.lookup[u]) {
+				// Is loaded fire callback
+				if (cb && o.state == 2)
+					cb.call(s || t);
+				return o;
+			}
 			function loadScript(u) {
 				if (tinymce.dom.Event.domLoaded || t.settings.strict_mode) {
 					tinymce.util.XHR.send({
-						url : u,
+						url : tinymce._addVer(u),
 						error : t.settings.error,
 						async : false,
 						success : function(co) {
 							t.eval(co);
 						}
 					});
 				} else
-					document.write('<script type="text/javascript" src="' + u + '"></script>');
+					document.write('<script type="text/javascript" src="' + tinymce._addVer(u) + '"></script>');
 			};
 			if (!tinymce.is(u, 'string')) {
 				each(u, function(u) {
 					loadScript(u);
 							ol = ' onload="';
 						ol += 'tinymce.dom.ScriptLoader._onLoad(this,\'' + u + '\',' + ix + ');"';
 					}
-					document.write('<script type="text/javascript" src="' + u + '"' + ol + '></script>');
+					document.write('<script type="text/javascript" src="' + tinymce._addVer(u) + '"' + ol + '></script>');
 					if (!o.func)
 						done(o);
 				} else
 					load(o);
 				t.active = -1;
 				t.setActive(b);
 			}
 		},
+		remove : function() {
+			DOM.remove(this.id);
+			this.destroy();
+		},
 		destroy : function() {
-			DOM.remove(this.id);
+			tinymce.dom.Event.clear(this.id);
 		}
 		});
 })();
 /* file:jscripts/tiny_mce/classes/ui/Container.js */
 /* file:jscripts/tiny_mce/classes/ui/Separator.js */
 tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
+	Separator : function(id, s) {
+		this.parent(id, s);
+		this.classPrefix = 'mceSeparator';
+	},
 	renderHTML : function() {
-		return tinymce.DOM.createHTML('span', {'class' : 'mceSeparator'});
+		return tinymce.DOM.createHTML('span', {'class' : this.classPrefix});
 	}
 	});
 /* file:jscripts/tiny_mce/classes/ui/MenuItem.js */
 			var t = this;
 			walk(t, function(o) {
 				if (o.removeAll)
 					o.removeAll();
+				else
+					o.remove();
 				o.destroy();
 			}, 'items', t);
 			t.items = {};
 	var is = tinymce.is, DOM = tinymce.DOM, each = tinymce.each, Event = tinymce.dom.Event, Element = tinymce.dom.Element;
 	tinymce.create('tinymce.ui.DropMenu:tinymce.ui.Menu', {
 		DropMenu : function(id, s) {
 			s = s || {};
-			s.container = s.container || document.body;
+			s.container = s.container || DOM.doc.body;
 			s.offset_x = s.offset_x || 0;
 			s.offset_y = s.offset_y || 0;
 			s.vp_offset_x = s.vp_offset_x || 0;
 			s.vp_offset_y = s.vp_offset_y || 0;
 			this.parent(id, s);
 			this.onShowMenu = new tinymce.util.Dispatcher(this);
 			this.onHideMenu = new tinymce.util.Dispatcher(this);
 			this.classPrefix = 'mceMenu';
-			// Fix for odd IE bug: #1903622
+			// Fix for odd IE bug: #1903622 (Frames selection)
-			this.fixIE = tinymce.isIE && window.top != window;
+			this.fixIE = tinymce.isIE && (DOM.win.top != DOM.win);
 		},
 		createMenu : function(s) {
 			var t = this, cs = t.settings, m;
 					DOM.setStyle(co, 'overflow', 'hidden');
 			}
 		},
 		showMenu : function(x, y, px) {
-			var t = this, s = t.settings, co, vp = DOM.getViewPort(), w, h, mx, my, ot = 2, dm, tb;
+			var t = this, s = t.settings, co, vp = DOM.getViewPort(), w, h, mx, my, ot = 2, dm, tb, cp = t.classPrefix;
 			t.collapse(1);
 			if (t.isMenuVisible)
 				return;
 			t.mouseClickFunc = Event.add(co, t.fixIE ? 'mousedown' : 'click', function(e) {
 				var m;
 				e = e.target;
-				if (e && (e = DOM.getParent(e, 'TR')) && !DOM.hasClass(e, 'mceMenuItemSub')) {
+				if (e && (e = DOM.getParent(e, 'TR')) && !DOM.hasClass(e, cp + 'ItemSub')) {
 					m = t.items[e.id];
 					if (m.isDisabled())
 						return;
 					dm = t;
-					while (dm) {
+					// Wait a while to fix IE bug where it looses the selection if the user clicks on a menu
-						if (dm.hideMenu)
+					// item when the editor is placed within an frame or iframe
-							dm.hideMenu();
+					DOM.win.setTimeout(function() {
+						while (dm) {
-						dm = dm.settings.parent;
+							if (dm.hideMenu)
-					}
+								dm.hideMenu();
-					if (m.settings.onclick)
+							dm = dm.settings.parent;
-						m.settings.onclick(e);
+						}
+					}, 0);
+					// Yield on IE to prevent loosing image focus when context menu is used
+					window.setTimeout(function() {
+						if (m.settings.onclick)
+							m.settings.onclick(e);
+					}, 0);
 					return Event.cancel(e); // Cancel to fix onbeforeunload problem
 				}
 			});
 							t.lastMenu.collapse(1);
 						if (m.isDisabled())
 							return;
-						if (e && DOM.hasClass(e, 'mceMenuItemSub')) {
+						if (e && DOM.hasClass(e, cp + 'ItemSub')) {
 							//p = DOM.getPos(s.container);
 							r = DOM.getRect(e);
 							m.showMenu((r.x + r.w - ot), r.y - ot, r.x);
 							t.lastMenu = m;
-							DOM.addClass(DOM.get(m.id).firstChild, 'mceMenuItemActive');
+							DOM.addClass(DOM.get(m.id).firstChild, cp + 'ItemActive');
 						}
 					}
 				});
 			}
 			t.onShowMenu.dispatch(t);
+			if (s.keyboard_focus) {
+				Event.add(co, 'keydown', t._keyHandler, t);
+				DOM.select('a', 'menu_' + t.id)[0].focus(); // Select first link
+			}
 		},
 		hideMenu : function(c) {
 			var t = this, co = DOM.get('menu_' + t.id), e;
 			if (!t.isMenuVisible)
 				return;
 			Event.remove(co, 'mouseover', t.mouseOverFunc);
 			Event.remove(co, t.fixIE ? 'mousedown' : 'click', t.mouseClickFunc);
+			Event.remove(co, 'keydown', t._keyHandler);
 			DOM.hide(co);
 			t.isMenuVisible = 0;
 			if (!c)
 				t.collapse(1);
 			if (t.element)
 				t.element.hide();
 			if (e = DOM.get(t.id))
-				DOM.removeClass(e.firstChild, 'mceMenuItemActive');
+				DOM.removeClass(e.firstChild, t.classPrefix + 'ItemActive');
 			t.onHideMenu.dispatch(t);
 		},
 		add : function(o) {
 			this.hideMenu(1);
 		},
 		remove : function(o) {
 			DOM.remove(o.id);
+			this.destroy();
 			return this.parent(o);
 		},
 		destroy : function() {
 		},
 		renderNode : function() {
 			var t = this, s = t.settings, n, tb, co, w;
-			w = DOM.create('div', {id : 'menu_' + t.id, 'class' : s['class'], 'style' : 'position:absolute;left:0;top:0;z-index:150'});
+			w = DOM.create('div', {id : 'menu_' + t.id, 'class' : s['class'], 'style' : 'position:absolute;left:0;top:0;z-index:200000'});
-			co = DOM.add(w, 'div', {id : 'menu_' + t.id + '_co', 'class' : 'mceMenu' + (s['class'] ? ' ' + s['class'] : '')});
+			co = DOM.add(w, 'div', {id : 'menu_' + t.id + '_co', 'class' : t.classPrefix + (s['class'] ? ' ' + s['class'] : '')});
 			t.element = new Element('menu_' + t.id, {blocker : 1, container : s.container});
 			if (s.menu_line)
-				DOM.add(co, 'span', {'class' : 'mceMenuLine'});
+				DOM.add(co, 'span', {'class' : t.classPrefix + 'Line'});
 //			n = DOM.add(co, 'div', {id : 'menu_' + t.id + '_co', 'class' : 'mceMenuContainer'});
 			n = DOM.add(co, 'table', {id : 'menu_' + t.id + '_tbl', border : 0, cellPadding : 0, cellSpacing : 0});
 			tb = DOM.add(n, 'tbody');
 			return w;
 		},
 		// Internal functions
+		_keyHandler : function(e) {
+			// Accessibility feature
+			if (e.keyCode == 27)
+				this.hideMenu();
+		},
 		_add : function(tb, o) {
-			var n, s = o.settings, a, ro, it;
+			var n, s = o.settings, a, ro, it, cp = this.classPrefix;
 			if (s.separator) {
-				ro = DOM.add(tb, 'tr', {id : o.id, 'class' : 'mceMenuItemSeparator'});
+				ro = DOM.add(tb, 'tr', {id : o.id, 'class' : cp + 'ItemSeparator'});
-				DOM.add(ro, 'td', {'class' : 'mceMenuItemSeparator'});
+				DOM.add(ro, 'td', {'class' : cp + 'ItemSeparator'});
 				if (n = ro.previousSibling)
 					DOM.addClass(n, 'mceLast');
 				return;
 			}
-			n = ro = DOM.add(tb, 'tr', {id : o.id, 'class' : 'mceMenuItem mceMenuItemEnabled'});
+			n = ro = DOM.add(tb, 'tr', {id : o.id, 'class' : cp + 'Item ' + cp + 'ItemEnabled'});
 			n = it = DOM.add(n, 'td');
 			n = a = DOM.add(n, 'a', {href : 'javascript:;', onclick : "return false;", onmousedown : 'return false;'});
 			DOM.addClass(it, s['class']);
 //			n = DOM.add(n, 'span', {'class' : 'item'});
 				DOM.setAttrib(n, 'style', o.settings.style);
 			if (tb.childNodes.length == 1)
 				DOM.addClass(ro, 'mceFirst');
-			if ((n = ro.previousSibling) && DOM.hasClass(n, 'mceMenuItemSeparator'))
+			if ((n = ro.previousSibling) && DOM.hasClass(n, cp + 'ItemSeparator'))
 				DOM.addClass(ro, 'mceFirst');
 			if (o.collapse)
-				DOM.addClass(ro, 'mceMenuItemSub');
+				DOM.addClass(ro, cp + 'ItemSub');
 			if (n = ro.previousSibling)
 				DOM.removeClass(n, 'mceLast');
 			DOM.addClass(ro, 'mceLast');
 			this.parent(id, s);
 			this.classPrefix = 'mceButton';
 		},
 		renderHTML : function() {
-			var s = this.settings, h = '<a id="' + this.id + '" href="javascript:;" class="mceButton mceButtonEnabled ' + s['class'] + '" onmousedown="return false;" onclick="return false;" title="' + DOM.encode(s.title) + '">';
+			var cp = this.classPrefix, s = this.settings, h, l;
+			l = DOM.encode(s.label || '');
+			h = '<a id="' + this.id + '" href="javascript:;" class="' + cp + ' ' + cp + 'Enabled ' + s['class'] + (l ? ' ' + cp + 'Labeled' : '') +'" onmousedown="return false;" onclick="return false;" title="' + DOM.encode(s.title) + '">';
 			if (s.image)
-				h += '<img class="mceIcon" src="' + s.image + '" /></a>';
+				h += '<img class="mceIcon" src="' + s.image + '" />' + l + '</a>';
 			else
-				h += '<span class="mceIcon ' + s['class'] + '"></span></a>';
+				h += '<span class="mceIcon ' + s['class'] + '"></span>' + (l ? '<span class="' + cp + 'Label">' + l + '</span>' : '') + '</a>';
 			return h;
 		},
 		postRender : function() {
 		getLength : function() {
 			return this.items.length;
 		},
 		renderHTML : function() {
-			var h = '', t = this, s = t.settings;
+			var h = '', t = this, s = t.settings, cp = t.classPrefix;
-			h = '<table id="' + t.id + '" cellpadding="0" cellspacing="0" class="mceListBox mceListBoxEnabled' + (s['class'] ? (' ' + s['class']) : '') + '"><tbody><tr>';
+			h = '<table id="' + t.id + '" cellpadding="0" cellspacing="0" class="' + cp + ' ' + cp + 'Enabled' + (s['class'] ? (' ' + s['class']) : '') + '"><tbody><tr>';
 			h += '<td>' + DOM.createHTML('a', {id : t.id + '_text', href : 'javascript:;', 'class' : 'mceText', onclick : "return false;", onmousedown : 'return false;'}, DOM.encode(t.settings.title)) + '</td>';
-			h += '<td>' + DOM.createHTML('a', {id : t.id + '_open', href : 'javascript:;', 'class' : 'mceOpen', onclick : "return false;", onmousedown : 'return false;'}, '<span></span>') + '</td>';
+			h += '<td>' + DOM.createHTML('a', {id : t.id + '_open', tabindex : -1, href : 'javascript:;', 'class' : 'mceOpen', onclick : "return false;", onmousedown : 'return false;'}, '<span></span>') + '</td>';
 			h += '</tr></tbody></table>';
 			return h;
 		},
 		showMenu : function() {
 			var t = this, p1, p2, e = DOM.get(this.id), m;
 			if (t.isDisabled() || t.items.length == 0)
 				return;
+			if (t.menu && t.menu.isMenuVisible)
+				return t.hideMenu();
 			if (!t.isMenuRendered) {
 				t.renderMenu();
 				t.isMenuRendered = true;
 			}
 			p2 = DOM.getPos(e);
 			m = t.menu;
 			m.settings.offset_x = p2.x;
 			m.settings.offset_y = p2.y;
+			m.settings.keyboard_focus = t._focused;
 			// Select in menu
 			if (t.oldID)
 				m.items[t.oldID].setSelected(0);
 				}
 			});
 			m.showMenu(0, e.clientHeight);
-			Event.add(document, 'mousedown', t.hideMenu, t);
+			Event.add(DOM.doc, 'mousedown', t.hideMenu, t);
-			DOM.addClass(t.id, 'mceListBoxSelected');
+			DOM.addClass(t.id, t.classPrefix + 'Selected');
 		},
 		hideMenu : function(e) {
 			var t = this;
+			// Prevent double toogles by canceling the mouse click event to the button
+			if (e && e.type == "mousedown" && (e.target.id == t.id + '_text' || e.target.id == t.id + '_open'))
+				return;
 			if (!e || !DOM.getParent(e.target, function(n) {return DOM.hasClass(n, 'mceMenu');})) {
-				DOM.removeClass(t.id, 'mceListBoxSelected');
+				DOM.removeClass(t.id, t.classPrefix + 'Selected');
-				Event.remove(document, 'mousedown', t.hideMenu, t);
+				Event.remove(DOM.doc, 'mousedown', t.hideMenu, t);
 				if (t.menu)
 					t.menu.hideMenu();
 			}
 		},
 		renderMenu : function() {
 			var t = this, m;
 			m = t.settings.control_manager.createDropMenu(t.id + '_menu', {
 				menu_line : 1,
-				'class' : 'mceListBoxMenu mceNoIcons',
+				'class' : t.classPrefix + 'Menu mceNoIcons',
 				max_width : 150,
 				max_height : 150
 			});
 			m.onHideMenu.add(t.hideMenu, t);
 			t.onRenderMenu.dispatch(t, m);
 			t.menu = m;
 		},
 		postRender : function() {
-			var t = this;
+			var t = this, cp = t.classPrefix;
 			Event.add(t.id, 'click', t.showMenu, t);
+			Event.add(t.id + '_text', 'focus', function() {t._focused = 1;});
+			Event.add(t.id + '_text', 'blur', function() {t._focused = 0;});
 			// Old IE doesn't have hover on all elements
 			if (tinymce.isIE6 || !DOM.boxModel) {
 				Event.add(t.id, 'mouseover', function() {
-					if (!DOM.hasClass(t.id, 'mceListBoxDisabled'))
+					if (!DOM.hasClass(t.id, cp + 'Disabled'))
-						DOM.addClass(t.id, 'mceListBoxHover');
+						DOM.addClass(t.id, cp + 'Hover');
 				});
 				Event.add(t.id, 'mouseout', function() {
-					if (!DOM.hasClass(t.id, 'mceListBoxDisabled'))
+					if (!DOM.hasClass(t.id, cp + 'Disabled'))
-						DOM.removeClass(t.id, 'mceListBoxHover');
+						DOM.removeClass(t.id, cp + 'Hover');
 				});
 			}
 			t.onPostRender.dispatch(t, DOM.get(t.id));
+		},
+		destroy : function() {
+			this.parent();
+			Event.clear(this.id + '_text');
 		}
 		});
 })();
 /* file:jscripts/tiny_mce/classes/ui/NativeListBox.js */
 	tinymce.create('tinymce.ui.MenuButton:tinymce.ui.Button', {
 		MenuButton : function(id, s) {
 			this.parent(id, s);
 			this.onRenderMenu = new tinymce.util.Dispatcher(this);
-			s.menu_container = s.menu_container || document.body;
+			s.menu_container = s.menu_container || DOM.doc.body;
 		},
 		showMenu : function() {
 			var t = this, p1, p2, e = DOM.get(t.id), m;
 			if (!t.isMenuRendered) {
 				t.renderMenu();
 				t.isMenuRendered = true;
 			}
+			if (t.isMenuVisible)
+				return t.hideMenu();
 			p1 = DOM.getPos(t.settings.menu_container);
 			p2 = DOM.getPos(e);
 			m = t.menu;
 			m.settings.offset_x = p2.x;
 			m.settings.offset_y = p2.y;
 			m.settings.vp_offset_x = p2.x;
 			m.settings.vp_offset_y = p2.y;
+			m.settings.keyboard_focus = t._focused;
 			m.showMenu(0, e.clientHeight);
-			Event.add(document, 'mousedown', t.hideMenu, t);
+			Event.add(DOM.doc, 'mousedown', t.hideMenu, t);
 			t.setState('Selected', 1);
+			t.isMenuVisible = 1;
 		},
 		renderMenu : function() {
 			var t = this, m;
 		},
 		hideMenu : function(e) {
 			var t = this;
+			// Prevent double toogles by canceling the mouse click event to the button
+			if (e && e.type == "mousedown" && DOM.getParent(e.target, function(e) {return e.id === t.id || e.id === t.id + '_open';}))
+				return;
 			if (!e || !DOM.getParent(e.target, function(n) {return DOM.hasClass(n, 'mceMenu');})) {
 				t.setState('Selected', 0);
-				Event.remove(document, 'mousedown', t.hideMenu, t);
+				Event.remove(DOM.doc, 'mousedown', t.hideMenu, t);
 				if (t.menu)
 					t.menu.hideMenu();
 			}
+			t.isMenuVisible = 0;
 		},
 		postRender : function() {
 			var t = this, s = t.settings;
 			h = '<tbody><tr>';
 			if (s.image)
 				h1 = DOM.createHTML('img ', {src : s.image, 'class' : 'mceAction ' + s['class']});
 			else
-				h1 = DOM.createHTML('span', {'class' : 'mceAction ' + s['class']});
+				h1 = DOM.createHTML('span', {'class' : 'mceAction ' + s['class']}, '');
 			h += '<td>' + DOM.createHTML('a', {id : t.id + '_action', href : 'javascript:;', 'class' : 'mceAction ' + s['class'], onclick : "return false;", onmousedown : 'return false;', title : s.title}, h1) + '</td>';
 			h1 = DOM.createHTML('span', {'class' : 'mceOpen ' + s['class']});
 			h += '<td>' + DOM.createHTML('a', {id : t.id + '_open', href : 'javascript:;', 'class' : 'mceOpen ' + s['class'], onclick : "return false;", onmousedown : 'return false;', title : s.title}, h1) + '</td>';
 						s.onclick(t.value);
 				});
 			}
 			Event.add(t.id + '_open', 'click', t.showMenu, t);
+			Event.add(t.id + '_open', 'focus', function() {t._focused = 1;});
+			Event.add(t.id + '_open', 'blur', function() {t._focused = 0;});
 			// Old IE doesn't have hover on all elements
 			if (tinymce.isIE6 || !DOM.boxModel) {
 				Event.add(t.id, 'mouseover', function() {
 					if (!DOM.hasClass(t.id, 'mceSplitButtonDisabled'))
 				Event.add(t.id, 'mouseout', function() {
 					if (!DOM.hasClass(t.id, 'mceSplitButtonDisabled'))
 						DOM.removeClass(t.id, 'mceSplitButtonHover');
 				});
 			}
+		},
+		destroy : function() {
+			this.parent();
+			Event.clear(this.id + '_action');
+			Event.clear(this.id + '_open');
 		}
 		});
 })();
 			t.value = s.default_color;
 		},
 		showMenu : function() {
-			var t = this, r, p, e;
+			var t = this, r, p, e, p2;
 			if (t.isDisabled())
 				return;
 			if (!t.isMenuRendered) {
 				t.renderMenu();
 				t.isMenuRendered = true;
 			}
+			if (t.isMenuVisible)
+				return t.hideMenu();
 			e = DOM.get(t.id);
 			DOM.show(t.id + '_menu');
 			DOM.addClass(e, 'mceSplitButtonSelected');
 			p2 = DOM.getPos(e);
 			DOM.setStyles(t.id + '_menu', {
 				left : p2.x,
 				top : p2.y + e.clientHeight,
-				zIndex : 150
+				zIndex : 200000
 			});
 			e = 0;
-			Event.add(document, 'mousedown', t.hideMenu, t);
+			Event.add(DOM.doc, 'mousedown', t.hideMenu, t);
+			if (t._focused) {
+				t._keyHandler = Event.add(t.id + '_menu', 'keydown', function(e) {
+					if (e.keyCode == 27)
+						t.hideMenu();
+				});
+				DOM.select('a', t.id + '_menu')[0].focus(); // Select first link
+			}
+			t.isMenuVisible = 1;
 		},
 		hideMenu : function(e) {
 			var t = this;
+			// Prevent double toogles by canceling the mouse click event to the button
+			if (e && e.type == "mousedown" && DOM.getParent(e.target, function(e) {return e.id === t.id + '_open';}))
+				return;
 			if (!e || !DOM.getParent(e.target, function(n) {return DOM.hasClass(n, 'mceSplitButtonMenu');})) {
 				DOM.removeClass(t.id, 'mceSplitButtonSelected');
-				Event.remove(document, 'mousedown', t.hideMenu, t);
+				Event.remove(DOM.doc, 'mousedown', t.hideMenu, t);
+				Event.remove(t.id + '_menu', 'keydown', t._keyHandler);
 				DOM.hide(t.id + '_menu');
 			}
+			t.isMenuVisible = 0;
 		},
 		renderMenu : function() {
 			var t = this, m, i = 0, s = t.settings, n, tb, tr, w;
 				n = DOM.add(n, 'a', {
 					href : 'javascript:;',
 					style : {
 						backgroundColor : '#' + c
-					}
+					},
-				});
+					mce_color : '#' + c
-				Event.add(n, 'mousedown', function() {
-					t.setColor('#' + c);
 				});
 			});
 			if (s.more_colors_func) {
 				n = DOM.add(tb, 'tr');
 				n = DOM.add(n, 'td', {colspan : s.grid_width, 'class' : 'mceMoreColors'});
-				n = DOM.add(n, 'a', {href : 'javascript:;', onclick : 'return false;', 'class' : 'mceMoreColors'}, s.more_colors_title);
+				n = DOM.add(n, 'a', {id : t.id + '_more', href : 'javascript:;', onclick : 'return false;', 'class' : 'mceMoreColors'}, s.more_colors_title);
 				Event.add(n, 'click', function(e) {
 					s.more_colors_func.call(s.more_colors_scope || this);
 					return Event.cancel(e); // Cancel to fix onbeforeunload problem
 				});
 			}
 			DOM.addClass(m, 'mceColorSplitMenu');
+			Event.add(t.id + '_menu', 'click', function(e) {
+				var c;
+				e = e.target;
+				if (e.nodeName == 'A' && (c = e.getAttribute('mce_color')))
+					t.setColor(c);
+				return Event.cancel(e); // Prevent IE auto save warning
+			});
 			return w;
 		},
 		setColor : function(c) {
-			var t = this, p, s = this.settings, co = s.menu_container, po, cp, id = t.id + '_preview';
+			var t = this;
-			if (!(p = DOM.get(id))) {
+			DOM.setStyle(t.id + '_preview', 'backgroundColor', c);
-				DOM.setStyle(t.id + '_action', 'position', 'relative');
-				p = DOM.add(t.id + '_action', 'div', {id : id, 'class' : 'mceColorPreview'});
-			}
-			p.style.backgroundColor = c;
 			t.value = c;
 			t.hideMenu();
-			s.onselect(c);
+			t.settings.onselect(c);
+		},
+		postRender : function() {
+			var t = this, id = t.id;
+			t.parent();
+			DOM.add(id + '_action', 'div', {id : id + '_preview', 'class' : 'mceColorPreview'});
+		},
+		destroy : function() {
+			this.parent();
+			Event.clear(this.id + '_menu');
+			Event.clear(this.id + '_more');
+			DOM.remove(this.id + '_menu');
 		}
 		});
 })();
 /* file:jscripts/tiny_mce/classes/ui/Toolbar.js */
 tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 	renderHTML : function() {
-		var t = this, h = '', c = 'mceToolbarEnd', co, dom = tinymce.DOM, s = t.settings;
+		var t = this, h = '', c, co, dom = tinymce.DOM, s = t.settings, i, pr, nx, cl;
-		h += dom.createHTML('td', {'class' : 'mceToolbarStart'}, dom.createHTML('span', null, '<!-- IE -->'));
+		cl = t.controls;
+		for (i=0; i<cl.length; i++) {
-		tinymce.each(t.controls, function(c) {
+			// Get current control, prev control, next control and if the control is a list box or not
-			h += '<td>' + c.renderHTML() + '</td>';
+			co = cl[i];
-		});
+			pr = cl[i - 1];
+			nx = cl[i + 1];
-		co = t.controls[t.controls.length - 1].constructor;
+			// Add toolbar start
-		if (co === tinymce.ui.Button)
+			if (i === 0) {
+				c = 'mceToolbarStart';
+				if (co.Button)
+					c += ' mceToolbarStartButton';
+				else if (co.SplitButton)
+					c += ' mceToolbarStartSplitButton';
+				else if (co.ListBox)
+					c += ' mceToolbarStartListBox';
+				h += dom.createHTML('td', {'class' : c}, dom.createHTML('span', null, '<!-- IE -->'));
+			}
+			// Add toolbar end before list box and after the previous button
+			// This is to fix the o2k7 editor skins
+			if (pr && co.ListBox) {
+				if (pr.Button || pr.SplitButton)
+					h += dom.createHTML('td', {'class' : 'mceToolbarEnd'}, dom.createHTML('span', null, '<!-- IE -->'));
+			}
+			// Render control HTML
+			// IE 8 quick fix, needed to propertly generate a hit area for anchors
+			if (dom.stdMode)
+				h += '<td style="position: relative">' + co.renderHTML() + '</td>';
+			else
+				h += '<td>' + co.renderHTML() + '</td>';
+			// Add toolbar start after list box and before the next button
+			// This is to fix the o2k7 editor skins
+			if (nx && co.ListBox) {
+				if (nx.Button || nx.SplitButton)
+					h += dom.createHTML('td', {'class' : 'mceToolbarStart'}, dom.createHTML('span', null, '<!-- IE -->'));
+			}
+		}
+		c = 'mceToolbarEnd';
+		if (co.Button)
 			c += ' mceToolbarEndButton';
-		else if (co === tinymce.ui.SplitButton)
+		else if (co.SplitButton)
 			c += ' mceToolbarEndSplitButton';
-		else if (co === tinymce.ui.ListBox)
+		else if (co.ListBox)
 			c += ' mceToolbarEndListBox';
 		h += dom.createHTML('td', {'class' : c}, dom.createHTML('span', null, '<!-- IE -->'));
 		return dom.createHTML('table', {id : t.id, 'class' : 'mceToolbar' + (s['class'] ? ' ' + s['class'] : ''), cellpadding : '0', cellspacing : '0', align : t.settings.align || ''}, '<tbody><tr>' + h + '</tr></tbody>');
 			return o;
 		},
 		load : function(n, u, cb, s) {
+			var t = this;
+			if (t.urls[n])
+				return;
 			if (u.indexOf('/') != 0 && u.indexOf('://') == -1)
 				u = tinymce.baseURL + '/' +  u;
-			this.urls[n] = u.substring(0, u.lastIndexOf('/'));
+			t.urls[n] = u.substring(0, u.lastIndexOf('/'));
 			tinymce.ScriptLoader.add(u, cb, s);
 		}
 		});
 }());
 /* file:jscripts/tiny_mce/classes/EditorManager.js */
 (function() {
 	// Shorten names
-	var each = tinymce.each, extend = tinymce.extend, DOM = tinymce.DOM, Event = tinymce.dom.Event, ThemeManager = tinymce.ThemeManager, PluginManager = tinymce.PluginManager;
+	var each = tinymce.each, extend = tinymce.extend, DOM = tinymce.DOM, Event = tinymce.dom.Event, ThemeManager = tinymce.ThemeManager, PluginManager = tinymce.PluginManager, explode = tinymce.explode;
 	tinymce.create('static tinymce.EditorManager', {
 		editors : {},
 		i18n : {},
 		activeEditor : null,
+		preInit : function() {
+			var t = this, lo = window.location;
+			// Setup some URLs where the editor API is located and where the document is
+			tinymce.documentBaseURL = lo.href.replace(/[\?#].*$/, '').replace(/[\/\\][^\/]+$/, '');
+			if (!/[\/\\]$/.test(tinymce.documentBaseURL))
+				tinymce.documentBaseURL += '/';
+			tinymce.baseURL = new tinymce.util.URI(tinymce.documentBaseURL).toAbsolute(tinymce.baseURL);
+			tinymce.EditorManager.baseURI = new tinymce.util.URI(tinymce.baseURL);
+			// Setup document domain
+			if (tinymce.EditorManager.baseURI.host != lo.hostname && lo.hostname)
+				document.domain = tinymce.relaxedDomain = lo.hostname.replace(/.*\.(.+\..+)$/, '$1');
+			// Add before unload listener
+			// This was required since IE was leaking memory if you added and removed beforeunload listeners
+			// with attachEvent/detatchEvent so this only adds one listener and instances can the attach to the onBeforeUnload event
+			t.onBeforeUnload = new tinymce.util.Dispatcher(t);
+			// Must be on window or IE will leak if the editor is placed in frame or iframe
+			Event.add(window, 'beforeunload', function(e) {
+				t.onBeforeUnload.dispatch(t, e);
+			});
+		},
 		init : function(s) {
-			var t = this, pl, sl = tinymce.ScriptLoader, c;
+			var t = this, pl, sl = tinymce.ScriptLoader, c, e;
 			function execCallback(se, n, s) {
 				var f = se[n];
 				if (!f)
 				if (s.theme && s.theme.charAt(0) != '-' && !ThemeManager.urls[s.theme])
 					ThemeManager.load(s.theme, 'themes/' + s.theme + '/editor_template' + tinymce.suffix + '.js');
 				// Load plugins
 				if (s.plugins) {
-					pl = s.plugins.split(',');
+					pl = explode(s.plugins);
 					// Load compat2x first
 					if (tinymce.inArray(pl, 'compat2x') != -1)
 						PluginManager.load('compat2x', 'plugins/compat2x/editor_plugin' + tinymce.suffix + '.js');
 				// Verify that it's a valid browser
 				if (s.browsers) {
 					l = false;
-					each(s.browsers.split(','), function(v) {
+					each(explode(s.browsers), function(v) {
 						switch (v) {
 							case 'ie':
 							case 'msie':
 								if (tinymce.isIE)
 									l = true;
 				switch (s.mode) {
 					case "exact":
 						l = s.elements || '';
 						if(l.length > 0) {
-							each(l.split(','), function(v) {
+							each(explode(l), function(v) {
 								if (DOM.get(v))
 									new tinymce.Editor(v, s).render(1);
 								else {
 									c = 0;
 						break;
 					case "textareas":
 					case "specific_textareas":
 						function hasClass(n, c) {
-							return new RegExp('\\b' + c + '\\b', 'g').test(n.className);
+							return c.constructor === RegExp ? c.test(n.className) : DOM.hasClass(n, c);
 						};
 						each(DOM.select('textarea'), function(v) {
 							if (s.editor_deselector && hasClass(v, s.editor_deselector))
 								return;
-							if (!s.editor_selector || hasClass(v, s.editor_selector))
+							if (!s.editor_selector || hasClass(v, s.editor_selector)) {
-								new tinymce.Editor(v.id = (v.id || v.name || (v.id = DOM.uniqueId())), s).render(1);
+								// Can we use the name
+								e = DOM.get(v.name);
+								if (!v.id && !e)
+									v.id = v.name;
+								// Generate unique name if missing or already exists
+								if (!v.id || t.get(v.id))
+									v.id = DOM.uniqueId();
+								new tinymce.Editor(v.id, s).render(1);
+							}
 						});
 						break;
 				}
 				// Call onInit when all editors are initialized
 					t._setActive(e);
 					return false; // Break
 				});
 			}
-			e._destroy();
+			e.destroy();
 			return e;
 		},
 		execCommand : function(c, u, v) {
-			var t = this, ed = t.get(v);
+			var t = this, ed = t.get(v), w;
 			// Manager commands
 			switch (c) {
 				case "mceFocus":
 					ed.focus();
 					return true;
 				case "mceAddEditor":
 				case "mceAddControl":
-					new tinymce.Editor(v, t.settings).render();
+					if (!t.get(v))
+						new tinymce.Editor(v, t.settings).render();
 					return true;
 				case "mceAddFrameControl":
-					// TODO: Implement this
+					w = v.window;
+					// Add tinyMCE global instance and tinymce namespace to specified window
+					w.tinyMCE = tinyMCE;
+					w.tinymce = tinymce;
+					tinymce.DOM.doc = w.document;
+					tinymce.DOM.win = w;
+					ed = new tinymce.Editor(v.element_id, v);
+					ed.render();
+					// Fix IE memory leaks
+					if (tinymce.isIE) {
+						function clr() {
+							ed.destroy();
+							w.detachEvent('onunload', clr);
+							w = w.tinyMCE = w.tinymce = null; // IE leak
+						};
+						w.attachEvent('onunload', clr);
+					}
+					v.page_window = null;
 					return true;
 				case "mceRemoveEditor":
 				case "mceRemoveControl":
 					ed.remove();
 			this.selectedInstance = this.activeEditor = e;
 		}
 		});
-	// Setup some URLs where the editor API is located and where the document is
+	tinymce.EditorManager.preInit();
-	tinymce.documentBaseURL = window.location.href.replace(/[\?#].*$/, '').replace(/[\/\\][^\/]+$/, '');
-	if (!/[\/\\]$/.test(tinymce.documentBaseURL))
-		tinymce.documentBaseURL += '/';
-	tinymce.baseURL = new tinymce.util.URI(tinymce.documentBaseURL).toAbsolute(tinymce.baseURL);
-	tinymce.EditorManager.baseURI = new tinymce.util.URI(tinymce.baseURL);
-	if (tinymce.EditorManager.baseURI.host != window.location.hostname)
-		document.domain = tinymce.relaxedDomain = window.location.hostname.replace(/.*\.(.+\..+)$/, '$1');
 })();
 // Short for editor manager window.tinyMCE is needed when TinyMCE gets loaded though a XHR call
 var tinyMCE = window.tinyMCE = tinymce.EditorManager;
 (function() {
 	var DOM = tinymce.DOM, Event = tinymce.dom.Event, extend = tinymce.extend, Dispatcher = tinymce.util.Dispatcher;
 	var each = tinymce.each, isGecko = tinymce.isGecko, isIE = tinymce.isIE, isWebKit = tinymce.isWebKit;
 	var is = tinymce.is, ThemeManager = tinymce.ThemeManager, PluginManager = tinymce.PluginManager, EditorManager = tinymce.EditorManager;
-	var inArray = tinymce.inArray, grep = tinymce.grep;
+	var inArray = tinymce.inArray, grep = tinymce.grep, explode = tinymce.explode;
 	tinymce.create('tinymce.Editor', {
 		Editor : function(id, s) {
 			var t = this;
 				convert_fonts_to_spans : true,
 				font_size_style_values : 'xx-small,x-small,small,medium,large,x-large,xx-large',
 				apply_source_formatting : 1,
 				directionality : 'ltr',
 				forced_root_block : 'p',
-				valid_elements : '@[id|class|style|title|dir<ltr?rtl|lang|xml::lang|onclick|ondblclick|onmousedown|onmouseup|onmouseover|onmousemove|onmouseout|onkeypress|onkeydown|onkeyup],a[rel|rev|charset|hreflang|tabindex|accesskey|type|name|href|target|title|class|onfocus|onblur],strong/b,em/i,strike,u,#p[align],-ol[type|compact],-ul[type|compact],-li,br,img[longdesc|usemap|src|border|alt=|title|hspace|vspace|width|height|align],-sub,-sup,-blockquote,-table[border=0|cellspacing|cellpadding|width|frame|rules|height|align|summary|bgcolor|background|bordercolor],-tr[rowspan|width|height|align|valign|bgcolor|background|bordercolor],tbody,thead,tfoot,#td[colspan|rowspan|width|height|align|valign|bgcolor|background|bordercolor|scope],#th[colspan|rowspan|width|height|align|valign|scope],caption,-div,-span,-pre,address,-h1,-h2,-h3,-h4,-h5,-h6,hr[size|noshade],-font[face|size|color],dd,dl,dt,cite,abbr,acronym,del[datetime|cite],ins[datetime|cite],object[classid|width|height|codebase|*],param[name|value|_value],embed[type|width|height|src|*],script[src|type],map[name],area[shape|coords|href|alt|target]',
+				valid_elements : '@[id|class|style|title|dir<ltr?rtl|lang|xml::lang|onclick|ondblclick|onmousedown|onmouseup|onmouseover|onmousemove|onmouseout|onkeypress|onkeydown|onkeyup],a[rel|rev|charset|hreflang|tabindex|accesskey|type|name|href|target|title|class|onfocus|onblur],strong/b,em/i,strike,u,#p[align],-ol[type|compact],-ul[type|compact],-li,br,img[longdesc|usemap|src|border|alt=|title|hspace|vspace|width|height|align],-sub,-sup,-blockquote,-table[border=0|cellspacing|cellpadding|width|frame|rules|height|align|summary|bgcolor|background|bordercolor],-tr[rowspan|width|height|align|valign|bgcolor|background|bordercolor],tbody,thead,tfoot,#td[colspan|rowspan|width|height|align|valign|bgcolor|background|bordercolor|scope],#th[colspan|rowspan|width|height|align|valign|scope],caption,-div,-span,-code,-pre,address,-h1,-h2,-h3,-h4,-h5,-h6,hr[size|noshade],-font[face|size|color],dd,dl,dt,cite,abbr,acronym,del[datetime|cite],ins[datetime|cite],object[classid|width|height|codebase|*],param[name|value|_value],embed[type|width|height|src|*],script[src|type],map[name],area[shape|coords|href|alt|target],bdo,button,col[align|char|charoff|span|valign|width],colgroup[align|char|charoff|span|valign|width],dfn,fieldset,form[action|accept|accept-charset|enctype|method],input[accept|alt|checked|disabled|maxlength|name|readonly|size|src|type|value],kbd,label[for],legend,noscript,optgroup[label|disabled],option[disabled|label|selected|value],q[cite],samp,select[disabled|multiple|name|size],small,textarea[cols|rows|disabled|name|readonly],tt,var,big',
 				hidden_input : 1,
 				padd_empty_editor : 1,
 				render_ui : 1,
 				init_theme : 1,
 				force_p_newlines : 1,
 					}
 				});
 			}
 			if (s.add_unload_trigger) {
-				Event.add(document, 'beforeunload', function() {
+				t._beforeUnload = tinyMCE.onBeforeUnload.add(function() {
-					if (t.initialized && !t.destroyed)
+					if (t.initialized && !t.destroyed && !t.isHidden())
 						t.save({format : 'raw', no_events : true});
 				});
 			}
-			tinymce.addUnload(t._destroy, t);
+			tinymce.addUnload(t.destroy, t);
 			if (s.submit_patch) {
 				t.onBeforeRenderUI.add(function() {
 					var n = t.getElement().form;
 					sl.add(tinymce.baseURL + '/langs/' + s.language + '.js');
 				if (s.theme.charAt(0) != '-' && !ThemeManager.urls[s.theme])
 					ThemeManager.load(s.theme, 'themes/' + s.theme + '/editor_template' + tinymce.suffix + '.js');
-				each(s.plugins.split(','), function(p) {
+				each(explode(s.plugins), function(p) {
 					if (p && p.charAt(0) != '-' && !PluginManager.urls[p]) {
 						// Skip safari plugin for other browsers
 						if (!isWebKit && p == 'safari')
 							return;
 			if (t.theme.init && s.init_theme)
 				t.theme.init(t, ThemeManager.urls[s.theme] || tinymce.documentBaseURL.replace(/\/$/, ''));
 			// Create all plugins
-			each(s.plugins.replace(/\-/g, '').split(','), function(p) {
+			each(explode(s.plugins.replace(/\-/g, '')), function(p) {
 				var c = PluginManager.get(p), u = PluginManager.urls[p] || tinymce.documentBaseURL.replace(/\/$/, ''), po;
 				if (c) {
 					po = new c(t, u);
 						po.init(t, u);
 				}
 			});
 			// Setup popup CSS path(s)
-			s.popup_css = t.baseURI.toAbsolute(s.popup_css || "themes/" + s.theme + "/skins/" + s.skin + "/dialog.css");
+			if (s.popup_css)
+				s.popup_css = t.documentBaseURI.toAbsolute(s.popup_css);
+			else
+				s.popup_css = t.baseURI.toAbsolute("themes/" + s.theme + "/skins/" + s.skin + "/dialog.css");
 			if (s.popup_css_add)
-				s.popup_css += ',' + s.popup_css_add;
+				s.popup_css += ',' + t.documentBaseURI.toAbsolute(s.popup_css_add);
 			// Setup control factory
 			t.controlManager = new tinymce.ControlManager(t);
 			t.undoManager = new tinymce.UndoManager(t);
 			// Pass through
 			t.undoManager.onAdd.add(function(um, l) {
-				return t.onChange.dispatch(t, l, um);
+				if (!l.initial)
+					return t.onChange.dispatch(t, l, um);
 			});
 			t.undoManager.onUndo.add(function(um, l) {
 				return t.onUndo.dispatch(t, l, um);
 			});
 			// Enables users to override the control factory
 			t.onBeforeRenderUI.dispatch(t, t.controlManager);
 			// Measure box
 			if (s.render_ui) {
-				w = s.width || e.style.width || e.clientWidth;
+				w = s.width || e.style.width || e.offsetWidth;
-				h = s.height || e.style.height || e.clientHeight;
+				h = s.height || e.style.height || e.offsetHeight;
 				t.orgDisplay = e.style.display;
-				re = new RegExp('%|px|auto', 'gi');
+				re = /^[0-9\.]+(|px)$/i;
-				if (!re.test('' + w))
+				if (re.test('' + w))
 					w = Math.max(parseInt(w) + (o.deltaWidth || 0), 100);
-				if (!re.test('' + h))
+				if (re.test('' + h))
 					h = Math.max(parseInt(h) + (o.deltaHeight || 0), 100);
 				// Render UI
 				o = t.theme.renderUI({
 					targetNode : e,
 			h = (o.iframeHeight || h) + ((h + '').indexOf('%') == -1 ? (o.deltaHeight || 0) : '');
 			if (h < 100)
 				h = 100;
-			t.iframeHTML = s.doctype + '<html><head xmlns="http://www.w3.org/1999/xhtml"><base href="' + t.documentBaseURI.getURI() + '" />';
+			t.iframeHTML = s.doctype + '<html><head xmlns="http://www.w3.org/1999/xhtml"><base href="' + t.documentBaseURI.getURI() + '"></base>';
 			t.iframeHTML += '<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />';
 			if (tinymce.relaxedDomain)
 				t.iframeHTML += '<script type="text/javascript">document.domain = "' + tinymce.relaxedDomain + '";</script>';
 				e = n = o = null; // Cleanup
 			}
 		},
 		setupIframe : function() {
-			var t = this, s = t.settings, e = DOM.get(t.id), d = t.getDoc(), h;
+			var t = this, s = t.settings, e = DOM.get(t.id), d = t.getDoc(), h, b;
 			// Setup iframe body
 			if (!isIE || !tinymce.relaxedDomain) {
 				d.open();
 				d.write(t.iframeHTML);
 					// The design mode will be set ones the editor is focused
 				}
 			}
 			// IE needs to use contentEditable or it will display non secure items for HTTPS
-			if (isIE)
+			if (isIE) {
-				t.getBody().contentEditable = true;
+				// It will not steal focus if we hide it while setting contentEditable
+				b = t.getBody();
+				DOM.hide(b);
+				b.contentEditable = true;
+				DOM.show(b);
+			}
 			// Setup objects
 			t.dom = new tinymce.DOM.DOMUtils(t.getDoc(), {
 				keep_values : true,
 				url_converter : t.convertURL,
 			if (s.auto_resize)
 				t.onNodeChange.add(t.resizeToContent, t);
 			if (s.custom_elements) {
 				function handleCustom(ed, o) {
-					each(s.custom_elements.split(','), function(v) {
+					each(explode(s.custom_elements), function(v) {
 						var n;
 						if (v.indexOf('~') === 0) {
 							v = v.substring(1);
 							n = 'span';
 			});
 			// Remove empty contents
 			if (s.padd_empty_editor) {
 				t.onPostProcess.add(function(ed, o) {
-					o.content = o.content.replace(/^<p>(&nbsp;|#160;|\s)<\/p>$/, '');
+					o.content = o.content.replace(/^(<p>(&nbsp;|&#160;|\s|\u00a0|)<\/p>[\r\n]*|<br \/>[\r\n]*)$/, '');
 				});
 			}
 			if (isGecko) {
 				try {
 				t.focus(true);
 				t.nodeChanged({initial : 1});
 				// Load specified content CSS last
 				if (s.content_css) {
-					tinymce.each(s.content_css.split(','), function(u) {
+					tinymce.each(explode(s.content_css), function(u) {
 						t.dom.loadCSS(t.documentBaseURI.toAbsolute(u));
 					});
 				}
 				// Handle auto focus
 			if (ty === 'hash') {
 				o = {};
 				if (is(v, 'string')) {
-					each(v.split(/[;,]/), function(v) {
+					each(v.indexOf('=') > 0 ? v.split(/[;,](?![^=;,]*(?:[;,]|$))/) : v.split(','), function(v) {
 						v = v.split('=');
 						if (v.length > 1)
 							o[tr(v[0])] = tr(v[1]);
 						else
 				cmd_func = function() {
 					t.execCommand(c[0], c[1], c[2]);
 				};
 			}
-			each(pa.split(','), function(pa) {
+			each(explode(pa), function(pa) {
 				var o = {
 					func : cmd_func,
 					scope : sc || this,
 					desc : desc,
 					alt : false,
 					ctrl : false,
 					shift : false
 				};
-				each(pa.split('+'), function(v) {
+				each(explode(pa, '+'), function(v) {
 					switch (v) {
 						case 'alt':
 						case 'ctrl':
 						case 'shift':
 							o[v] = true;
 			return true;
 		},
 		execCommand : function(cmd, ui, val, a) {
-			var t = this, s = 0, o;
+			var t = this, s = 0, o, st;
 			if (!/^(mceAddUndoLevel|mceEndUndoLevel|mceBeginUndoLevel|mceRepaint|SelectAll)$/.test(cmd) && (!a || !a.skip_focus))
 				t.focus();
 			o = {};
 				return true;
 			}
 			// Registred commands
 			if (o = t.execCommands[cmd]) {
-				s = o.func.call(o.scope, ui, val);
+				st = o.func.call(o.scope, ui, val);
-				t.onExecCommand.dispatch(t, cmd, ui, val, a);
-				return s;
+				// Fall through on true
+				if (st !== true) {
+					t.onExecCommand.dispatch(t, cmd, ui, val, a);
+					return st;
+				}
 			}
 			// Plugin commands
 			each(t.plugins, function(p) {
 				if (p.execCommand && p.execCommand(cmd, ui, val)) {
 			t.getDoc().execCommand(cmd, ui, val);
 			t.onExecCommand.dispatch(t, cmd, ui, val, a);
 		},
 		queryCommandState : function(c) {
-			var t = this, o;
+			var t = this, o, s;
 			// Is hidden then return undefined
 			if (t._isHidden())
 				return;
 			// Registred commands
-			if (o = t.queryStateCommands[c])
+			if (o = t.queryStateCommands[c]) {
-				return o.func.call(o.scope);
+				s = o.func.call(o.scope);
+				// Fall though on true
+				if (s !== true)
+					return s;
+			}
 			// Registred commands
 			o = t.editorCommands.queryCommandState(c);
 			if (o !== -1)
 				return o;
 				// Fails sometimes see bug: 1896577
 			}
 		},
 		queryCommandValue : function(c) {
-			var t = this, o;
+			var t = this, o, s;
 			// Is hidden then return undefined
 			if (t._isHidden())
 				return;
 			// Registred commands
-			if (o = t.queryValueCommands[c])
+			if (o = t.queryValueCommands[c]) {
-				return o.func.call(o.scope);
+				s = o.func.call(o.scope);
+				// Fall though on true
+				if (s !== true)
+					return s;
+			}
 			// Registred commands
 			o = t.editorCommands.queryCommandValue(c);
 			if (is(o))
 				return o;
 		setProgressState : function(b, ti, o) {
 			this.onSetProgressState.dispatch(this, b, ti, o);
 			return b;
-		},
-		remove : function() {
-			var t = this;
-			t.removed = 1; // Cancels post remove event execution
-			t.hide();
-			DOM.remove(t.getContainer());
-			t.execCallback('remove_instance_callback', t);
-			t.onRemove.dispatch(t);
-			// Clear all execCommand listeners this is required to avoid errors if the editor was removed inside another command
-			t.onExecCommand.listeners = [];
-			EditorManager.remove(t);
 		},
 		resizeToContent : function() {
 			var t = this;
 						return;
 				}
 			});
 			t.onVisualAid.dispatch(t, e, t.hasVisual);
+		},
+		remove : function() {
+			var t = this, e = t.getContainer();
+			t.removed = 1; // Cancels post remove event execution
+			t.hide();
+			t.execCallback('remove_instance_callback', t);
+			t.onRemove.dispatch(t);
+			// Clear all execCommand listeners this is required to avoid errors if the editor was removed inside another command
+			t.onExecCommand.listeners = [];
+			EditorManager.remove(t);
+			DOM.remove(e);
+		},
+		destroy : function(s) {
+			var t = this;
+			// One time is enough
+			if (t.destroyed)
+				return;
+			if (!s) {
+				tinymce.removeUnload(t.destroy);
+				tinyMCE.onBeforeUnload.remove(t._beforeUnload);
+				// Manual destroy
+				if (t.theme.destroy)
+					t.theme.destroy();
+				// Destroy controls, selection and dom
+				t.controlManager.destroy();
+				t.selection.destroy();
+				t.dom.destroy();
+				// Remove all events
+				// Don't clear the window or document if content editable
+				// is enabled since other instances might still be present
+				if (!t.settings.content_editable) {
+					Event.clear(t.getWin());
+					Event.clear(t.getDoc());
+				}
+				Event.clear(t.getBody());
+				Event.clear(t.formElement);
+			}
+			if (t.formElement) {
+				t.formElement.submit = t.formElement._mceOldSubmit;
+				t.formElement._mceOldSubmit = null;
+			}
+			t.contentAreaContainer = t.formElement = t.container = t.settings.content_element = t.bodyElement = t.contentDocument = t.contentWindow = null;
+			if (t.selection)
+				t.selection = t.selection.win = t.selection.dom = t.selection.dom.doc = null;
+			t.destroyed = 1;
 		},
 		// Internal functions
 		_addEvents : function() {
 							else if (tinymce.isIE)
 								tx = t.getWin().clipboardData.getData('Text');
 							// Get HTML data
 							/*if (tinymce.isIE) {
-								el = DOM.add(document.body, 'div', {style : 'visibility:hidden;overflow:hidden;position:absolute;width:1px;height:1px'});
+								el = DOM.add(DOM.doc.body, 'div', {style : 'visibility:hidden;overflow:hidden;position:absolute;width:1px;height:1px'});
-								r = document.body.createTextRange();
+								r = DOM.doc.body.createTextRange();
 								r.moveToElementText(el);
 								r.execCommand('Paste');
 								h = el.innerHTML;
 								DOM.remove(el);
 							}*/
 			Event.add(s.content_editable ? t.getBody() : (isGecko ? t.getDoc() : t.getWin()), 'focus', function(e) {
 				t.focus(true);
 			});
 			// Fixes bug where a specified document_base_uri could result in broken images
 			// This will also fix drag drop of images in Gecko
 			if (tinymce.isGecko) {
 				// Convert all images to absolute URLs
 /*				t.onSetContent.add(function(ed, o) {
 					var t = this, d = t.getDoc(), s = t.settings;
 					if (isGecko) {
 						if (t._isHidden()) {
 							try {
-								d.designMode = 'On';
+								if (!s.content_editable)
+									d.designMode = 'On';
 							} catch (ex) {
 								// Fails if it's hidden
 							}
 						}
 						return null;
 					};
 					if (e.keyCode === 9) {
-						v = ed.getParam('tab_focus').split(',');
+						v = explode(ed.getParam('tab_focus'));
 						if (v.length == 1) {
 							v[1] = v[0];
 							v[0] = ':prev';
 						}
 				Event.add(t.getDoc(), 'controlselect', function(e) {
 					var re = t.resizeInfo, cb;
 					e = e.target;
+					// Don't do this action for non image elements
+					if (e.nodeName !== 'IMG')
+						return;
 					if (re)
 						Event.remove(re.node, re.ev, re.cb);
 					if (!t.dom.hasClass(e, 'mceItemNoResize')) {
 						ev = 'resizeend';
 					}
 				});
 			}
 		},
-		_destroy : function() {
-			var t = this;
-			if (t.formElement) {
-				t.formElement.submit = t.formElement._mceOldSubmit;
-				t.formElement._mceOldSubmit = null;
-			}
-			t.contentAreaContainer = t.formElement = t.container = t.contentDocument = t.contentWindow = null;
-			if (t.selection)
-				t.selection = t.selection.win = t.selection.dom = t.selection.dom.doc = null;
-			t.destroyed = 1;
-		},
 		_convertInlineElements : function() {
 			var t = this, s = t.settings, dom = t.dom, v, e, na, st, sp;
 			function convert(ed, o) {
 				if (!s.inline_styles)
 								}
 								break;
 							case 'U':
 							case 'STRIKE':
-								sp = dom.create('span', {style : dom.getAttrib(n, 'style')});
+								//sp = dom.create('span', {style : dom.getAttrib(n, 'style')});
-								sp.style.textDecoration = n.nodeName == 'U' ? 'underline' : 'line-through';
+								n.style.textDecoration = n.nodeName == 'U' ? 'underline' : 'line-through';
-								dom.setAttrib(sp, 'mce_style', '');
+								dom.setAttrib(n, 'mce_style', '');
-								dom.replace(sp, n, 1);
+								dom.setAttrib(n, 'mce_name', 'span');
 								break;
 						}
 					});
 				} else if (o.set) {
-					each(t.dom.select('table,span', o.node), function(n) {
+					each(t.dom.select('table,span', o.node).reverse(), function(n) {
 						if (n.nodeName == 'TABLE') {
 							if (v = dom.getStyle(n, 'height'))
 								dom.setAttrib(n, 'height', v.replace(/[^0-9%]+/g, ''));
 						} else {
 							// Convert spans to elements
 			};
 			t.onPreProcess.add(convert);
 			if (!s.cleanup_on_startup) {
-				t.onInit.add(function() {
+				t.onSetContent.add(function(ed, o) {
-					convert(t, {node : t.getBody(), set : 1});
+					if (o.initial)
+						convert(t, {node : t.getBody(), set : 1});
 				});
 			}
 		},
 		_convertFonts : function() {
-			var t = this, s = t.settings, dom = t.dom, sl, cl, fz, fzn, v, i, st, x, nl, sp, f, n;
+			var t = this, s = t.settings, dom = t.dom, fz, fzn, sl, cl;
 			// No need
 			if (!s.inline_styles)
 				return;
 			// Font pt values and font size names
 			fz = [8, 10, 12, 14, 18, 24, 36];
 			fzn = ['xx-small', 'x-small','small','medium','large','x-large', 'xx-large'];
 			if (sl = s.font_size_style_values)
-				sl = sl.split(',');
+				sl = explode(sl);
 			if (cl = s.font_size_classes)
-				cl = cl.split(',');
+				cl = explode(cl);
 			function convertToFonts(no) {
+				var n, f, nl, x, i, v, st;
 				// Convert spans to fonts on non WebKit browsers
 				if (tinymce.isWebKit || !s.inline_styles)
 					return;
 				nl = t.dom.select('span', no);
 					n = nl[x];
 					f = dom.create('font', {
 						color : dom.toHex(dom.getStyle(n, 'color')),
 						face : dom.getStyle(n, 'fontFamily'),
-						style : dom.getAttrib(n, 'style')
+						style : dom.getAttrib(n, 'style'),
+						'class' : dom.getAttrib(n, 'class')
 					});
+					// Clear color and font family
+					st = f.style;
+					if (st.color || st.fontFamily) {
+						st.color = st.fontFamily = '';
+						dom.setAttrib(f, 'mce_style', ''); // Remove cached style data
+					}
 					if (sl) {
 						i = inArray(sl, dom.getStyle(n, 'fontSize'));
 						if (i != -1) {
 							dom.setAttrib(f, 'size', '' + (i + 1 || 1));
-							f.style.fontSize = '';
+							//f.style.fontSize = '';
 						}
 					} else if (cl) {
 						i = inArray(cl, dom.getAttrib(n, 'class'));
 						v = dom.getStyle(n, 'fontSize');
 					if (f.color || f.face || f.size) {
 						f.style.fontFamily = '';
 						dom.setAttrib(f, 'mce_style', '');
 						dom.replace(f, n, 1);
 					}
+					f = n = null;
 				}
 			};
 			// Run on setup
 			t.onSetContent.add(function(ed, o) {
 				convertToFonts(ed.getBody());
 			});
 			// Run on cleanup
 			t.onPreProcess.add(function(ed, o) {
+				var n, sp, nl, x;
 				// Keep unit tests happy
 				if (!s.inline_styles)
 					return;
 				if (o.get) {
 					nl = t.dom.select('font', o.node);
 					for (x = nl.length - 1; x >= 0; x--) {
 						n = nl[x];
 						sp = dom.create('span', {
-							style : dom.getAttrib(n, 'style')
+							style : dom.getAttrib(n, 'style'),
+							'class' : dom.getAttrib(n, 'class')
 						});
 						dom.setStyles(sp, {
 							fontFamily : dom.getAttrib(n, 'face'),
 							color : dom.getAttrib(n, 'color'),
 			s.setContent(v.replace(/\{\$selection\}/g, s.getContent({format : 'text'})));
 		},
 		mceInsertLink : function(u, v) {
-			var ed = this.editor, e = ed.dom.getParent(ed.selection.getNode(), 'A');
+			var ed = this.editor, s = ed.selection, e = ed.dom.getParent(s.getNode(), 'A');
 			if (tinymce.is(v, 'string'))
 				v = {href : v};
 			function set(e) {
 				t.RemoveFormat();
 			} else
 				ed.getDoc().execCommand('FontName', false, v);
 		},
+		FontSize : function(u, v) {
+			var ed = this.editor, s = ed.settings, fz = tinymce.explode(s.font_size_style_values), fzc = tinymce.explode(s.font_size_classes);
+			ed.getDoc().execCommand('FontSize', false, v);
+			// Add style values
+			if (s.inline_styles) {
+				each(ed.dom.select('font'), function(e) {
+					if (e.size === v) {
+						if (fzc && fzc.length > 0)
+							ed.dom.setAttrib(e, 'class', fzc[parseInt(v) - 1]);
+						else
+							ed.dom.setStyle(e, 'fontSize', fz[parseInt(v) - 1]);
+					}
+				});
+			}
+		},
 		queryCommandValue : function(c) {
 			var f = this['queryValue' + c];
 			if (f)
 				return f.call(this, c);
 			}
 			return -1;
 		},
+		_queryState : function(c) {
+			try {
+				return this.editor.getDoc().queryCommandState(c);
+			} catch (ex) {
+				// Ignore exception
+			}
+		},
+		_queryVal : function(c) {
+			try {
+				return this.editor.getDoc().queryCommandValue(c);
+			} catch (ex) {
+				// Ignore exception
+			}
+		},
 		queryValueFontSize : function() {
 			var ed = this.editor, v = 0, p;
 			if (isOpera || isWebKit) {
 				if (p = ed.dom.getParent(ed.selection.getNode(), 'FONT'))
 					v = p.size;
 				return v;
 			}
-			return ed.getDoc().queryCommandValue('FontSize');
+			return this._queryVal('FontSize');
 		},
 		queryValueFontName : function() {
 			var ed = this.editor, v = 0, p;
 			if (p = ed.dom.getParent(ed.selection.getNode(), 'FONT'))
 				v = p.face;
 			if (!v)
-				v = ed.getDoc().queryCommandValue('FontName');
+				v = this._queryVal('FontName');
 			return v;
 		},
 		mceJustify : function(c, v) {
 			// Remove wrappers inside new ones
 			each(dom.select(nn).reverse(), function(n) {
 				var p = n.parentNode;
-				dom.setAttrib(n, 'mce_new', '');
 				// Check if it's an old span in a new wrapper
 				if (!dom.getAttrib(n, 'mce_new')) {
 					// Find new wrapper
 					p = dom.getParent(n, function(n) {
 						return n.nodeType == 1 && dom.getAttrib(n, 'mce_new');
 			// Merge wrappers with parent wrappers
 			each(dom.select(nn).reverse(), function(n) {
 				var p = n.parentNode;
-				if (!p)
+				if (!p || !dom.getAttrib(n, 'mce_new'))
 					return;
 				// Has parent of the same type and only child
 				if (p.nodeName == nn.toUpperCase() && p.childNodes.length == 1)
 					return dom.remove(p, 1);
 				}
 			});
 			// Remove empty wrappers
 			each(dom.select(nn).reverse(), function(n) {
-				if (!dom.getAttrib(n, 'class') && !dom.getAttrib(n, 'style'))
+				if (dom.getAttrib(n, 'mce_new') || (dom.getAttribs(n).length <= 1 && n.className === '')) {
-					return dom.remove(n, 1);
+					if (!dom.getAttrib(n, 'class') && !dom.getAttrib(n, 'style'))
+						return dom.remove(n, 1);
+					dom.setAttrib(n, 'mce_new', ''); // Remove mce_new marker
+				}
 			});
 			s.moveToBookmark(b);
 		},
 				v = 'justify';
 			if (ed.settings.inline_styles)
 				return (n && n.style.textAlign == v);
-			return ed.getDoc().queryCommandState(c);
+			return this._queryState(c);
 		},
 		HiliteColor : function(ui, val) {
 			var t = this, ed = t.editor, d = ed.getDoc();
 				}
 			}
 		},
 		queryStateUnderline : function() {
-			var ed = this.editor, n;
+			var ed = this.editor, n = ed.selection.getNode();
 			if (n && n.nodeName == 'A')
 				return false;
-			return ed.getDoc().queryCommandState('Underline');
+			return this._queryState('Underline');
 		},
 		queryStateOutdent : function() {
 			var ed = this.editor, n;
 		l = l || {};
 		l.content = l.content || ed.getContent({format : 'raw', no_events : 1});
 		// Add undo level if needed
 		l.content = l.content.replace(/^\s*|\s*$/g, '');
-		la = t.data[t.index > 0 ? t.index - 1 : 0];
+		la = t.data[t.index > 0 && (t.index == 0 || t.index == t.data.length) ? t.index - 1 : t.index];
 		if (!l.initial && la && l.content == la.content)
 			return null;
 		// Time to compress
 		if (s.custom_undo_redo_levels) {
 		}
 		if (s.custom_undo_redo_restore_selection && !l.initial)
 			l.bookmark = b = l.bookmark || ed.selection.getBookmark();
-		if (t.index < t.data.length && t.data[t.index].initial)
+		if (t.index < t.data.length)
 			t.index++;
+		// Only initial marked undo levels should be allowed as first item
+		// This to workaround a bug with Firefox and the blur event
+		if (t.data.length === 0 && !l.initial)
+			return null;
 		// Add level
 		t.data.length = t.index + 1;
 		t.data[t.index++] = l;
 			elm = (s.forced_root_block || 'p').toLowerCase();
 			s.element = elm.toUpperCase();
 			ed.onPreInit.add(t.setup, t);
-			t.reOpera = new RegExp('(\u00a0|&#160;|&nbsp;)<\/' + elm + '>', 'gi');
+			t.reOpera = new RegExp('(\\u00a0|&#160;|&nbsp;)<\/' + elm + '>', 'gi');
-			t.rePadd = new RegExp('<p( )([^>]+)><\/p>|<p( )([^>]+)\/>|<p( )([^>]+)>\s+<\/p>|<p><\/p>|<p\/>|<p>\s+<\/p>'.replace(/p/g, elm), 'gi');
+			t.rePadd = new RegExp('<p( )([^>]+)><\\\/p>|<p( )([^>]+)\\\/>|<p( )([^>]+)>\\s+<\\\/p>|<p><\\\/p>|<p\\\/>|<p>\\s+<\\\/p>'.replace(/p/g, elm), 'gi');
-			t.reNbsp2BR = new RegExp('<p( )([^>]+)>[\s\u00a0]+<\/p>|<p>[\s\u00a0]+<\/p>'.replace(/p/g, elm), 'gi');
+			t.reNbsp2BR1 = new RegExp('<p( )([^>]+)>[\\s\\u00a0]+<\\\/p>|<p>[\\s\\u00a0]+<\\\/p>'.replace(/p/g, elm), 'gi');
-			t.reBR2Nbsp = new RegExp('<p( )([^>]+)>\s*<br \/>\s*<\/p>|<p>\s*<br \/>\s*<\/p>'.replace(/p/g, elm), 'gi');
+			t.reNbsp2BR2 = new RegExp('<p( )([^>]+)>(&nbsp;|&#160;)<\\\/p>|<p>(&nbsp;|&#160;)<\\\/p>'.replace(/p/g, elm), 'gi');
-			t.reTrailBr = new RegExp('\s*<br \/>\s*<\/p>'.replace(/p/g, elm), 'gi');
+			t.reBR2Nbsp = new RegExp('<p( )([^>]+)>\\s*<br \\\/>\\s*<\\\/p>|<p>\\s*<br \\\/>\\s*<\\\/p>'.replace(/p/g, elm), 'gi');
+			t.reTrailBr = new RegExp('\\s*<br \\/>\\s*<\\\/p>'.replace(/p/g, elm), 'gi');
 			function padd(ed, o) {
 				if (isOpera)
 					o.content = o.content.replace(t.reOpera, '</' + elm + '>');
 				o.content = o.content.replace(t.rePadd, '<' + elm + '$1$2$3$4$5$6>\u00a0</' + elm + '>');
-				if (!isIE && o.set) {
+				if (!isIE && !isOpera && o.set) {
 					// Use &nbsp; instead of BR in padded paragraphs
-					o.content = o.content.replace(t.reNbsp2BR, '<' + elm + '$1$2><br /></' + elm + '>');
+					o.content = o.content.replace(t.reNbsp2BR1, '<' + elm + '$1$2><br /></' + elm + '>');
+					o.content = o.content.replace(t.reNbsp2BR2, '<' + elm + '$1$2><br /></' + elm + '>');
 				} else {
 					o.content = o.content.replace(t.reBR2Nbsp, '<' + elm + '$1$2>\u00a0</' + elm + '>');
 					o.content = o.content.replace(t.reTrailBr, '</' + elm + '>');
 				}
 			};
 			// Wrap non blocks into blocks
 			for (i = nl.length - 1; i >= 0; i--) {
 				nx = nl[i];
 				// Is text or non block element
-				if (nx.nodeType == 3 || !t.dom.isBlock(nx)) {
+				if (nx.nodeType == 3 || (!t.dom.isBlock(nx) && nx.nodeType != 8)) {
 					if (!bl) {
 						// Create new block but ignore whitespace
 						if (nx.nodeType != 3 || /[^\s]/g.test(nx.nodeValue)) {
 							// Store selection
 							if (si == -2 && r) {
 			return d.getParent(n, d.isBlock);
 		},
 		insertPara : function(e) {
-			var t = this, ed = t.editor, d = ed.getDoc(), se = ed.settings, s = ed.selection.getSel(), r = s.getRangeAt(0), b = d.body;
+			var t = this, ed = t.editor, dom = ed.dom, d = ed.getDoc(), se = ed.settings, s = ed.selection.getSel(), r = s.getRangeAt(0), b = d.body;
-			var rb, ra, dir, sn, so, en, eo, sb, eb, bn, bef, aft, sc, ec, n;
+			var rb, ra, dir, sn, so, en, eo, sb, eb, bn, bef, aft, sc, ec, n, vp = dom.getViewPort(ed.getWin()), y, ch;
 			function isEmpty(n) {
 				n = n.innerHTML;
 				n = n.replace(/<(img|hr|table)/gi, '-'); // Keep these convert them to - chars
 				n = n.replace(/<[^>]+>/g, ''); // Remove all tags
 			dir = rb.compareBoundaryPoints(rb.START_TO_END, ra) < 0;
 			sn = dir ? s.anchorNode : s.focusNode;
 			so = dir ? s.anchorOffset : s.focusOffset;
 			en = dir ? s.focusNode : s.anchorNode;
 			eo = dir ? s.focusOffset : s.anchorOffset;
+			// If selection is in empty table cell
+			if (sn === en && /^(TD|TH)$/.test(sn.nodeName)) {
+				dom.remove(sn.firstChild); // Remove BR
+				// Create two new block elements
+				ed.dom.add(sn, se.element, null, '<br />');
+				aft = ed.dom.add(sn, se.element, null, '<br />');
+				// Move caret into the last one
+				r = d.createRange();
+				r.selectNodeContents(aft);
+				r.collapse(1);
+				ed.selection.setRng(r);
+				return false;
+			}
 			// If the caret is in an invalid location in FF we need to move it into the first block
 			if (sn == b && en == b && b.firstChild && ed.dom.isBlock(b.firstChild)) {
 				sn = en = sn.firstChild;
 				so = eo = 0;
 				r.setEnd(ra.endContainer, ra.endOffset);
 			// Delete and replace it with new block elements
 			r.deleteContents();
+			if (isOpera)
+				ed.getWin().scrollTo(0, vp.y);
 			// Never wrap blocks in blocks
 			if (bef.firstChild && bef.firstChild.nodeName == bn)
 				bef.innerHTML = bef.firstChild.innerHTML;
 			if (aft.firstChild && aft.firstChild.nodeName == bn)
 			// Normalize
 			aft.normalize();
 			bef.normalize();
+			function first(n) {
+				return d.createTreeWalker(n, NodeFilter.SHOW_TEXT, null, false).nextNode() || n;
+			};
 			// Move cursor and scroll into view
 			r = d.createRange();
-			r.selectNodeContents(aft);
+			r.selectNodeContents(isGecko ? first(aft) : aft);
 			r.collapse(1);
 			s.removeAllRanges();
 			s.addRange(r);
-			// Safari bug fix, http://bugs.webkit.org/show_bug.cgi?id=16117
+			// scrollIntoView seems to scroll the parent window in most browsers now including FF 3.0b4 so it's time to stop using it and do it our selfs
-			if (tinymce.isWebKit)
+			y = ed.dom.getPos(aft).y;
-				ed.getWin().scrollTo(0, ed.dom.getPos(aft).y);
+			ch = aft.clientHeight;
-			else
-				aft.scrollIntoView(0);
+			// Is element within viewport
+			if (y < vp.y || y + ch > vp.y + vp.h) {
+				ed.getWin().scrollTo(0, y < vp.y ? y : y - vp.h + ch);
+				//console.debug('SCROLL!', 'vp.y: ' + vp.y, 'y' + y, 'vp.h' + vp.h, 'clientHeight' + aft.clientHeight, 'yyy: ' + (y < vp.y ? y : y - vp.h + aft.clientHeight));
+			}
 			return false;
 		},
 		backspaceDelete : function(e, bs) {
-			var t = this, ed = t.editor, b = ed.getBody(), n, se = ed.selection, r = se.getRng(), sc = r.startContainer, n;
+			var t = this, ed = t.editor, b = ed.getBody(), n, se = ed.selection, r = se.getRng(), sc = r.startContainer, n, w, tn;
 			// The caret sometimes gets stuck in Gecko if you delete empty paragraphs
 			// This workaround removes the element by hand and moves the caret to the previous element
-			if (sc && ed.dom.isBlock(sc) && bs) {
+			if (sc && ed.dom.isBlock(sc) && !/^(TD|TH)$/.test(sc.nodeName) && bs) {
-				if (sc.childNodes.length == 1 && sc.firstChild.nodeName == 'BR') {
+				if (sc.childNodes.length == 0 || (sc.childNodes.length == 1 && sc.firstChild.nodeName == 'BR')) {
-					n = sc.previousSibling;
+					// Find previous block element
+					n = sc;
+					while ((n = n.previousSibling) && !ed.dom.isBlock(n)) ;
 					if (n) {
-						ed.dom.remove(sc);
+						if (sc != b.firstChild) {
-						se.select(n.firstChild);
+							// Find last text node
-						se.collapse(0);
+							w = ed.dom.doc.createTreeWalker(n, NodeFilter.SHOW_TEXT, null, false);
+							while (tn = w.nextNode())
+								n = tn;
+							// Place caret at the end of last text node
+							r = ed.getDoc().createRange();
+							r.setStart(n, n.nodeValue ? n.nodeValue.length : 0);
+							r.setEnd(n, n.nodeValue ? n.nodeValue.length : 0);
+							se.setRng(r);
+							// Remove the target container
+							ed.dom.remove(sc);
+						}
 						return Event.cancel(e);
 					}
 				}
 			}
 			// Gecko generates BR elements here and there, we don't like those so lets remove them
 			function handler(e) {
 				e = e.target;
 				// A new BR was created in a block element, remove it
-				if (e && e.parentNode && e.nodeName == 'BR' && t.getParentBlock(e)) {
+				if (e && e.parentNode && e.nodeName == 'BR' && (n = t.getParentBlock(e))) {
-					ed.dom.remove(e);
 					Event.remove(b, 'DOMNodeInserted', handler);
+					// Only remove BR elements that got inserted in the middle of the text
+					if (e.previousSibling || e.nextSibling)
+						ed.dom.remove(e);
 				}
 			};
 			// Listen for new nodes
 			Event._add(b, 'DOMNodeInserted', handler);
 			t.editor = ed;
 			t.controls = {};
 			t.onAdd = new tinymce.util.Dispatcher(t);
 			t.onPostRender = new tinymce.util.Dispatcher(t);
 			t.prefix = s.prefix || ed.id + '_';
+			t._cls = {};
 			t.onPostRender.add(function() {
 				each(t.controls, function(c) {
 					c.postRender();
 				});
 				return t.createButton(n, c);
 			return t.add(c);
 		},
-		createDropMenu : function(id, s) {
+		createDropMenu : function(id, s, cc) {
-			var t = this, ed = t.editor, c, bm, v;
+			var t = this, ed = t.editor, c, bm, v, cls;
 			s = extend({
-				'class' : 'mceDropDown'
+				'class' : 'mceDropDown',
+				constrain : ed.settings.constrain_menus
 			}, s);
 			s['class'] = s['class'] + ' ' + ed.getParam('skin') + 'Skin';
 			if (v = ed.getParam('skin_variant'))
 				s['class'] += ' ' + ed.getParam('skin') + 'Skin' + v.substring(0, 1).toUpperCase() + v.substring(1);
 			id = t.prefix + id;
-			c = t.controls[id] = new tinymce.ui.DropMenu(id, s);
+			cls = cc || t._cls.dropmenu || tinymce.ui.DropMenu;
+			c = t.controls[id] = new cls(id, s);
 			c.onAddItem.add(function(c, o) {
 				var s = o.settings;
 				s.title = ed.getLang(s.title, s.title);
 			}
 			return t.add(c);
 		},
-		createListBox : function(id, s) {
+		createListBox : function(id, s, cc) {
-			var t = this, ed = t.editor, cmd, c;
+			var t = this, ed = t.editor, cmd, c, cls;
 			if (t.get(id))
 				return null;
 			s.title = ed.translate(s.title);
 			id = t.prefix + id;
 			if (ed.settings.use_native_selects)
 				c = new tinymce.ui.NativeListBox(id, s);
-			else
+			else {
-				c = new tinymce.ui.ListBox(id, s);
+				cls = cc || t._cls.listbox || tinymce.ui.ListBox;
+				c = new cls(id, s);
+			}
 			t.controls[id] = c;
 			// Fix focus problem in Safari
 			if (tinymce.isWebKit) {
 				ed.onMouseDown.add(c.hideMenu, c);
 			return t.add(c);
 		},
-		createButton : function(id, s) {
+		createButton : function(id, s, cc) {
-			var t = this, ed = t.editor, o, c;
+			var t = this, ed = t.editor, o, c, cls;
 			if (t.get(id))
 				return null;
 			s.title = ed.translate(s.title);
+			s.label = ed.translate(s.label);
 			s.scope = s.scope || ed;
 			if (!s.onclick && !s.menu_button) {
 				s.onclick = function() {
 					ed.execCommand(s.cmd, s.ui || false, s.value);
 			}, s);
 			id = t.prefix + id;
 			if (s.menu_button) {
-				c = new tinymce.ui.MenuButton(id, s);
+				cls = cc || t._cls.menubutton || tinymce.ui.MenuButton;
+				c = new cls(id, s);
 				ed.onMouseDown.add(c.hideMenu, c);
-			} else
+			} else {
-				c = new tinymce.ui.Button(id, s);
+				cls = t._cls.button || tinymce.ui.Button;
+				c = new cls(id, s);
+			}
 			return t.add(c);
 		},
 		createMenuButton : function(id, s) {
 			s.menu_button = 1;
 			return this.createButton(id, s);
 		},
-		createSplitButton : function(id, s) {
+		createSplitButton : function(id, s, cc) {
-			var t = this, ed = t.editor, cmd, c;
+			var t = this, ed = t.editor, cmd, c, cls;
 			if (t.get(id))
 				return null;
 			s.title = ed.translate(s.title);
 				scope : s.scope,
 				control_manager : t
 			}, s);
 			id = t.prefix + id;
-			c = t.add(new tinymce.ui.SplitButton(id, s));
+			cls = cc || t._cls.splitbutton || tinymce.ui.SplitButton;
+			c = t.add(new cls(id, s));
 			ed.onMouseDown.add(c.hideMenu, c);
 			return c;
 		},
-		createColorSplitButton : function(id, s) {
+		createColorSplitButton : function(id, s, cc) {
-			var t = this, ed = t.editor, cmd, c;
+			var t = this, ed = t.editor, cmd, c, cls;
 			if (t.get(id))
 				return null;
 			s.title = ed.translate(s.title);
 				scope : s.scope,
 				more_colors_title : ed.getLang('more_colors')
 			}, s);
 			id = t.prefix + id;
-			c = new tinymce.ui.ColorSplitButton(id, s);
+			cls = cc || t._cls.colorsplitbutton || tinymce.ui.ColorSplitButton;
+			c = new cls(id, s);
 			ed.onMouseDown.add(c.hideMenu, c);
+			// Remove the menu element when the editor is removed
+			ed.onRemove.add(function() {
+				c.destroy();
+			});
 			return t.add(c);
 		},
-		createToolbar : function(id, s) {
+		createToolbar : function(id, s, cc) {
-			var c, t = this;
+			var c, t = this, cls;
 			id = t.prefix + id;
-			c = new tinymce.ui.Toolbar(id, s);
+			cls = cc || t._cls.toolbar || tinymce.ui.Toolbar;
+			c = new cls(id, s);
 			if (t.get(id))
 				return null;
 			return t.add(c);
 		},
-		createSeparator : function() {
+		createSeparator : function(cc) {
-			return new tinymce.ui.Separator();
+			var cls = cc || this._cls.separator || tinymce.ui.Separator;
+			return new cls();
+		},
+		setControlType : function(n, c) {
+			return this._cls[n.toLowerCase()] = c;
+		},
+		destroy : function() {
+			each(this.controls, function(c) {
+				c.destroy();
+			});
+			this.controls = null;
 		}
 		});
 })();
 			s.left = s.left || parseInt(sw / 2.0) - (s.width / 2.0);
 			s.top = s.top || parseInt(sh / 2.0) - (s.height / 2.0);
 			p.inline = false;
 			p.mce_width = s.width;
 			p.mce_height = s.height;
+			p.mce_auto_focus = s.auto_focus;
 			if (mo) {
 				if (isIE) {
 					s.center = true;
 					s.help = false;
 			u = s.url || s.file;
 			if (tinymce.relaxedDomain)
 				u += (u.indexOf('?') == -1 ? '?' : '&') + 'mce_rdomain=' + tinymce.relaxedDomain;
+			u = tinymce._addVer(u);
 			try {
 				if (isIE && mo) {
 					w = 1;
-					window.showModalDialog(s.url || s.file, window, f);
+					window.showModalDialog(u, window, f);
 				} else
 					w = window.open(u, s.name, f);
 			} catch (ex) {
 				// Ignore
 			}
 		confirm : function(t, cb, s) {
 			cb.call(s || this, confirm(this._decode(this.editor.getLang(t, t))));
 		},
-		alert : function(t, cb, s) {
+		alert : function(tx, cb, s) {
-			alert(this._decode(t));
+			var t = this;
+			alert(t._decode(t.editor.getLang(tx, tx)));
 			if (cb)
-				cb.call(s || this);
+				cb.call(s || t);
 		},
 		// Internal functions
 		_decode : function(s) {

Enano CMS (1.1.x)