TinyMCE 3.5

1 files changed, 5021 insertions, 3382 deletions

diff --git a/program/js/tiny_mce/tiny_mce_src.js b/program/js/tiny_mce/tiny_mce_src.js
index 358de47f2..2cf0f6249 100644
--- a/program/js/tiny_mce/tiny_mce_src.js
+++ b/program/js/tiny_mce/tiny_mce_src.js
@@ -1,13 +1,14 @@
+// FILE IS GENERATED BY COMBINING THE SOURCES IN THE "classes" DIRECTORY SO DON'T MODIFY THIS FILE DIRECTLY

 (function(win) {

 	var whiteSpaceRe = /^\s*|\s*$/g,

-		undefined, isRegExpBroken = 'B'.replace(/A(.)|B/, '$1') === '$1';

+		undef, isRegExpBroken = 'B'.replace(/A(.)|B/, '$1') === '$1';

 

 	var tinymce = {

 		majorVersion : '3',

 

-		minorVersion : '4.6',

+		minorVersion : '5',

 

-		releaseDate : '2011-09-29',

+		releaseDate : '2012-05-03',

 

 		_init : function() {

 			var t = this, d = document, na = navigator, ua = na.userAgent, i, nl, n, base, p, v;

@@ -50,7 +51,8 @@
 			// If base element found, add that infront of baseURL

 			nl = d.getElementsByTagName('base');

 			for (i=0; i<nl.length; i++) {

-				if (v = nl[i].href) {

+				v = nl[i].href;

+				if (v) {

 					// Host only value like http://site.com or http://site.com:8008

 					if (/^https?:\/\/[^\/]+$/.test(v))

 						v += '/';

@@ -103,7 +105,7 @@
 

 		is : function(o, t) {

 			if (!t)

-				return o !== undefined;

+				return o !== undef;

 

 			if (t == 'array' && (o.hasOwnProperty && o instanceof Array))

 				return true;

@@ -137,7 +139,7 @@
 

 			s = s || o;

 

-			if (o.length !== undefined) {

+			if (o.length !== undef) {

 				// Indexed arrays, needed for Safari

 				for (n=0, l = o.length; n < l; n++) {

 					if (cb.call(s, o[n], n, o) === false)

@@ -191,19 +193,23 @@
 			return -1;

 		},

 

-		extend : function(o, e) {

-			var i, l, a = arguments;

+		extend : function(obj, ext) {

+			var i, l, name, args = arguments, value;

 

-			for (i = 1, l = a.length; i < l; i++) {

-				e = a[i];

+			for (i = 1, l = args.length; i < l; i++) {

+				ext = args[i];

+				for (name in ext) {

+					if (ext.hasOwnProperty(name)) {

+						value = ext[name];

 

-				tinymce.each(e, function(v, n) {

-					if (v !== undefined)

-						o[n] = v;

-				});

+						if (value !== undef) {

+							obj[name] = value;

+						}

+					}

+				}

 			}

 

-			return o;

+			return obj;

 		},

 

 

@@ -346,69 +352,69 @@
 		},

 

 		addUnload : function(f, s) {

-			var t = this;

+			var t = this, unload;

 

-			f = {func : f, scope : s || this};

+			unload = function() {

+				var li = t.unloads, o, n;

 

-			if (!t.unloads) {

-				function unload() {

-					var li = t.unloads, o, n;

+				if (li) {

+					// Call unload handlers

+					for (n in li) {

+						o = li[n];

 

-					if (li) {

-						// Call unload handlers

-						for (n in li) {

-							o = li[n];

+						if (o && o.func)

+							o.func.call(o.scope, 1); // Send in one arg to distinct unload and user destroy

+					}

 

-							if (o && o.func)

-								o.func.call(o.scope, 1); // Send in one arg to distinct unload and user destroy

-						}

+					// Detach unload function

+					if (win.detachEvent) {

+						win.detachEvent('onbeforeunload', fakeUnload);

+						win.detachEvent('onunload', unload);

+					} else if (win.removeEventListener)

+						win.removeEventListener('unload', unload, false);

 

-						// Detach unload function

-						if (win.detachEvent) {

-							win.detachEvent('onbeforeunload', fakeUnload);

-							win.detachEvent('onunload', unload);

-						} else if (win.removeEventListener)

-							win.removeEventListener('unload', unload, false);

+					// Destroy references

+					t.unloads = o = li = w = unload = 0;

 

-						// Destroy references

-						t.unloads = o = li = w = unload = 0;

+					// Run garbarge collector on IE

+					if (win.CollectGarbage)

+						CollectGarbage();

+				}

+			};

 

-						// Run garbarge collector on IE

-						if (win.CollectGarbage)

-							CollectGarbage();

-					}

-				};

+			function fakeUnload() {

+				var d = document;

 

-				function fakeUnload() {

-					var d = document;

+				function stop() {

+					// Prevent memory leak

+					d.detachEvent('onstop', stop);

 

-					// 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

+					if (unload)

+						unload();

 

-							// Call unload handler

-							if (unload)

-								unload();

+					d = 0;

+				};

 

-							d = 0;

-						};

+				// Is there things still loading, then do some magic

+				if (d.readyState == 'interactive') {

+					// Fire unload when the currently loading page is stopped

+					if (d)

+						d.attachEvent('onstop', stop);

 

-						// Fire unload when the currently loading page is stopped

+					// 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

+					win.setTimeout(function() {

 						if (d)

-							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

-						win.setTimeout(function() {

-							if (d)

-								d.detachEvent('onstop', stop);

-						}, 0);

-					}

-				};

+							d.detachEvent('onstop', stop);

+					}, 0);

+				}

+			};

+

+			f = {func : f, scope : s || this};

 

+			if (!t.unloads) {

 				// Attach unload handler

 				if (win.attachEvent) {

 					win.attachEvent('onunload', unload);

@@ -439,7 +445,11 @@
 		},

 

 		explode : function(s, d) {

-			return s ? tinymce.map(s.split(d || ','), tinymce.trim) : s;

+			if (!s || tinymce.is(s, 'array')) {

+				return s;

+			}

+

+			return tinymce.map(s.split(d || ','), tinymce.trim);

 		},

 

 		_addVer : function(u) {

@@ -465,7 +475,7 @@
 					var val = replace, args = arguments, i;

 

 					for (i = 0; i < args.length - 2; i++) {

-						if (args[i] === undefined) {

+						if (args[i] === undef) {

 							val = val.replace(new RegExp('\\$' + i, 'g'), '');

 						} else {

 							val = val.replace(new RegExp('\\$' + i, 'g'), args[i]);

@@ -496,52 +506,64 @@
 tinymce.create('tinymce.util.Dispatcher', {

 	scope : null,

 	listeners : null,

+	inDispatch: false,

 

-	Dispatcher : function(s) {

-		this.scope = s || this;

+	Dispatcher : function(scope) {

+		this.scope = scope || this;

 		this.listeners = [];

 	},

 

-	add : function(cb, s) {

-		this.listeners.push({cb : cb, scope : s || this.scope});

+	add : function(callback, scope) {

+		this.listeners.push({cb : callback, scope : scope || this.scope});

 

-		return cb;

+		return callback;

 	},

 

-	addToTop : function(cb, s) {

-		this.listeners.unshift({cb : cb, scope : s || this.scope});

+	addToTop : function(callback, scope) {

+		var self = this, listener = {cb : callback, scope : scope || self.scope};

 

-		return cb;

+		// Create new listeners if addToTop is executed in a dispatch loop

+		if (self.inDispatch) {

+			self.listeners = [listener].concat(self.listeners);

+		} else {

+			self.listeners.unshift(listener);

+		}

+

+		return callback;

 	},

 

-	remove : function(cb) {

-		var l = this.listeners, o = null;

+	remove : function(callback) {

+		var listeners = this.listeners, output = null;

 

-		tinymce.each(l, function(c, i) {

-			if (cb == c.cb) {

-				o = cb;

-				l.splice(i, 1);

+		tinymce.each(listeners, function(listener, i) {

+			if (callback == listener.cb) {

+				output = listener;

+				listeners.splice(i, 1);

 				return false;

 			}

 		});

 

-		return o;

+		return output;

 	},

 

 	dispatch : function() {

-		var s, a = arguments, i, li = this.listeners, c;

+		var self = this, returnValue, args = arguments, i, listeners = self.listeners, listener;

 

+		self.inDispatch = true;

+		

 		// Needs to be a real loop since the listener count might change while looping

 		// And this is also more efficient

-		for (i = 0; i<li.length; i++) {

-			c = li[i];

-			s = c.cb.apply(c.scope, a);

+		for (i = 0; i < listeners.length; i++) {

+			listener = listeners[i];

+			returnValue = listener.cb.apply(listener.scope, args.length > 0 ? args : [listener.scope]);

 

-			if (s === false)

+			if (returnValue === false)

 				break;

 		}

 

-		return s;

+		self.inDispatch = false;

+

+		return returnValue;

 	}

 

 	});

@@ -571,14 +593,14 @@ tinymce.create('tinymce.util.Dispatcher', {
 				u = (s.base_uri ? s.base_uri.protocol || 'http' : 'http') + '://mce_host' + u;

 

 			// Relative path http:// or protocol relative //path

-			if (!/^[\w-]*:?\/\//.test(u)) {

+			if (!/^[\w\-]*:?\/\//.test(u)) {

 				base_url = s.base_uri ? s.base_uri.path : new tinymce.util.URI(location.href).directory;

 				u = ((s.base_uri && s.base_uri.protocol) || 'http') + '://mce_host' + t.toAbsPath(base_url, u);

 			}

 

 			// Parse URL (Credits goes to Steave, http://blog.stevenlevithan.com/archives/parseuri)

 			u = u.replace(/@@/g, '(mce_at)'); // Zope 3 workaround, they use @@something

-			u = /^(?:(?![^:@]+:[^:@\/]*@)([^:\/?#.]+):)?(?:\/\/)?((?:(([^:@]*):?([^:@]*))?@)?([^:\/?#]*)(?::(\d*))?)(((\/(?:[^?#](?![^?#\/]*\.[^?#\/.]+(?:[?#]|$)))*\/?)?([^?#\/]*))(?:\?([^#]*))?(?:#(.*))?)/.exec(u);

+			u = /^(?:(?![^:@]+:[^:@\/]*@)([^:\/?#.]+):)?(?:\/\/)?((?:(([^:@\/]*):?([^:@\/]*))?@)?([^:\/?#]*)(?::(\d*))?)(((\/(?:[^?#](?![^?#\/]*\.[^?#\/.]+(?:[?#]|$)))*\/?)?([^?#\/]*))(?:\?([^#]*))?(?:#(.*))?)/.exec(u);

 			each(["source","protocol","authority","userInfo","user","password","host","port","relative","path","directory","file","query","anchor"], function(v, i) {

 				var s = u[i];

 

@@ -589,17 +611,18 @@ tinymce.create('tinymce.util.Dispatcher', {
 				t[v] = s;

 			});

 

-			if (b = s.base_uri) {

+			b = s.base_uri;

+			if (b) {

 				if (!t.protocol)

 					t.protocol = b.protocol;

 

 				if (!t.userInfo)

 					t.userInfo = b.userInfo;

 

-				if (!t.port && t.host == 'mce_host')

+				if (!t.port && t.host === 'mce_host')

 					t.port = b.port;

 

-				if (!t.host || t.host == 'mce_host')

+				if (!t.host || t.host === 'mce_host')

 					t.host = b.host;

 

 				t.source = '';

@@ -635,6 +658,12 @@ tinymce.create('tinymce.util.Dispatcher', {
 			if ((u.host != 'mce_host' && t.host != u.host && u.host) || t.port != u.port || t.protocol != u.protocol)

 				return u.getURI();

 

+			var tu = t.getURI(), uu = u.getURI();

+			

+			// Allow usage of the base_uri when relative_urls = true

+			if(tu == uu || (tu.charAt(tu.length - 1) == "/" && tu.substr(0, tu.length - 1) == uu))

+				return tu;

+

 			o = t.toRelPath(t.path, u.path);

 

 			// Add query

@@ -649,7 +678,7 @@ tinymce.create('tinymce.util.Dispatcher', {
 		},

 	

 		toAbsolute : function(u, nh) {

-			var u = new tinymce.util.URI(u, {base_uri : this});

+			u = new tinymce.util.URI(u, {base_uri : this});

 

 			return u.getURI(this.host == u.host && this.protocol == u.protocol ? nh : 0);

 		},

@@ -680,7 +709,7 @@ tinymce.create('tinymce.util.Dispatcher', {
 				}

 			}

 

-			if (bp == 1)

+			if (bp === 1)

 				return path;

 

 			for (i = 0, l = base.length - (bp - 1); i < l; i++)

@@ -715,11 +744,11 @@ tinymce.create('tinymce.util.Dispatcher', {
 			// Merge relURLParts chunks

 			for (i = path.length - 1, o = []; i >= 0; i--) {

 				// Ignore empty or .

-				if (path[i].length == 0 || path[i] == ".")

+				if (path[i].length === 0 || path[i] === ".")

 					continue;

 

 				// Is parent

-				if (path[i] == '..') {

+				if (path[i] === '..') {

 					nb++;

 					continue;

 				}

@@ -830,7 +859,7 @@ tinymce.create('tinymce.util.Dispatcher', {
 			if (b == -1) {

 				b = c.indexOf(p);

 

-				if (b != 0)

+				if (b !== 0)

 					return null;

 			} else

 				b += 2;

@@ -863,7 +892,7 @@ tinymce.create('tinymce.util.Dispatcher', {
 

 (function() {

 	function serialize(o, quote) {

-		var i, v, t;

+		var i, v, t, name;

 

 		quote = quote || '"';

 

@@ -901,8 +930,11 @@ tinymce.create('tinymce.util.Dispatcher', {
 

 				v = '{';

 

-				for (i in o)

-					v += typeof o[i] != 'function' ? (v.length > 1 ? ',' + quote : quote) + i + quote +':' + serialize(o[i], quote) : '';

+				for (name in o) {

+					if (o.hasOwnProperty(name)) {

+						v += typeof o[name] != 'function' ? (v.length > 1 ? ',' + quote : quote) + name + quote +':' + serialize(o[name], quote) : '';

+					}

+				}

 

 				return v + '}';

 		}

@@ -923,10 +955,23 @@ tinymce.create('tinymce.util.Dispatcher', {
 

 		};

 })();

+

 tinymce.create('static tinymce.util.XHR', {

 	send : function(o) {

 		var x, t, w = window, c = 0;

 

+		function ready() {

+			if (!o.async || x.readyState == 4 || c++ > 10000) {

+				if (o.success && c < 10000 && x.status == 200)

+					o.success.call(o.success_scope, '' + x.responseText, x, o);

+				else if (o.error)

+					o.error.call(o.error_scope, c > 10000 ? 'TIMED_OUT' : 'GENERAL', x, o);

+

+				x = null;

+			} else

+				w.setTimeout(ready, 10);

+		};

+

 		// Default settings

 		o.scope = o.scope || this;

 		o.success_scope = o.success_scope || o.scope;

@@ -960,18 +1005,6 @@ tinymce.create('static tinymce.util.XHR', {
 

 			x.send(o.data);

 

-			function ready() {

-				if (!o.async || x.readyState == 4 || c++ > 10000) {

-					if (o.success && c < 10000 && x.status == 200)

-						o.success.call(o.success_scope, '' + x.responseText, x, o);

-					else if (o.error)

-						o.error.call(o.error_scope, c > 10000 ? 'TIMED_OUT' : 'GENERAL', x, o);

-

-					x = null;

-				} else

-					w.setTimeout(ready, 10);

-			};

-

 			// Syncronous request

 			if (!o.async)

 				return ready();

@@ -1038,95 +1071,204 @@ tinymce.create('static tinymce.util.XHR', {
 }());

 (function(tinymce){

 	tinymce.VK = {

-		DELETE:46,

-		BACKSPACE:8

-		

+		BACKSPACE: 8,

+		DELETE: 46,

+		DOWN: 40,

+		ENTER: 13,

+		LEFT: 37,

+		RIGHT: 39,

+		SPACEBAR: 32,

+		TAB: 9,

+		UP: 38,

+

+		modifierPressed: function (e) {

+			return e.shiftKey || e.ctrlKey || e.altKey;

+		}

+	};

+})(tinymce);

+

+tinymce.util.Quirks = function(editor) {

+	var VK = tinymce.VK, BACKSPACE = VK.BACKSPACE, DELETE = VK.DELETE, dom = editor.dom, selection = editor.selection, settings = editor.settings;

+

+	function setEditorCommandState(cmd, state) {

+		try {

+			editor.getDoc().execCommand(cmd, false, state);

+		} catch (ex) {

+			// Ignore

+		}

 	}

 

-})(tinymce);

+	function cleanupStylesWhenDeleting() {

+		function removeMergedFormatSpans(isDelete) {

+			var rng, blockElm, node, clonedSpan;

 

-(function(tinymce) {

-	var VK = tinymce.VK, BACKSPACE = VK.BACKSPACE, DELETE = VK.DELETE;

+			rng = selection.getRng();

+

+			// Find root block

+			blockElm = dom.getParent(rng.startContainer, dom.isBlock);

+

+			// On delete clone the root span of the next block element

+			if (isDelete)

+				blockElm = dom.getNext(blockElm, dom.isBlock);

+

+			// Locate root span element and clone it since it would otherwise get merged by the "apple-style-span" on delete/backspace

+			if (blockElm) {

+				node = blockElm.firstChild;

+

+				// Ignore empty text nodes

+				while (node && node.nodeType == 3 && node.nodeValue.length === 0)

+					node = node.nextSibling;

+

+				if (node && node.nodeName === 'SPAN') {

+					clonedSpan = node.cloneNode(false);

+				}

+			}

+

+			// Do the backspace/delete action

+			editor.getDoc().execCommand(isDelete ? 'ForwardDelete' : 'Delete', false, null);

+

+			// Find all odd apple-style-spans

+			blockElm = dom.getParent(rng.startContainer, dom.isBlock);

+			tinymce.each(dom.select('span.Apple-style-span,font.Apple-style-span', blockElm), function(span) {

+				var bm = selection.getBookmark();

+

+				if (clonedSpan) {

+					dom.replace(clonedSpan.cloneNode(false), span, true);

+				} else {

+					dom.remove(span, true);

+				}

 

-	function cleanupStylesWhenDeleting(ed) {

-		var dom = ed.dom, selection = ed.selection;

+				// Restore the selection

+				selection.moveToBookmark(bm);

+			});

+		};

 

-		ed.onKeyDown.add(function(ed, e) {

-			var rng, blockElm, node, clonedSpan, isDelete;

+		editor.onKeyDown.add(function(editor, e) {

+			var isDelete;

 

 			isDelete = e.keyCode == DELETE;

-			if (isDelete || e.keyCode == BACKSPACE) {

+			if (!e.isDefaultPrevented() && (isDelete || e.keyCode == BACKSPACE) && !VK.modifierPressed(e)) {

 				e.preventDefault();

-				rng = selection.getRng();

+				removeMergedFormatSpans(isDelete);

+			}

+		});

+

+		editor.addCommand('Delete', function() {removeMergedFormatSpans();});

+	};

+	

+	function emptyEditorWhenDeleting() {

+		function getEndPointNode(rng, start) {

+			var container, offset, prefix = start ? 'start' : 'end';

+

+			container = rng[prefix + 'Container'];

+			offset = rng[prefix + 'Offset'];

 

-				// Find root block

-				blockElm = dom.getParent(rng.startContainer, dom.isBlock);

+			// Resolve indexed container

+			if (container.nodeType == 1 && container.hasChildNodes()) {

+				container = container.childNodes[Math.min(start ? offset : (offset > 0 ? offset - 1 : 0), container.childNodes.length - 1)]

+			}

+

+			return container;

+		};

 

-				// On delete clone the root span of the next block element

-				if (isDelete)

-					blockElm = dom.getNext(blockElm, dom.isBlock);

+		function isAtStartEndOfBody(rng, start) {

+			var container, offset, root, childNode, prefix = start ? 'start' : 'end', isAfter;

 

-				// Locate root span element and clone it since it would otherwise get merged by the "apple-style-span" on delete/backspace

-				if (blockElm) {

-					node = blockElm.firstChild;

+			container = rng[prefix + 'Container'];

+			offset = rng[prefix + 'Offset'];

+			root = dom.getRoot();

 

-					// Ignore empty text nodes

-					while (node.nodeType == 3 && node.nodeValue.length == 0)

-						node = node.nextSibling;

+			// Resolve indexed container

+			if (container.nodeType == 1) {

+				isAfter = offset >= container.childNodes.length;

+				container = getEndPointNode(rng, start);

 

-					if (node && node.nodeName === 'SPAN') {

-						clonedSpan = node.cloneNode(false);

-					}

+				if (container.nodeType == 3) {

+					offset = start && !isAfter ? 0 : container.nodeValue.length;

 				}

+			}

 

-				// Do the backspace/delete actiopn

-				ed.getDoc().execCommand(isDelete ? 'ForwardDelete' : 'Delete', false, null);

+			// Check if start/end is in the middle of text

+			if (container.nodeType == 3 && ((start && offset > 0) || (!start && offset < container.nodeValue.length))) {

+				return false;

+			}

 

-				// Find all odd apple-style-spans

-				blockElm = dom.getParent(rng.startContainer, dom.isBlock);

-				tinymce.each(dom.select('span.Apple-style-span,font.Apple-style-span', blockElm), function(span) {

-					var bm = selection.getBookmark();

+			// Walk up the DOM tree to see if the endpoint is at the beginning/end of body

+			while (container !== root) {

+				childNode = container.parentNode[start ? 'firstChild' : 'lastChild'];

 

-					if (clonedSpan) {

-						dom.replace(clonedSpan.cloneNode(false), span, true);

-					} else {

-						dom.remove(span, true);

-					}

+				// If first/last element is a BR then jump to it's sibling in case: <p>x<br></p>

+				if (childNode.nodeName == "BR") {

+					childNode = childNode[start ? 'nextSibling' : 'previousSibling'] || childNode;

+				}

 

-					// Restore the selection

-					selection.moveToBookmark(bm);

-				});

+				// If the childNode isn't the container node then break in case <p><span>A</span>[X]</p>

+				if (childNode !== container) {

+					return false;

+				}

+

+				container = container.parentNode;

 			}

-		});

-	};

 

-	function emptyEditorWhenDeleting(ed) {

-		ed.onKeyUp.add(function(ed, e) {

-			var keyCode = e.keyCode;

+			return true;

+		};

 

-			if (keyCode == DELETE || keyCode == BACKSPACE) {

-				if (ed.dom.isEmpty(ed.getBody())) {

-					ed.setContent('', {format : 'raw'});

-					ed.nodeChanged();

-					return;

+		editor.onKeyDown.addToTop(function(editor, e) {

+			var rng, keyCode = e.keyCode;

+

+			if (!e.isDefaultPrevented() && (keyCode == DELETE || keyCode == BACKSPACE)) {

+				rng = selection.getRng(true);

+

+				if (isAtStartEndOfBody(rng, true) && isAtStartEndOfBody(rng, false) &&

+					(rng.collapsed || dom.findCommonAncestor(getEndPointNode(rng, true), getEndPointNode(rng)) === dom.getRoot())) {

+					editor.setContent('');

+					editor.nodeChanged();

+					e.preventDefault();

 				}

 			}

 		});

 	};

 

-	function inputMethodFocus(ed) {

-		ed.dom.bind(ed.getDoc(), 'focusin', function() {

-			ed.selection.setRng(ed.selection.getRng());

-		});

+	function inputMethodFocus() {

+		if (!editor.settings.content_editable) {

+			// Case 1 IME doesn't initialize if you focus the document

+			dom.bind(editor.getDoc(), 'focusin', function(e) {

+				selection.setRng(selection.getRng());

+			});

+

+			// Case 2 IME doesn't initialize if you click the documentElement it also doesn't properly fire the focusin event

+			dom.bind(editor.getDoc(), 'mousedown', function(e) {

+				if (e.target == editor.getDoc().documentElement) {

+					editor.getWin().focus();

+					selection.setRng(selection.getRng());

+				}

+			});

+		}

 	};

 

-	function focusBody(ed) {

+	function removeHrOnBackspace() {

+		editor.onKeyDown.add(function(editor, e) {

+			if (!e.isDefaultPrevented() && e.keyCode === BACKSPACE) {

+				if (selection.isCollapsed() && selection.getRng(true).startOffset === 0) {

+					var node = selection.getNode();

+					var previousSibling = node.previousSibling;

+

+					if (previousSibling && previousSibling.nodeName && previousSibling.nodeName.toLowerCase() === "hr") {

+						dom.remove(previousSibling);

+						tinymce.dom.Event.cancel(e);

+					}

+				}

+			}

+		})

+	}

+

+	function focusBody() {

 		// Fix for a focus bug in FF 3.x where the body element

 		// wouldn't get proper focus if the user clicked on the HTML element

 		if (!Range.prototype.getClientRects) { // Detect getClientRects got introduced in FF 4

-			ed.onMouseDown.add(function(ed, e) {

+			editor.onMouseDown.add(function(editor, e) {

 				if (e.target.nodeName === "HTML") {

-					var body = ed.getBody();

+					var body = editor.getBody();

 

 					// Blur the body it's focused but not correctly focused

 					body.blur();

@@ -1140,49 +1282,376 @@ tinymce.create('static tinymce.util.XHR', {
 		}

 	};

 

-	function selectControlElements(ed) {

-		ed.onClick.add(function(ed, e) {

+	function selectControlElements() {

+		editor.onClick.add(function(editor, e) {

 			e = e.target;

 

 			// Workaround for bug, http://bugs.webkit.org/show_bug.cgi?id=12250

 			// WebKit can't even do simple things like selecting an image

 			// Needs tobe the setBaseAndExtend or it will fail to select floated images

-			if (/^(IMG|HR)$/.test(e.nodeName))

-				ed.selection.getSel().setBaseAndExtent(e, 0, e, 1);

+			if (/^(IMG|HR)$/.test(e.nodeName)) {

+				selection.getSel().setBaseAndExtent(e, 0, e, 1);

+			}

 

-			if (e.nodeName == 'A' && ed.dom.hasClass(e, 'mceItemAnchor'))

-				ed.selection.select(e);

+			if (e.nodeName == 'A' && dom.hasClass(e, 'mceItemAnchor')) {

+				selection.select(e);

+			}

 

-			ed.nodeChanged();

+			editor.nodeChanged();

 		});

 	};

 

-	tinymce.create('tinymce.util.Quirks', {

-		Quirks: function(ed) {

-			// WebKit

-			if (tinymce.isWebKit) {

-				cleanupStylesWhenDeleting(ed);

-				emptyEditorWhenDeleting(ed);

-				inputMethodFocus(ed);

-				selectControlElements(ed);

+	function removeStylesWhenDeletingAccrossBlockElements() {

+		function getAttributeApplyFunction() {

+			var template = dom.getAttribs(selection.getStart().cloneNode(false));

+

+			return function() {

+				var target = selection.getStart();

+

+				if (target !== editor.getBody()) {

+					dom.setAttrib(target, "style", null);

+

+					tinymce.each(template, function(attr) {

+						target.setAttributeNode(attr.cloneNode(true));

+					});

+				}

+			};

+		}

+

+		function isSelectionAcrossElements() {

+			return !selection.isCollapsed() && selection.getStart() != selection.getEnd();

+		}

+

+		function blockEvent(editor, e) {

+			e.preventDefault();

+			return false;

+		}

+

+		editor.onKeyPress.add(function(editor, e) {

+			var applyAttributes;

+

+			if ((e.keyCode == 8 || e.keyCode == 46) && isSelectionAcrossElements()) {

+				applyAttributes = getAttributeApplyFunction();

+				editor.getDoc().execCommand('delete', false, null);

+				applyAttributes();

+				e.preventDefault();

+				return false;

 			}

+		});

 

-			// IE

-			if (tinymce.isIE) {

-				emptyEditorWhenDeleting(ed);

+		dom.bind(editor.getDoc(), 'cut', function(e) {

+			var applyAttributes;

+

+			if (isSelectionAcrossElements()) {

+				applyAttributes = getAttributeApplyFunction();

+				editor.onKeyUp.addToTop(blockEvent);

+

+				setTimeout(function() {

+					applyAttributes();

+					editor.onKeyUp.remove(blockEvent);

+				}, 0);

 			}

+		});

+	}

 

-			// Gecko

-			if (tinymce.isGecko) {

-				focusBody(ed);

+	function selectionChangeNodeChanged() {

+		var lastRng, selectionTimer;

+

+		dom.bind(editor.getDoc(), 'selectionchange', function() {

+			if (selectionTimer) {

+				clearTimeout(selectionTimer);

+				selectionTimer = 0;

+			}

+

+			selectionTimer = window.setTimeout(function() {

+				var rng = selection.getRng();

+

+				// Compare the ranges to see if it was a real change or not

+				if (!lastRng || !tinymce.dom.RangeUtils.compareRanges(rng, lastRng)) {

+					editor.nodeChanged();

+					lastRng = rng;

+				}

+			}, 50);

+		});

+	}

+

+	function ensureBodyHasRoleApplication() {

+		document.body.setAttribute("role", "application");

+	}

+

+	function disableBackspaceIntoATable() {

+		editor.onKeyDown.add(function(editor, e) {

+			if (!e.isDefaultPrevented() && e.keyCode === BACKSPACE) {

+				if (selection.isCollapsed() && selection.getRng(true).startOffset === 0) {

+					var previousSibling = selection.getNode().previousSibling;

+					if (previousSibling && previousSibling.nodeName && previousSibling.nodeName.toLowerCase() === "table") {

+						return tinymce.dom.Event.cancel(e);

+					}

+				}

 			}

+		})

+	}

+

+	function addNewLinesBeforeBrInPre() {

+		var documentMode = editor.getDoc().documentMode;

+

+		// IE8+ rendering mode does the right thing with BR in PRE

+		if (documentMode && documentMode > 7) {

+			return;

 		}

-	});

-})(tinymce);

+

+		 // Enable display: none in area and add a specific class that hides all BR elements in PRE to

+		 // avoid the caret from getting stuck at the BR elements while pressing the right arrow key

+		setEditorCommandState('RespectVisibilityInDesign', true);

+		dom.addClass(editor.getBody(), 'mceHideBrInPre');

+

+		// Adds a \n before all BR elements in PRE to get them visual

+		editor.parser.addNodeFilter('pre', function(nodes, name) {

+			var i = nodes.length, brNodes, j, brElm, sibling;

+

+			while (i--) {

+				brNodes = nodes[i].getAll('br');

+				j = brNodes.length;

+				while (j--) {

+					brElm = brNodes[j];

+

+					// Add \n before BR in PRE elements on older IE:s so the new lines get rendered

+					sibling = brElm.prev;

+					if (sibling && sibling.type === 3 && sibling.value.charAt(sibling.value - 1) != '\n') {

+						sibling.value += '\n';

+					} else {

+						brElm.parent.insert(new tinymce.html.Node('#text', 3), brElm, true).value = '\n';

+					}

+				}

+			}

+		});

+

+		// Removes any \n before BR elements in PRE since other browsers and in contentEditable=false mode they will be visible

+		editor.serializer.addNodeFilter('pre', function(nodes, name) {

+			var i = nodes.length, brNodes, j, brElm, sibling;

+

+			while (i--) {

+				brNodes = nodes[i].getAll('br');

+				j = brNodes.length;

+				while (j--) {

+					brElm = brNodes[j];

+					sibling = brElm.prev;

+					if (sibling && sibling.type == 3) {

+						sibling.value = sibling.value.replace(/\r?\n$/, '');

+					}

+				}

+			}

+		});

+	}

+

+	function removePreSerializedStylesWhenSelectingControls() {

+		dom.bind(editor.getBody(), 'mouseup', function(e) {

+			var value, node = selection.getNode();

+

+			// Moved styles to attributes on IMG eements

+			if (node.nodeName == 'IMG') {

+				// Convert style width to width attribute

+				if (value = dom.getStyle(node, 'width')) {

+					dom.setAttrib(node, 'width', value.replace(/[^0-9%]+/g, ''));

+					dom.setStyle(node, 'width', '');

+				}

+

+				// Convert style height to height attribute

+				if (value = dom.getStyle(node, 'height')) {

+					dom.setAttrib(node, 'height', value.replace(/[^0-9%]+/g, ''));

+					dom.setStyle(node, 'height', '');

+				}

+			}

+		});

+	}

+

+	function keepInlineElementOnDeleteBackspace() {

+		editor.onKeyDown.add(function(editor, e) {

+			var isDelete, rng, container, offset, brElm, sibling, collapsed;

+

+			isDelete = e.keyCode == DELETE;

+			if (!e.isDefaultPrevented() && (isDelete || e.keyCode == BACKSPACE) && !VK.modifierPressed(e)) {

+				rng = selection.getRng();

+				container = rng.startContainer;

+				offset = rng.startOffset;

+				collapsed = rng.collapsed;

+

+				// Override delete if the start container is a text node and is at the beginning of text or

+				// just before/after the last character to be deleted in collapsed mode

+				if (container.nodeType == 3 && container.nodeValue.length > 0 && ((offset === 0 && !collapsed) || (collapsed && offset === (isDelete ? 0 : 1)))) {

+					nonEmptyElements = editor.schema.getNonEmptyElements();

+

+					// Prevent default logic since it's broken

+					e.preventDefault();

+

+					// Insert a BR before the text node this will prevent the containing element from being deleted/converted

+					brElm = dom.create('br', {id: '__tmp'});

+					container.parentNode.insertBefore(brElm, container);

+

+					// Do the browser delete

+					editor.getDoc().execCommand(isDelete ? 'ForwardDelete' : 'Delete', false, null);

+

+					// Check if the previous sibling is empty after deleting for example: <p><b></b>|</p>

+					container = selection.getRng().startContainer;

+					sibling = container.previousSibling;

+					if (sibling && sibling.nodeType == 1 && !dom.isBlock(sibling) && dom.isEmpty(sibling) && !nonEmptyElements[sibling.nodeName.toLowerCase()]) {

+						dom.remove(sibling);

+					}

+

+					// Remove the temp element we inserted

+					dom.remove('__tmp');

+				}

+			}

+		});

+	}

+

+	function removeBlockQuoteOnBackSpace() {

+		// Add block quote deletion handler

+		editor.onKeyDown.add(function(editor, e) {

+			var rng, container, offset, root, parent;

+

+			if (e.isDefaultPrevented() || e.keyCode != VK.BACKSPACE) {

+				return;

+			}

+

+			rng = selection.getRng();

+			container = rng.startContainer;

+			offset = rng.startOffset;

+			root = dom.getRoot();

+			parent = container;

+

+			if (!rng.collapsed || offset !== 0) {

+				return;

+			}

+

+			while (parent && parent.parentNode && parent.parentNode.firstChild == parent && parent.parentNode != root) {

+				parent = parent.parentNode;

+			}

+

+			// Is the cursor at the beginning of a blockquote?

+			if (parent.tagName === 'BLOCKQUOTE') {

+				// Remove the blockquote

+				editor.formatter.toggle('blockquote', null, parent);

+

+				// Move the caret to the beginning of container

+				rng.setStart(container, 0);

+				rng.setEnd(container, 0);

+				selection.setRng(rng);

+				selection.collapse(false);

+			}

+		});

+	};

+

+	function setGeckoEditingOptions() {

+		function setOpts() {

+			editor._refreshContentEditable();

+

+			setEditorCommandState("StyleWithCSS", false);

+			setEditorCommandState("enableInlineTableEditing", false);

+

+			if (!settings.object_resizing) {

+				setEditorCommandState("enableObjectResizing", false);

+			}

+		};

+

+		if (!settings.readonly) {

+			editor.onBeforeExecCommand.add(setOpts);

+			editor.onMouseDown.add(setOpts);

+		}

+	};

+

+	function addBrAfterLastLinks() {

+		function fixLinks(editor, o) {

+			tinymce.each(dom.select('a'), function(node) {

+				var parentNode = node.parentNode, root = dom.getRoot();

+

+				if (parentNode.lastChild === node) {

+					while (parentNode && !dom.isBlock(parentNode)) {

+						if (parentNode.parentNode.lastChild !== parentNode || parentNode === root) {

+							return;

+						}

+

+						parentNode = parentNode.parentNode;

+					}

+

+					dom.add(parentNode, 'br', {'data-mce-bogus' : 1});

+				}

+			});

+		};

+

+		editor.onExecCommand.add(function(editor, cmd) {

+			if (cmd === 'CreateLink') {

+				fixLinks(editor);

+			}

+		});

+

+		editor.onSetContent.add(selection.onSetContent.add(fixLinks));

+	};

+

+	function removeGhostSelection() {

+		function repaint(sender, args) {

+			if (!sender || !args.initial) {

+				editor.execCommand('mceRepaint');

+			}

+		};

+

+		editor.onUndo.add(repaint);

+		editor.onRedo.add(repaint);

+		editor.onSetContent.add(repaint);

+	};

+

+	function deleteImageOnBackSpace() {

+		editor.onKeyDown.add(function(editor, e) {

+			if (!e.isDefaultPrevented() && e.keyCode == 8 && selection.getNode().nodeName == 'IMG') {

+				e.preventDefault();

+				editor.undoManager.beforeChange();

+				dom.remove(selection.getNode());

+				editor.undoManager.add();

+			}

+		});

+	};

+

+	// All browsers

+	disableBackspaceIntoATable();

+	removeBlockQuoteOnBackSpace();

+	emptyEditorWhenDeleting();

+

+	// WebKit

+	if (tinymce.isWebKit) {

+		keepInlineElementOnDeleteBackspace();

+		cleanupStylesWhenDeleting();

+		inputMethodFocus();

+		selectControlElements();

+

+		// iOS

+		if (tinymce.isIDevice) {

+			selectionChangeNodeChanged();

+		}

+	}

+

+	// IE

+	if (tinymce.isIE) {

+		removeHrOnBackspace();

+		ensureBodyHasRoleApplication();

+		addNewLinesBeforeBrInPre();

+		removePreSerializedStylesWhenSelectingControls();

+		deleteImageOnBackSpace();

+	}

+

+	// Gecko

+	if (tinymce.isGecko) {

+		removeHrOnBackspace();

+		focusBody();

+		removeStylesWhenDeletingAccrossBlockElements();

+		setGeckoEditingOptions();

+		addBrAfterLastLinks();

+		removeGhostSelection();

+	}

+};

 (function(tinymce) {

 	var namedEntities, baseEntities, reverseEntities,

-		attrsCharsRegExp = /[&<>\"\u007E-\uD7FF]|[\uD800-\uDBFF][\uDC00-\uDFFF]/g,

-		textCharsRegExp = /[<>&\u007E-\uD7FF]|[\uD800-\uDBFF][\uDC00-\uDFFF]/g,

+		attrsCharsRegExp = /[&<>\"\u007E-\uD7FF\uE000-\uFFEF]|[\uD800-\uDBFF][\uDC00-\uDFFF]/g,

+		textCharsRegExp = /[<>&\u007E-\uD7FF\uE000-\uFFEF]|[\uD800-\uDBFF][\uDC00-\uDFFF]/g,

 		rawCharsRegExp = /[<>&\"\']/g,

 		entityRegExp = /&(#x|#)?([\w]+);/g,

 		asciiMap = {

@@ -1271,8 +1740,7 @@ tinymce.create('static tinymce.util.XHR', {
 		'rfloor,8p9,lang,8pa,rang,9ea,loz,9j0,spades,9j3,clubs,9j5,hearts,9j6,diams,ai,OElig,aj,oelig,b0,' +

 		'Scaron,b1,scaron,bo,Yuml,m6,circ,ms,tilde,802,ensp,803,emsp,809,thinsp,80c,zwnj,80d,zwj,80e,lrm,' +

 		'80f,rlm,80j,ndash,80k,mdash,80o,lsquo,80p,rsquo,80q,sbquo,80s,ldquo,80t,rdquo,80u,bdquo,810,dagger,' +

-		'811,Dagger,81g,permil,81p,lsaquo,81q,rsaquo,85c,euro'

-	, 32);

+		'811,Dagger,81g,permil,81p,lsaquo,81q,rsaquo,85c,euro', 32);

 

 	tinymce.html = tinymce.html || {};

 

@@ -1483,7 +1951,27 @@ tinymce.html.Styles = function(settings, schema) {
 					str = str.replace(/\\([\'\";:])/g, "$1");

 

 				return str;

-			}

+			};

+

+			function processUrl(match, url, url2, url3, str, str2) {

+				str = str || str2;

+

+				if (str) {

+					str = decode(str);

+

+					// Force strings into single quote format

+					return "'" + str.replace(/\'/g, "\\'") + "'";

+				}

+

+				url = decode(url || url2 || url3);

+

+				// Convert the URL to relative/absolute depending on config

+				if (urlConverter)

+					url = urlConverter.call(urlConverterScope, url, 'style');

+

+				// Output new URL format

+				return "url('" + url.replace(/\'/g, "\\'") + "')";

+			};

 

 			if (css) {

 				// Encode \" \' % and ; and : inside strings so they don't interfere with the style parsing

@@ -1507,26 +1995,7 @@ tinymce.html.Styles = function(settings, schema) {
 						value = value.replace(rgbRegExp, toHex);

 

 						// Convert URLs and force them into url('value') format

-						value = value.replace(urlOrStrRegExp, function(match, url, url2, url3, str, str2) {

-							str = str || str2;

-

-							if (str) {

-								str = decode(str);

-

-								// Force strings into single quote format

-								return "'" + str.replace(/\'/g, "\\'") + "'";

-							}

-

-							url = decode(url || url2 || url3);

-

-							// Convert the URL to relative/absolute depending on config

-							if (urlConverter)

-								url = urlConverter.call(urlConverterScope, url, 'style');

-

-							// Output new URL format

-							return "url('" + url.replace(/\'/g, "\\'") + "')";

-						});

-

+						value = value.replace(urlOrStrRegExp, processUrl);

 						styles[name] = isEncoded ? decode(value, true) : value;

 					}

 

@@ -1589,8 +2058,7 @@ tinymce.html.Styles = function(settings, schema) {
 };

 

 (function(tinymce) {

-	var transitional = {}, boolAttrMap, blockElementsMap, shortEndedElementsMap, nonEmptyElementsMap, customElementsMap = {},

-		defaultWhiteSpaceElementsMap, selfClosingElementsMap, makeMap = tinymce.makeMap, each = tinymce.each;

+	var mapCache = {}, makeMap = tinymce.makeMap, each = tinymce.each;

 

 	function split(str, delim) {

 		return str.split(delim || ',');

@@ -1625,142 +2093,281 @@ tinymce.html.Styles = function(settings, schema) {
 		return elements;

 	};

 

-	// Build a lookup table for block elements both lowercase and uppercase

-	blockElementsMap = 'h1,h2,h3,h4,h5,h6,hr,p,div,address,pre,form,table,tbody,thead,tfoot,' + 

-						'th,tr,td,li,ol,ul,caption,blockquote,center,dl,dt,dd,dir,fieldset,' + 

-						'noscript,menu,isindex,samp,header,footer,article,section,hgroup';

-	blockElementsMap = makeMap(blockElementsMap, ',', makeMap(blockElementsMap.toUpperCase()));

-

-	// This is the XHTML 1.0 transitional elements with it's attributes and children packed to reduce it's size

-	transitional = unpack({

-		Z : 'H|K|N|O|P',

-		Y : 'X|form|R|Q',

-		ZG : 'E|span|width|align|char|charoff|valign',

-		X : 'p|T|div|U|W|isindex|fieldset|table',

-		ZF : 'E|align|char|charoff|valign',

-		W : 'pre|hr|blockquote|address|center|noframes',

-		ZE : 'abbr|axis|headers|scope|rowspan|colspan|align|char|charoff|valign|nowrap|bgcolor|width|height',

-		ZD : '[E][S]',

-		U : 'ul|ol|dl|menu|dir',

-		ZC : 'p|Y|div|U|W|table|br|span|bdo|object|applet|img|map|K|N|Q',

-		T : 'h1|h2|h3|h4|h5|h6',

-		ZB : 'X|S|Q',

-		S : 'R|P',

-		ZA : 'a|G|J|M|O|P',

-		R : 'a|H|K|N|O',

-		Q : 'noscript|P',

-		P : 'ins|del|script',

-		O : 'input|select|textarea|label|button',

-		N : 'M|L',

-		M : 'em|strong|dfn|code|q|samp|kbd|var|cite|abbr|acronym',

-		L : 'sub|sup',

-		K : 'J|I',

-		J : 'tt|i|b|u|s|strike',

-		I : 'big|small|font|basefont',

-		H : 'G|F',

-		G : 'br|span|bdo',

-		F : 'object|applet|img|map|iframe',

-		E : 'A|B|C',

-		D : 'accesskey|tabindex|onfocus|onblur',

-		C : 'onclick|ondblclick|onmousedown|onmouseup|onmouseover|onmousemove|onmouseout|onkeypress|onkeydown|onkeyup',

-		B : 'lang|xml:lang|dir',

-		A : 'id|class|style|title'

-	}, 'script[id|charset|type|language|src|defer|xml:space][]' + 

-		'style[B|id|type|media|title|xml:space][]' + 

-		'object[E|declare|classid|codebase|data|type|codetype|archive|standby|width|height|usemap|name|tabindex|align|border|hspace|vspace][#|param|Y]' + 

-		'param[id|name|value|valuetype|type][]' + 

-		'p[E|align][#|S]' + 

-		'a[E|D|charset|type|name|href|hreflang|rel|rev|shape|coords|target][#|Z]' + 

-		'br[A|clear][]' + 

-		'span[E][#|S]' + 

-		'bdo[A|C|B][#|S]' + 

-		'applet[A|codebase|archive|code|object|alt|name|width|height|align|hspace|vspace][#|param|Y]' + 

-		'h1[E|align][#|S]' + 

-		'img[E|src|alt|name|longdesc|width|height|usemap|ismap|align|border|hspace|vspace][]' + 

-		'map[B|C|A|name][X|form|Q|area]' + 

-		'h2[E|align][#|S]' + 

-		'iframe[A|longdesc|name|src|frameborder|marginwidth|marginheight|scrolling|align|width|height][#|Y]' + 

-		'h3[E|align][#|S]' + 

-		'tt[E][#|S]' + 

-		'i[E][#|S]' + 

-		'b[E][#|S]' + 

-		'u[E][#|S]' + 

-		's[E][#|S]' + 

-		'strike[E][#|S]' + 

-		'big[E][#|S]' + 

-		'small[E][#|S]' + 

-		'font[A|B|size|color|face][#|S]' + 

-		'basefont[id|size|color|face][]' + 

-		'em[E][#|S]' + 

-		'strong[E][#|S]' + 

-		'dfn[E][#|S]' + 

-		'code[E][#|S]' + 

-		'q[E|cite][#|S]' + 

-		'samp[E][#|S]' + 

-		'kbd[E][#|S]' + 

-		'var[E][#|S]' + 

-		'cite[E][#|S]' + 

-		'abbr[E][#|S]' + 

-		'acronym[E][#|S]' + 

-		'sub[E][#|S]' + 

-		'sup[E][#|S]' + 

-		'input[E|D|type|name|value|checked|disabled|readonly|size|maxlength|src|alt|usemap|onselect|onchange|accept|align][]' + 

-		'select[E|name|size|multiple|disabled|tabindex|onfocus|onblur|onchange][optgroup|option]' + 

-		'optgroup[E|disabled|label][option]' + 

-		'option[E|selected|disabled|label|value][]' + 

-		'textarea[E|D|name|rows|cols|disabled|readonly|onselect|onchange][]' + 

-		'label[E|for|accesskey|onfocus|onblur][#|S]' + 

-		'button[E|D|name|value|type|disabled][#|p|T|div|U|W|table|G|object|applet|img|map|K|N|Q]' + 

-		'h4[E|align][#|S]' + 

-		'ins[E|cite|datetime][#|Y]' + 

-		'h5[E|align][#|S]' + 

-		'del[E|cite|datetime][#|Y]' + 

-		'h6[E|align][#|S]' + 

-		'div[E|align][#|Y]' + 

-		'ul[E|type|compact][li]' + 

-		'li[E|type|value][#|Y]' + 

-		'ol[E|type|compact|start][li]' + 

-		'dl[E|compact][dt|dd]' + 

-		'dt[E][#|S]' + 

-		'dd[E][#|Y]' + 

-		'menu[E|compact][li]' + 

-		'dir[E|compact][li]' + 

-		'pre[E|width|xml:space][#|ZA]' + 

-		'hr[E|align|noshade|size|width][]' + 

-		'blockquote[E|cite][#|Y]' + 

-		'address[E][#|S|p]' + 

-		'center[E][#|Y]' + 

-		'noframes[E][#|Y]' + 

-		'isindex[A|B|prompt][]' + 

-		'fieldset[E][#|legend|Y]' + 

-		'legend[E|accesskey|align][#|S]' + 

-		'table[E|summary|width|border|frame|rules|cellspacing|cellpadding|align|bgcolor][caption|col|colgroup|thead|tfoot|tbody|tr]' + 

-		'caption[E|align][#|S]' + 

-		'col[ZG][]' + 

-		'colgroup[ZG][col]' + 

-		'thead[ZF][tr]' + 

-		'tr[ZF|bgcolor][th|td]' + 

-		'th[E|ZE][#|Y]' + 

-		'form[E|action|method|name|enctype|onsubmit|onreset|accept|accept-charset|target][#|X|R|Q]' + 

-		'noscript[E][#|Y]' + 

-		'td[E|ZE][#|Y]' + 

-		'tfoot[ZF][tr]' + 

-		'tbody[ZF][tr]' + 

-		'area[E|D|shape|coords|href|nohref|alt|target][]' + 

-		'base[id|href|target][]' + 

-		'body[E|onload|onunload|background|bgcolor|text|link|vlink|alink][#|Y]'

-	);

-

-	boolAttrMap = makeMap('checked,compact,declare,defer,disabled,ismap,multiple,nohref,noresize,noshade,nowrap,readonly,selected,autoplay,loop,controls');

-	shortEndedElementsMap = makeMap('area,base,basefont,br,col,frame,hr,img,input,isindex,link,meta,param,embed,source');

-	nonEmptyElementsMap = tinymce.extend(makeMap('td,th,iframe,video,audio,object'), shortEndedElementsMap);

-	defaultWhiteSpaceElementsMap = makeMap('pre,script,style,textarea');

-	selfClosingElementsMap = makeMap('colgroup,dd,dt,li,options,p,td,tfoot,th,thead,tr');

+	function getHTML5() {

+		var html5 = mapCache.html5;

+

+		if (!html5) {

+			html5 = mapCache.html5 = unpack({

+					A : 'id|accesskey|class|dir|draggable|item|hidden|itemprop|role|spellcheck|style|subject|title',

+					B : '#|a|abbr|area|audio|b|bdo|br|button|canvas|cite|code|command|datalist|del|dfn|em|embed|i|iframe|img|input|ins|kbd|keygen|label|link|map|mark|meta|meter|noscript|object|output|progress|q|ruby|samp|script|select|small|span|strong|sub|sup|svg|textarea|time|var|video',

+					C : '#|a|abbr|area|address|article|aside|audio|b|bdo|blockquote|br|button|canvas|cite|code|command|datalist|del|details|dfn|dialog|div|dl|em|embed|fieldset|figure|footer|form|h1|h2|h3|h4|h5|h6|header|hgroup|hr|i|iframe|img|input|ins|kbd|keygen|label|link|map|mark|menu|meta|meter|nav|noscript|ol|object|output|p|pre|progress|q|ruby|samp|script|section|select|small|span|strong|style|sub|sup|svg|table|textarea|time|ul|var|video'

+				}, 'html[A|manifest][body|head]' +

+					'head[A][base|command|link|meta|noscript|script|style|title]' +

+					'title[A][#]' +

+					'base[A|href|target][]' +

+					'link[A|href|rel|media|type|sizes][]' +

+					'meta[A|http-equiv|name|content|charset][]' +

+					'style[A|type|media|scoped][#]' +

+					'script[A|charset|type|src|defer|async][#]' +

+					'noscript[A][C]' +

+					'body[A][C]' +

+					'section[A][C]' +

+					'nav[A][C]' +

+					'article[A][C]' +

+					'aside[A][C]' +

+					'h1[A][B]' +

+					'h2[A][B]' +

+					'h3[A][B]' +

+					'h4[A][B]' +

+					'h5[A][B]' +

+					'h6[A][B]' +

+					'hgroup[A][h1|h2|h3|h4|h5|h6]' +

+					'header[A][C]' +

+					'footer[A][C]' +

+					'address[A][C]' +

+					'p[A][B]' +

+					'br[A][]' +

+					'pre[A][B]' +

+					'dialog[A][dd|dt]' +

+					'blockquote[A|cite][C]' +

+					'ol[A|start|reversed][li]' +

+					'ul[A][li]' +

+					'li[A|value][C]' +

+					'dl[A][dd|dt]' +

+					'dt[A][B]' +

+					'dd[A][C]' +

+					'a[A|href|target|ping|rel|media|type][C]' +

+					'em[A][B]' +

+					'strong[A][B]' +

+					'small[A][B]' +

+					'cite[A][B]' +

+					'q[A|cite][B]' +

+					'dfn[A][B]' +

+					'abbr[A][B]' +

+					'code[A][B]' +

+					'var[A][B]' +

+					'samp[A][B]' +

+					'kbd[A][B]' +

+					'sub[A][B]' +

+					'sup[A][B]' +

+					'i[A][B]' +

+					'b[A][B]' +

+					'mark[A][B]' +

+					'progress[A|value|max][B]' +

+					'meter[A|value|min|max|low|high|optimum][B]' +

+					'time[A|datetime][B]' +

+					'ruby[A][B|rt|rp]' +

+					'rt[A][B]' +

+					'rp[A][B]' +

+					'bdo[A][B]' +

+					'span[A][B]' +

+					'ins[A|cite|datetime][B]' +

+					'del[A|cite|datetime][B]' +

+					'figure[A][C|legend|figcaption]' +

+					'figcaption[A][C]' +

+					'img[A|alt|src|height|width|usemap|ismap][]' +

+					'iframe[A|name|src|height|width|sandbox|seamless][]' +

+					'embed[A|src|height|width|type][]' +

+					'object[A|data|type|height|width|usemap|name|form|classid][param]' +

+					'param[A|name|value][]' +

+					'details[A|open][C|legend]' +

+					'command[A|type|label|icon|disabled|checked|radiogroup][]' +

+					'menu[A|type|label][C|li]' +

+					'legend[A][C|B]' +

+					'div[A][C]' +

+					'source[A|src|type|media][]' +

+					'audio[A|src|autobuffer|autoplay|loop|controls][source]' +

+					'video[A|src|autobuffer|autoplay|loop|controls|width|height|poster][source]' +

+					'hr[A][]' +

+					'form[A|accept-charset|action|autocomplete|enctype|method|name|novalidate|target][C]' +

+					'fieldset[A|disabled|form|name][C|legend]' +

+					'label[A|form|for][B]' +

+					'input[A|type|accept|alt|autocomplete|checked|disabled|form|formaction|formenctype|formmethod|formnovalidate|formtarget|height|list|max|maxlength|min|multiple|pattern|placeholder|readonly|required|size|src|step|width|files|value][]' +

+					'button[A|autofocus|disabled|form|formaction|formenctype|formmethod|formnovalidate|formtarget|name|value|type][B]' +

+					'select[A|autofocus|disabled|form|multiple|name|size][option|optgroup]' +

+					'datalist[A][B|option]' +

+					'optgroup[A|disabled|label][option]' +

+					'option[A|disabled|selected|label|value][]' +

+					'textarea[A|autofocus|disabled|form|maxlength|name|placeholder|readonly|required|rows|cols|wrap][]' +

+					'keygen[A|autofocus|challenge|disabled|form|keytype|name][]' +

+					'output[A|for|form|name][B]' +

+					'canvas[A|width|height][]' +

+					'map[A|name][B|C]' +

+					'area[A|shape|coords|href|alt|target|media|rel|ping|type][]' +

+					'mathml[A][]' +

+					'svg[A][]' +

+					'table[A|summary][caption|colgroup|thead|tfoot|tbody|tr]' +

+					'caption[A][C]' +

+					'colgroup[A|span][col]' +

+					'col[A|span][]' +

+					'thead[A][tr]' +

+					'tfoot[A][tr]' +

+					'tbody[A][tr]' +

+					'tr[A][th|td]' +

+					'th[A|headers|rowspan|colspan|scope][B]' +

+					'td[A|headers|rowspan|colspan][C]'

+			);

+		}

+

+		return html5;

+	};

+

+	function getHTML4() {

+		var html4 = mapCache.html4;

+

+		if (!html4) {

+			// This is the XHTML 1.0 transitional elements with it's attributes and children packed to reduce it's size

+			html4 = mapCache.html4 = unpack({

+				Z : 'H|K|N|O|P',

+				Y : 'X|form|R|Q',

+				ZG : 'E|span|width|align|char|charoff|valign',

+				X : 'p|T|div|U|W|isindex|fieldset|table',

+				ZF : 'E|align|char|charoff|valign',

+				W : 'pre|hr|blockquote|address|center|noframes',

+				ZE : 'abbr|axis|headers|scope|rowspan|colspan|align|char|charoff|valign|nowrap|bgcolor|width|height',

+				ZD : '[E][S]',

+				U : 'ul|ol|dl|menu|dir',

+				ZC : 'p|Y|div|U|W|table|br|span|bdo|object|applet|img|map|K|N|Q',

+				T : 'h1|h2|h3|h4|h5|h6',

+				ZB : 'X|S|Q',

+				S : 'R|P',

+				ZA : 'a|G|J|M|O|P',

+				R : 'a|H|K|N|O',

+				Q : 'noscript|P',

+				P : 'ins|del|script',

+				O : 'input|select|textarea|label|button',

+				N : 'M|L',

+				M : 'em|strong|dfn|code|q|samp|kbd|var|cite|abbr|acronym',

+				L : 'sub|sup',

+				K : 'J|I',

+				J : 'tt|i|b|u|s|strike',

+				I : 'big|small|font|basefont',

+				H : 'G|F',

+				G : 'br|span|bdo',

+				F : 'object|applet|img|map|iframe',

+				E : 'A|B|C',

+				D : 'accesskey|tabindex|onfocus|onblur',

+				C : 'onclick|ondblclick|onmousedown|onmouseup|onmouseover|onmousemove|onmouseout|onkeypress|onkeydown|onkeyup',

+				B : 'lang|xml:lang|dir',

+				A : 'id|class|style|title'

+			}, 'script[id|charset|type|language|src|defer|xml:space][]' + 

+				'style[B|id|type|media|title|xml:space][]' + 

+				'object[E|declare|classid|codebase|data|type|codetype|archive|standby|width|height|usemap|name|tabindex|align|border|hspace|vspace][#|param|Y]' + 

+				'param[id|name|value|valuetype|type][]' + 

+				'p[E|align][#|S]' + 

+				'a[E|D|charset|type|name|href|hreflang|rel|rev|shape|coords|target][#|Z]' + 

+				'br[A|clear][]' + 

+				'span[E][#|S]' + 

+				'bdo[A|C|B][#|S]' + 

+				'applet[A|codebase|archive|code|object|alt|name|width|height|align|hspace|vspace][#|param|Y]' + 

+				'h1[E|align][#|S]' + 

+				'img[E|src|alt|name|longdesc|width|height|usemap|ismap|align|border|hspace|vspace][]' + 

+				'map[B|C|A|name][X|form|Q|area]' + 

+				'h2[E|align][#|S]' + 

+				'iframe[A|longdesc|name|src|frameborder|marginwidth|marginheight|scrolling|align|width|height][#|Y]' + 

+				'h3[E|align][#|S]' + 

+				'tt[E][#|S]' + 

+				'i[E][#|S]' + 

+				'b[E][#|S]' + 

+				'u[E][#|S]' + 

+				's[E][#|S]' + 

+				'strike[E][#|S]' + 

+				'big[E][#|S]' + 

+				'small[E][#|S]' + 

+				'font[A|B|size|color|face][#|S]' + 

+				'basefont[id|size|color|face][]' + 

+				'em[E][#|S]' + 

+				'strong[E][#|S]' + 

+				'dfn[E][#|S]' + 

+				'code[E][#|S]' + 

+				'q[E|cite][#|S]' + 

+				'samp[E][#|S]' + 

+				'kbd[E][#|S]' + 

+				'var[E][#|S]' + 

+				'cite[E][#|S]' + 

+				'abbr[E][#|S]' + 

+				'acronym[E][#|S]' + 

+				'sub[E][#|S]' + 

+				'sup[E][#|S]' + 

+				'input[E|D|type|name|value|checked|disabled|readonly|size|maxlength|src|alt|usemap|onselect|onchange|accept|align][]' + 

+				'select[E|name|size|multiple|disabled|tabindex|onfocus|onblur|onchange][optgroup|option]' + 

+				'optgroup[E|disabled|label][option]' + 

+				'option[E|selected|disabled|label|value][]' + 

+				'textarea[E|D|name|rows|cols|disabled|readonly|onselect|onchange][]' + 

+				'label[E|for|accesskey|onfocus|onblur][#|S]' + 

+				'button[E|D|name|value|type|disabled][#|p|T|div|U|W|table|G|object|applet|img|map|K|N|Q]' + 

+				'h4[E|align][#|S]' + 

+				'ins[E|cite|datetime][#|Y]' + 

+				'h5[E|align][#|S]' + 

+				'del[E|cite|datetime][#|Y]' + 

+				'h6[E|align][#|S]' + 

+				'div[E|align][#|Y]' + 

+				'ul[E|type|compact][li]' + 

+				'li[E|type|value][#|Y]' + 

+				'ol[E|type|compact|start][li]' + 

+				'dl[E|compact][dt|dd]' + 

+				'dt[E][#|S]' + 

+				'dd[E][#|Y]' + 

+				'menu[E|compact][li]' + 

+				'dir[E|compact][li]' + 

+				'pre[E|width|xml:space][#|ZA]' + 

+				'hr[E|align|noshade|size|width][]' + 

+				'blockquote[E|cite][#|Y]' + 

+				'address[E][#|S|p]' + 

+				'center[E][#|Y]' + 

+				'noframes[E][#|Y]' + 

+				'isindex[A|B|prompt][]' + 

+				'fieldset[E][#|legend|Y]' + 

+				'legend[E|accesskey|align][#|S]' + 

+				'table[E|summary|width|border|frame|rules|cellspacing|cellpadding|align|bgcolor][caption|col|colgroup|thead|tfoot|tbody|tr]' + 

+				'caption[E|align][#|S]' + 

+				'col[ZG][]' + 

+				'colgroup[ZG][col]' + 

+				'thead[ZF][tr]' + 

+				'tr[ZF|bgcolor][th|td]' + 

+				'th[E|ZE][#|Y]' + 

+				'form[E|action|method|name|enctype|onsubmit|onreset|accept|accept-charset|target][#|X|R|Q]' + 

+				'noscript[E][#|Y]' + 

+				'td[E|ZE][#|Y]' + 

+				'tfoot[ZF][tr]' + 

+				'tbody[ZF][tr]' + 

+				'area[E|D|shape|coords|href|nohref|alt|target][]' + 

+				'base[id|href|target][]' + 

+				'body[E|onload|onunload|background|bgcolor|text|link|vlink|alink][#|Y]'

+			);

+		}

+

+		return html4;

+	};

 

 	tinymce.html.Schema = function(settings) {

-		var self = this, elements = {}, children = {}, patternElements = [], validStyles, whiteSpaceElementsMap;

+		var self = this, elements = {}, children = {}, patternElements = [], validStyles, schemaItems;

+		var whiteSpaceElementsMap, selfClosingElementsMap, shortEndedElementsMap, boolAttrMap, blockElementsMap, nonEmptyElementsMap, customElementsMap = {};

+

+		// Creates an lookup table map object for the specified option or the default value

+		function createLookupTable(option, default_value, extend) {

+			var value = settings[option];

+

+			if (!value) {

+				// Get cached default map or make it if needed

+				value = mapCache[option];

+

+				if (!value) {

+					value = makeMap(default_value, ' ', makeMap(default_value.toUpperCase(), ' '));

+					value = tinymce.extend(value, extend);

+

+					mapCache[option] = value;

+				}

+			} else {

+				// Create custom map

+				value = makeMap(value, ',', makeMap(value.toUpperCase(), ' '));

+			}

+

+			return value;

+		};

 

 		settings = settings || {};

+		schemaItems = settings.schema == "html5" ? getHTML5() : getHTML4();

 

 		// Allow all elements and attributes if verify_html is set to false

 		if (settings.verify_html === false)

@@ -1776,7 +2383,15 @@ tinymce.html.Styles = function(settings, schema) {
 			});

 		}

 

-		whiteSpaceElementsMap = settings.whitespace_elements ? makeMap(settings.whitespace_elements) : defaultWhiteSpaceElementsMap;

+		// Setup map objects

+		whiteSpaceElementsMap = createLookupTable('whitespace_elements', 'pre script style textarea');

+		selfClosingElementsMap = createLookupTable('self_closing_elements', 'colgroup dd dt li options p td tfoot th thead tr');

+		shortEndedElementsMap = createLookupTable('short_ended_elements', 'area base basefont br col frame hr img input isindex link meta param embed source');

+		boolAttrMap = createLookupTable('boolean_attributes', 'checked compact declare defer disabled ismap multiple nohref noresize noshade nowrap readonly selected autoplay loop controls');

+		nonEmptyElementsMap = createLookupTable('non_empty_elements', 'td th iframe video audio object', shortEndedElementsMap);

+		blockElementsMap = createLookupTable('block_elements', 'h1 h2 h3 h4 h5 h6 hr p div address pre form table tbody thead tfoot ' + 

+						'th tr td li ol ul caption blockquote center dl dt dd dir fieldset ' + 

+						'noscript menu isindex samp header footer article section hgroup aside nav figure');

 

 		// Converts a wildcard expression string to a regexp for example *a will become /.*a/.

 		function patternToRegExp(str) {

@@ -1788,7 +2403,7 @@ tinymce.html.Styles = function(settings, schema) {
 		function addValidElements(valid_elements) {

 			var ei, el, ai, al, yl, matches, element, attr, attrData, elementName, attrName, attrType, attributes, attributesOrder,

 				prefix, outputName, globalAttributes, globalAttributesOrder, transElement, key, childKey, value,

-				elementRuleRegExp = /^([#+-])?([^\[\/]+)(?:\/([^\[]+))?(?:\[([^\]]+)\])?$/,

+				elementRuleRegExp = /^([#+\-])?([^\[\/]+)(?:\/([^\[]+))?(?:\[([^\]]+)\])?$/,

 				attrRuleRegExp = /^([!\-])?(\w+::\w+|[^=:<]+)?(?:([=:<])(.*))?$/,

 				hasPatternsRegExp = /[*?+]/;

 

@@ -1930,7 +2545,7 @@ tinymce.html.Styles = function(settings, schema) {
 

 			addValidElements(valid_elements);

 

-			each(transitional, function(element, name) {

+			each(schemaItems, function(element, name) {

 				children[name] = element.children;

 			});

 		};

@@ -2010,8 +2625,8 @@ tinymce.html.Styles = function(settings, schema) {
 		};

 

 		if (!settings.valid_elements) {

-			// No valid elements defined then clone the elements from the transitional spec

-			each(transitional, function(element, name) {

+			// No valid elements defined then clone the elements from the schema spec

+			each(schemaItems, function(element, name) {

 				elements[name] = {

 					attributes : element.attributes,

 					attributesOrder : element.attributesOrder

@@ -2020,18 +2635,22 @@ tinymce.html.Styles = function(settings, schema) {
 				children[name] = element.children;

 			});

 

-			// Switch these

-			each(split('strong/b,em/i'), function(item) {

-				item = split(item, '/');

-				elements[item[1]].outputName = item[0];

-			});

+			// Switch these on HTML4

+			if (settings.schema != "html5") {

+				each(split('strong/b,em/i'), function(item) {

+					item = split(item, '/');

+					elements[item[1]].outputName = item[0];

+				});

+			}

 

 			// Add default alt attribute for images

 			elements.img.attributesDefault = [{name: 'alt', value: ''}];

 

 			// Remove these if they are empty by default

-			each(split('ol,ul,sub,sup,blockquote,span,font,a,table,tbody,tr'), function(name) {

-				elements[name].removeEmpty = true;

+			each(split('ol,ul,sub,sup,blockquote,span,font,a,table,tbody,tr,strong,em,b,i'), function(name) {

+				if (elements[name]) {

+					elements[name].removeEmpty = true;

+				}

 			});

 

 			// Padd these by default

@@ -2048,10 +2667,6 @@ tinymce.html.Styles = function(settings, schema) {
 		// Todo: Remove this when we fix list handling to be valid

 		addValidChildren('+ol[ul|ol],+ul[ul|ol]');

 

-		// If the user didn't allow span only allow internal spans

-		if (!getElementRule('span'))

-			addValidElements('span[!data-mce-type|*]');

-

 		// Delete invalid elements

 		if (settings.invalid_elements) {

 			tinymce.each(tinymce.explode(settings.invalid_elements), function(item) {

@@ -2060,6 +2675,10 @@ tinymce.html.Styles = function(settings, schema) {
 			});

 		}

 

+		// If the user didn't allow span only allow internal spans

+		if (!getElementRule('span'))

+			addValidElements('span[!data-mce-type|*]');

+

 		self.children = children;

 

 		self.styles = validStyles;

@@ -2108,10 +2727,6 @@ tinymce.html.Styles = function(settings, schema) {
 

 		self.addValidChildren = addValidChildren;

 	};

-

-	// Expose boolMap and blockElementMap as static properties for usage in DOMUtils

-	tinymce.html.Schema.boolAttrMap = boolAttrMap;

-	tinymce.html.Schema.blockElementsMap = blockElementsMap;

 })(tinymce);

 

 (function(tinymce) {

@@ -2161,6 +2776,47 @@ tinymce.html.Styles = function(settings, schema) {
 				}

 			};

 

+			function parseAttribute(match, name, value, val2, val3) {

+				var attrRule, i;

+

+				name = name.toLowerCase();

+				value = name in fillAttrsMap ? name : decode(value || val2 || val3 || ''); // Handle boolean attribute than value attribute

+

+				// Validate name and value

+				if (validate && !isInternalElement && name.indexOf('data-') !== 0) {

+					attrRule = validAttributesMap[name];

+

+					// Find rule by pattern matching

+					if (!attrRule && validAttributePatterns) {

+						i = validAttributePatterns.length;

+						while (i--) {

+							attrRule = validAttributePatterns[i];

+							if (attrRule.pattern.test(name))

+								break;

+						}

+

+						// No rule matched

+						if (i === -1)

+							attrRule = null;

+					}

+

+					// No attribute rule found

+					if (!attrRule)

+						return;

+

+					// Validate value

+					if (attrRule.validValues && !(value in attrRule.validValues))

+						return;

+				}

+

+				// Add attribute to list and map

+				attrList.map[name] = value;

+				attrList.push({

+					name: name,

+					value: value

+				});

+			};

+

 			// Precompile RegExps and map objects

 			tokenRegExp = new RegExp('<(?:' +

 				'(?:!--([\\w\\W]*?)-->)|' + // Comment

@@ -2168,7 +2824,7 @@ tinymce.html.Styles = function(settings, schema) {
 				'(?:!DOCTYPE([\\w\\W]*?)>)|' + // DOCTYPE

 				'(?:\\?([^\\s\\/<>]+) ?([\\w\\W]*?)[?/]>)|' + // PI

 				'(?:\\/([^>]+)>)|' + // End element

-				'(?:([^\\s\\/<>]+)\\s*((?:[^"\'>]+(?:(?:"[^"]*")|(?:\'[^\']*\')|[^>]*))*)>)' + // Start element

+				'(?:([A-Za-z0-9\\-\\:]+)((?:\\s+[^"\'>]+(?:(?:"[^"]*")|(?:\'[^\']*\')|[^>]*))*|\\/|\\s+)>)' + // Start element

 			')', 'g');

 

 			attrRegExp = /([\w:\-]+)(?:\s*=\s*(?:(?:\"((?:\\.|[^\"])*)\")|(?:\'((?:\\.|[^\'])*)\')|([^>\s]+)))?/g;

@@ -2235,46 +2891,7 @@ tinymce.html.Styles = function(settings, schema) {
 							attrList = [];

 							attrList.map = {};

 

-							attribsValue.replace(attrRegExp, function(match, name, value, val2, val3) {

-								var attrRule, i;

-

-								name = name.toLowerCase();

-								value = name in fillAttrsMap ? name : decode(value || val2 || val3 || ''); // Handle boolean attribute than value attribute

-

-								// Validate name and value

-								if (validate && !isInternalElement && name.indexOf('data-') !== 0) {

-									attrRule = validAttributesMap[name];

-

-									// Find rule by pattern matching

-									if (!attrRule && validAttributePatterns) {

-										i = validAttributePatterns.length;

-										while (i--) {

-											attrRule = validAttributePatterns[i];

-											if (attrRule.pattern.test(name))

-												break;

-										}

-

-										// No rule matched

-										if (i === -1)

-											attrRule = null;

-									}

-

-									// No attribute rule found

-									if (!attrRule)

-										return;

-

-									// Validate value

-									if (attrRule.validValues && !(value in attrRule.validValues))

-										return;

-								}

-

-								// Add attribute to list and map

-								attrList.map[name] = value;

-								attrList.push({

-									name: name,

-									value: value

-								});

-							});

+							attribsValue.replace(attrRegExp, parseAttribute);

 						} else {

 							attrList = [];

 							attrList.map = {};

@@ -2698,6 +3315,10 @@ tinymce.html.Styles = function(settings, schema) {
 						}

 					}

 

+					// Keep comments

+					if (node.type === 8)

+						return false;

+					

 					// Keep non whitespace text nodes

 					if ((node.type === 3 && !whiteSpaceRegExp.test(node.value)))

 						return false;

@@ -2891,8 +3512,8 @@ tinymce.html.Styles = function(settings, schema) {
 

 		self.parse = function(html, args) {

 			var parser, rootNode, node, nodes, i, l, fi, fl, list, name, validate,

-				blockElements, startWhiteSpaceRegExp, invalidChildren = [],

-				endWhiteSpaceRegExp, allWhiteSpaceRegExp, whiteSpaceElements, children, nonEmptyElements, rootBlockName;

+				blockElements, startWhiteSpaceRegExp, invalidChildren = [], isInWhiteSpacePreservedElement,

+				endWhiteSpaceRegExp, allWhiteSpaceRegExp, isAllWhiteSpaceRegExp, whiteSpaceElements, children, nonEmptyElements, rootBlockName;

 

 			args = args || {};

 			matchedNodes = {};

@@ -2907,6 +3528,7 @@ tinymce.html.Styles = function(settings, schema) {
 			startWhiteSpaceRegExp = /^[ \t\r\n]+/;

 			endWhiteSpaceRegExp = /[ \t\r\n]+$/;

 			allWhiteSpaceRegExp = /[ \t\r\n]+/g;

+			isAllWhiteSpaceRegExp = /^[ \t\r\n]+$/;

 

 			function addRootBlocks() {

 				var node = rootNode.firstChild, next, rootBlockNode;

@@ -2974,7 +3596,7 @@ tinymce.html.Styles = function(settings, schema) {
 					var textNode;

 

 					// Trim all redundant whitespace on non white space elements

-					if (!whiteSpaceElements[node.name]) {

+					if (!isInWhiteSpacePreservedElement) {

 						text = text.replace(allWhiteSpaceRegExp, ' ');

 

 						if (node.lastChild && blockElements[node.lastChild.name])

@@ -3044,6 +3666,11 @@ tinymce.html.Styles = function(settings, schema) {
 						// Change current node if the element wasn't empty i.e not <br /> or <img />

 						if (!empty)

 							node = newNode;

+

+						// Check if we are inside a whitespace preserved element

+						if (!isInWhiteSpacePreservedElement && whiteSpaceElements[name]) {

+							isInWhiteSpacePreservedElement = true;

+						}

 					}

 				},

 

@@ -3053,11 +3680,13 @@ tinymce.html.Styles = function(settings, schema) {
 					elementRule = validate ? schema.getElementRule(name) : {};

 					if (elementRule) {

 						if (blockElements[name]) {

-							if (!whiteSpaceElements[node.name]) {

-								// Trim whitespace at beginning of block

-								for (textNode = node.firstChild; textNode && textNode.type === 3; ) {

+							if (!isInWhiteSpacePreservedElement) {

+								// Trim whitespace of the first node in a block

+								textNode = node.firstChild;

+								if (textNode && textNode.type === 3) {

 									text = textNode.value.replace(startWhiteSpaceRegExp, '');

 

+									// Any characters left after trim or should we remove it

 									if (text.length > 0) {

 										textNode.value = text;

 										textNode = textNode.next;

@@ -3066,12 +3695,27 @@ tinymce.html.Styles = function(settings, schema) {
 										textNode.remove();

 										textNode = sibling;

 									}

+

+									// Remove any pure whitespace siblings

+									while (textNode && textNode.type === 3) {

+										text = textNode.value;

+										sibling = textNode.next;

+

+										if (text.length === 0 || isAllWhiteSpaceRegExp.test(text)) {

+											textNode.remove();

+											textNode = sibling;

+										}

+

+										textNode = sibling;

+									}

 								}

 

-								// Trim whitespace at end of block

-								for (textNode = node.lastChild; textNode && textNode.type === 3; ) {

+								// Trim whitespace of the last node in a block

+								textNode = node.lastChild;

+								if (textNode && textNode.type === 3) {

 									text = textNode.value.replace(endWhiteSpaceRegExp, '');

 

+									// Any characters left after trim or should we remove it

 									if (text.length > 0) {

 										textNode.value = text;

 										textNode = textNode.prev;

@@ -3080,6 +3724,19 @@ tinymce.html.Styles = function(settings, schema) {
 										textNode.remove();

 										textNode = sibling;

 									}

+

+									// Remove any pure whitespace siblings

+									while (textNode && textNode.type === 3) {

+										text = textNode.value;

+										sibling = textNode.prev;

+

+										if (text.length === 0 || isAllWhiteSpaceRegExp.test(text)) {

+											textNode.remove();

+											textNode = sibling;

+										}

+

+										textNode = sibling;

+									}

 								}

 							}

 

@@ -3095,6 +3752,11 @@ tinymce.html.Styles = function(settings, schema) {
 							}

 						}

 

+						// Check if we exited a whitespace preserved element

+						if (isInWhiteSpacePreservedElement && whiteSpaceElements[name]) {

+							isInWhiteSpacePreservedElement = false;

+						}

+

 						// Handle empty nodes

 						if (elementRule.removeEmpty || elementRule.paddEmpty) {

 							if (node.isEmpty(nonEmptyElements)) {

@@ -3179,8 +3841,8 @@ tinymce.html.Styles = function(settings, schema) {
 		// these elements and keep br elements that where intended to be there intact

 		if (settings.remove_trailing_brs) {

 			self.addNodeFilter('br', function(nodes, name) {

-				var i, l = nodes.length, node, blockElements = schema.getBlockElements(),

-					nonEmptyElements = schema.getNonEmptyElements(), parent, prev, prevName;

+				var i, l = nodes.length, node, blockElements = tinymce.extend({}, schema.getBlockElements()),

+					nonEmptyElements = schema.getNonEmptyElements(), parent, lastParent, prev, prevName;

 

 				// Remove brs from body element as well

 				blockElements.body = 1;

@@ -3191,7 +3853,7 @@ tinymce.html.Styles = function(settings, schema) {
 					parent = node.parent;

 

 					if (blockElements[node.parent.name] && node === parent.lastChild) {

-						// Loop all nodes to the right of the current node and check for other BR elements

+						// Loop all nodes to the left of the current node and check for other BR elements

 						// excluding bookmarks since they are invisible

 						prev = node.prev;

 						while (prev) {

@@ -3222,17 +3884,57 @@ tinymce.html.Styles = function(settings, schema) {
 

 								// Remove or padd the element depending on schema rule

 								if (elementRule) {

-								  if (elementRule.removeEmpty)

-									  parent.remove();

-								  else if (elementRule.paddEmpty)

-									  parent.empty().append(new tinymce.html.Node('#text', 3)).value = '\u00a0';

-							  }

-              }

+									if (elementRule.removeEmpty)

+										parent.remove();

+									else if (elementRule.paddEmpty)

+										parent.empty().append(new tinymce.html.Node('#text', 3)).value = '\u00a0';

+								}

+							}

+						}

+					} else {

+						// Replaces BR elements inside inline elements like <p><b><i><br></i></b></p> so they become <p><b><i>&nbsp;</i></b></p> 

+						lastParent = node;

+						while (parent.firstChild === lastParent && parent.lastChild === lastParent) {

+							lastParent = parent;

+

+							if (blockElements[parent.name]) {

+								break;

+							}

+

+							parent = parent.parent;

+						}

+

+						if (lastParent === parent) {

+							textNode = new tinymce.html.Node('#text', 3);

+							textNode.value = '\u00a0';

+							node.replace(textNode);

 						}

 					}

 				}

 			});

 		}

+

+		// Force anchor names closed, unless the setting "allow_html_in_named_anchor" is explicitly included.

+		if (!settings.allow_html_in_named_anchor) {

+			self.addAttributeFilter('name', function(nodes, name) {

+				var i = nodes.length, sibling, prevSibling, parent, node;

+

+				while (i--) {

+					node = nodes[i];

+					if (node.name === 'a' && node.firstChild) {

+						parent = node.parent;

+

+						// Move children after current node

+						sibling = node.lastChild;

+						do {

+							prevSibling = sibling.prev;

+							parent.insert(sibling, node);

+							sibling = prevSibling;

+						} while (sibling);

+					}

+				}

+			});

+		}

 	}

 })(tinymce);

 

@@ -3377,7 +4079,7 @@ tinymce.html.Writer = function(settings) {
 					writer.cdata(node.value);

 				},

 

- 				// Document fragment

+				// Document fragment

 				11: function(node) {

 					if ((node = node.firstChild)) {

 						do {

@@ -3452,6 +4154,578 @@ tinymce.html.Writer = function(settings) {
 	}

 })(tinymce);

 

+// JSLint defined globals

+/*global tinymce:false, window:false */

+

+tinymce.dom = {};

+

+(function(namespace, expando) {

+	var w3cEventModel = !!document.addEventListener;

+

+	function addEvent(target, name, callback, capture) {

+		if (target.addEventListener) {

+			target.addEventListener(name, callback, capture || false);

+		} else if (target.attachEvent) {

+			target.attachEvent('on' + name, callback);

+		}

+	}

+

+	function removeEvent(target, name, callback, capture) {

+		if (target.removeEventListener) {

+			target.removeEventListener(name, callback, capture || false);

+		} else if (target.detachEvent) {

+			target.detachEvent('on' + name, callback);

+		}

+	}

+

+	function fix(original_event, data) {

+		var name, event = data || {};

+

+		// Dummy function that gets replaced on the delegation state functions

+		function returnFalse() {

+			return false;

+		}

+

+		// Dummy function that gets replaced on the delegation state functions

+		function returnTrue() {

+			return true;

+		}

+

+		// Copy all properties from the original event

+		for (name in original_event) {

+			// layerX/layerY is deprecated in Chrome and produces a warning

+			if (name !== "layerX" && name !== "layerY") {

+				event[name] = original_event[name];

+			}

+		}

+

+		// Normalize target IE uses srcElement

+		if (!event.target) {

+			event.target = event.srcElement || document;

+		}

+

+		// Add preventDefault method

+		event.preventDefault = function() {

+			event.isDefaultPrevented = returnTrue;

+

+			// Execute preventDefault on the original event object

+			if (original_event) {

+				if (original_event.preventDefault) {

+					original_event.preventDefault();

+				} else {

+					original_event.returnValue = false; // IE

+				}

+			}

+		};

+

+		// Add stopPropagation

+		event.stopPropagation = function() {

+			event.isPropagationStopped = returnTrue;

+

+			// Execute stopPropagation on the original event object

+			if (original_event) {

+				if (original_event.stopPropagation) {

+					original_event.stopPropagation();

+				} else {

+					original_event.cancelBubble = true; // IE

+				}

+			 }

+		};

+

+		// Add stopImmediatePropagation

+		event.stopImmediatePropagation = function() {

+			event.isImmediatePropagationStopped = returnTrue;

+			event.stopPropagation();

+		};

+

+		// Add event delegation states

+		if (!event.isDefaultPrevented) {

+			event.isDefaultPrevented = returnFalse;

+			event.isPropagationStopped = returnFalse;

+			event.isImmediatePropagationStopped = returnFalse;

+		}

+

+		return event;

+	}

+

+	function bindOnReady(win, callback, event_utils) {

+		var doc = win.document, event = {type: 'ready'};

+

+		// Gets called when the DOM is ready

+		function readyHandler() {

+			if (!event_utils.domLoaded) {

+				event_utils.domLoaded = true;

+				callback(event);

+			}

+		}

+

+		// Use W3C method

+		if (w3cEventModel) {

+			addEvent(win, 'DOMContentLoaded', readyHandler);

+		} else {

+			// Use IE method

+			addEvent(doc, "readystatechange", function() {

+				if (doc.readyState === "complete") {

+					removeEvent(doc, "readystatechange", arguments.callee);

+					readyHandler();

+				}

+			});

+

+			// Wait until we can scroll, when we can the DOM is initialized

+			if (doc.documentElement.doScroll && win === win.top) {

+				(function() {

+					try {

+						// If IE is used, use the trick by Diego Perini licensed under MIT by request to the author.

+						// http://javascript.nwbox.com/IEContentLoaded/

+						doc.documentElement.doScroll("left");

+					} catch (ex) {

+						setTimeout(arguments.callee, 0);

+						return;

+					}

+

+					readyHandler();

+				})();

+			}

+		}

+

+		// Fallback if any of the above methods should fail for some odd reason

+		addEvent(win, 'load', readyHandler);

+	}

+

+	function EventUtils(proxy) {

+		var self = this, events = {}, count, isFocusBlurBound, hasFocusIn, hasMouseEnterLeave, mouseEnterLeave;

+

+		hasMouseEnterLeave = "onmouseenter" in document.documentElement;

+		hasFocusIn = "onfocusin" in document.documentElement;

+		mouseEnterLeave = {mouseenter: 'mouseover', mouseleave: 'mouseout'};

+		count = 1;

+

+		// State if the DOMContentLoaded was executed or not

+		self.domLoaded = false;

+		self.events = events;

+

+		function executeHandlers(evt, id) {

+			var callbackList, i, l, callback;

+

+			callbackList = events[id][evt.type];

+			if (callbackList) {

+				for (i = 0, l = callbackList.length; i < l; i++) {

+					callback = callbackList[i];

+					

+					// Check if callback exists might be removed if a unbind is called inside the callback

+					if (callback && callback.func.call(callback.scope, evt) === false) {

+						evt.preventDefault();

+					}

+

+					// Should we stop propagation to immediate listeners

+					if (evt.isImmediatePropagationStopped()) {

+						return;

+					}

+				}

+			}

+		}

+

+		self.bind = function(target, names, callback, scope) {

+			var id, callbackList, i, name, fakeName, nativeHandler, capture, win = window;

+

+			// Native event handler function patches the event and executes the callbacks for the expando

+			function defaultNativeHandler(evt) {

+				executeHandlers(fix(evt || win.event), id);

+			}

+

+			// Don't bind to text nodes or comments

+			if (!target || target.nodeType === 3 || target.nodeType === 8) {

+				return;

+			}

+

+			// Create or get events id for the target

+			if (!target[expando]) {

+				id = count++;

+				target[expando] = id;

+				events[id] = {};

+			} else {

+				id = target[expando];

+

+				if (!events[id]) {

+					events[id] = {};

+				}

+			}

+

+			// Setup the specified scope or use the target as a default

+			scope = scope || target;

+

+			// Split names and bind each event, enables you to bind multiple events with one call

+			names = names.split(' ');

+			i = names.length;

+			while (i--) {

+				name = names[i];

+				nativeHandler = defaultNativeHandler;

+				fakeName = capture = false;

+

+				// Use ready instead of DOMContentLoaded

+				if (name === "DOMContentLoaded") {

+					name = "ready";

+				}

+

+				// DOM is already ready

+				if ((self.domLoaded || target.readyState == 'complete') && name === "ready") {

+					self.domLoaded = true;

+					callback.call(scope, fix({type: name}));

+					continue;

+				}

+

+				// Handle mouseenter/mouseleaver

+				if (!hasMouseEnterLeave) {

+					fakeName = mouseEnterLeave[name];

+

+					if (fakeName) {

+						nativeHandler = function(evt) {

+							var current, related;

+

+							current = evt.currentTarget;

+							related = evt.relatedTarget;

+

+							// Check if related is inside the current target if it's not then the event should be ignored since it's a mouseover/mouseout inside the element

+							if (related && current.contains) {

+								// Use contains for performance

+								related = current.contains(related);

+							} else {

+								while (related && related !== current) {

+									related = related.parentNode;

+								}

+							}

+

+							// Fire fake event

+							if (!related) {

+								evt = fix(evt || win.event);

+								evt.type = evt.type === 'mouseout' ? 'mouseleave' : 'mouseenter';

+								evt.target = current;

+								executeHandlers(evt, id);

+							}

+						};

+					}

+				}

+

+				// Fake bubbeling of focusin/focusout

+				if (!hasFocusIn && (name === "focusin" || name === "focusout")) {

+					capture = true;

+					fakeName = name === "focusin" ? "focus" : "blur";

+					nativeHandler = function(evt) {

+						evt = fix(evt || win.event);

+						evt.type = evt.type === 'focus' ? 'focusin' : 'focusout';

+						executeHandlers(evt, id);

+					};

+				}

+

+				// Setup callback list and bind native event

+				callbackList = events[id][name];

+				if (!callbackList) {

+					events[id][name] = callbackList = [{func: callback, scope: scope}];

+					callbackList.fakeName = fakeName;

+					callbackList.capture = capture;

+

+					// Add the nativeHandler to the callback list so that we can later unbind it

+					callbackList.nativeHandler = nativeHandler;

+					if (!w3cEventModel) {

+						callbackList.proxyHandler = proxy(id);

+					}

+

+					// Check if the target has native events support

+					if (name === "ready") {

+						bindOnReady(target, nativeHandler, self);

+					} else {

+						addEvent(target, fakeName || name, w3cEventModel ? nativeHandler : callbackList.proxyHandler, capture);

+					}

+				} else {

+					// If it already has an native handler then just push the callback

+					callbackList.push({func: callback, scope: scope});

+				}

+			}

+

+			target = callbackList = 0; // Clean memory for IE

+

+			return callback;

+		};

+

+		self.unbind = function(target, names, callback) {

+			var id, callbackList, i, ci, name, eventMap;

+

+			// Don't bind to text nodes or comments

+			if (!target || target.nodeType === 3 || target.nodeType === 8) {

+				return self;

+			}

+

+			// Unbind event or events if the target has the expando

+			id = target[expando];

+			if (id) {

+				eventMap = events[id];

+

+				// Specific callback

+				if (names) {

+					names = names.split(' ');

+					i = names.length;

+					while (i--) {

+						name = names[i];

+						callbackList = eventMap[name];

+

+						// Unbind the event if it exists in the map

+						if (callbackList) {

+							// Remove specified callback

+							if (callback) {

+								ci = callbackList.length;

+								while (ci--) {

+									if (callbackList[ci].func === callback) {

+										callbackList.splice(ci, 1);

+									}

+								}

+							}

+

+							// Remove all callbacks if there isn't a specified callback or there is no callbacks left

+							if (!callback || callbackList.length === 0) {

+								delete eventMap[name];

+								removeEvent(target, callbackList.fakeName || name, w3cEventModel ? callbackList.nativeHandler : callbackList.proxyHandler, callbackList.capture);

+							}

+						}

+					}

+				} else {

+					// All events for a specific element

+					for (name in eventMap) {

+						callbackList = eventMap[name];

+						removeEvent(target, callbackList.fakeName || name, w3cEventModel ? callbackList.nativeHandler : callbackList.proxyHandler, callbackList.capture);

+					}

+

+					eventMap = {};

+				}

+

+				// Check if object is empty, if it isn't then we won't remove the expando map

+				for (name in eventMap) {

+					return self;

+				}

+

+				// Delete event object

+				delete events[id];

+

+				// Remove expando from target

+				try {

+					// IE will fail here since it can't delete properties from window

+					delete target[expando];

+				} catch (ex) {

+					// IE will set it to null

+					target[expando] = null;

+				}

+			}

+

+			return self;

+		};

+

+		self.fire = function(target, name, args) {

+			var id, event;

+

+			// Don't bind to text nodes or comments

+			if (!target || target.nodeType === 3 || target.nodeType === 8) {

+				return self;

+			}

+

+			// Build event object by patching the args

+			event = fix(null, args);

+			event.type = name;

+

+			do {

+				// Found an expando that means there is listeners to execute

+				id = target[expando];

+				if (id) {

+					executeHandlers(event, id);

+				}

+

+				// Walk up the DOM

+				target = target.parentNode || target.ownerDocument || target.defaultView || target.parentWindow;

+			} while (target && !event.isPropagationStopped());

+

+			return self;

+		};

+

+		self.clean = function(target) {

+			var i, children, unbind = self.unbind;

+	

+			// Don't bind to text nodes or comments

+			if (!target || target.nodeType === 3 || target.nodeType === 8) {

+				return self;

+			}

+

+			// Unbind any element on the specificed target

+			if (target[expando]) {

+				unbind(target);

+			}

+

+			// Target doesn't have getElementsByTagName it's probably a window object then use it's document to find the children

+			if (!target.getElementsByTagName) {

+				target = target.document;

+			}

+

+			// Remove events from each child element

+			if (target && target.getElementsByTagName) {

+				unbind(target);

+

+				children = target.getElementsByTagName('*');

+				i = children.length;

+				while (i--) {

+					target = children[i];

+

+					if (target[expando]) {

+						unbind(target);

+					}

+				}

+			}

+

+			return self;

+		};

+

+		self.callNativeHandler = function(id, evt) {

+			if (events) {

+				events[id][evt.type].nativeHandler(evt);

+			}

+		};

+

+		self.destory = function() {

+			events = {};

+		};

+

+		// Legacy function calls

+

+		self.add = function(target, events, func, scope) {

+			// Old API supported direct ID assignment

+			if (typeof(target) === "string") {

+				target = document.getElementById(target);

+			}

+

+			// Old API supported multiple targets

+			if (target && target instanceof Array) {

+				var i = target;

+

+				while (i--) {

+					self.add(target[i], events, func, scope);

+				}

+

+				return;

+			}

+

+			// Old API called ready init

+			if (events === "init") {

+				events = "ready";

+			}

+

+			return self.bind(target, events instanceof Array ? events.join(' ') : events, func, scope);

+		};

+

+		self.remove = function(target, events, func, scope) {

+			if (!target) {

+				return self;

+			}

+

+			// Old API supported direct ID assignment

+			if (typeof(target) === "string") {

+				target = document.getElementById(target);

+			}

+

+			// Old API supported multiple targets

+			if (target instanceof Array) {

+				var i = target.length;

+

+				while (i--) {

+					self.remove(target[i], events, func, scope);

+				}

+

+				return self;

+			}

+

+			return self.unbind(target, events instanceof Array ? events.join(' ') : events, func);

+		};

+

+		self.clear = function(target) {

+			// Old API supported direct ID assignment

+			if (typeof(target) === "string") {

+				target = document.getElementById(target);

+			}

+

+			return self.clean(target);

+		};

+

+		self.cancel = function(e) {

+			if (e) {

+				self.prevent(e);

+				self.stop(e);

+			}

+

+			return false;

+		};

+

+		self.prevent = function(e) {

+			e.preventDefault();

+

+			return false;

+		};

+

+		self.stop = function(e) {

+			e.stopPropagation();

+

+			return false;

+		};

+	}

+

+	namespace.EventUtils = EventUtils;

+

+	namespace.Event = new EventUtils(function(id) {

+		return function(evt) {

+			tinymce.dom.Event.callNativeHandler(id, evt);

+		};

+	});

+

+	// Bind ready event when tinymce script is loaded

+	namespace.Event.bind(window, 'ready', function() {});

+

+	namespace = 0;

+})(tinymce.dom, 'data-mce-expando'); // Namespace and expando

+

+tinymce.dom.TreeWalker = function(start_node, root_node) {

+	var node = start_node;

+

+	function findSibling(node, start_name, sibling_name, shallow) {

+		var sibling, parent;

+

+		if (node) {

+			// Walk into nodes if it has a start

+			if (!shallow && node[start_name])

+				return node[start_name];

+

+			// Return the sibling if it has one

+			if (node != root_node) {

+				sibling = node[sibling_name];

+				if (sibling)

+					return sibling;

+

+				// Walk up the parents to look for siblings

+				for (parent = node.parentNode; parent && parent != root_node; parent = parent.parentNode) {

+					sibling = parent[sibling_name];

+					if (sibling)

+						return sibling;

+				}

+			}

+		}

+	};

+

+	this.current = function() {

+		return node;

+	};

+

+	this.next = function(shallow) {

+		return (node = findSibling(node, 'firstChild', 'nextSibling', shallow));

+	};

+

+	this.prev = function(shallow) {

+		return (node = findSibling(node, 'lastChild', 'previousSibling', shallow));

+	};

+};

+

 (function(tinymce) {

 	// Shorten names

 	var each = tinymce.each,

@@ -3460,7 +4734,6 @@ tinymce.html.Writer = function(settings) {
 		isIE = tinymce.isIE,

 		Entities = tinymce.html.Entities,

 		simpleSelectorRe = /^([a-z0-9],?)+$/i,

-		blockElementsMap = tinymce.html.Schema.blockElementsMap,

 		whiteSpaceRegExp = /^[ \t\r\n]*$/;

 

 	tinymce.create('tinymce.dom.DOMUtils', {

@@ -3484,7 +4757,7 @@ tinymce.html.Writer = function(settings) {
 		},

 

 		DOMUtils : function(d, s) {

-			var t = this, globalStyle, name;

+			var t = this, globalStyle, name, blockElementsMap;

 

 			t.doc = d;

 			t.win = window;

@@ -3515,23 +4788,78 @@ tinymce.html.Writer = function(settings) {
 				}

 			}

 

-			if (isIE && s.schema) {

+			t.fixDoc(d);

+			t.events = s.ownEvents ? new tinymce.dom.EventUtils(s.proxy) : tinymce.dom.Event;

+			tinymce.addUnload(t.destroy, t);

+			blockElementsMap = s.schema ? s.schema.getBlockElements() : {};

+

+			t.isBlock = function(node) {

+				// This function is called in module pattern style since it might be executed with the wrong this scope

+				var type = node.nodeType;

+

+				// If it's a node then check the type and use the nodeName

+				if (type)

+					return !!(type === 1 && blockElementsMap[node.nodeName]);

+

+				return !!blockElementsMap[node];

+			};

+		},

+

+		fixDoc: function(doc) {

+			var settings = this.settings, name;

+

+			if (isIE && settings.schema) {

 				// Add missing HTML 4/5 elements to IE

 				('abbr article aside audio canvas ' +

 				'details figcaption figure footer ' +

 				'header hgroup mark menu meter nav ' +

 				'output progress section summary ' +

 				'time video').replace(/\w+/g, function(name) {

-					d.createElement(name);

+					doc.createElement(name);

 				});

 

 				// Create all custom elements

-				for (name in s.schema.getCustomElements()) {

-					d.createElement(name);

+				for (name in settings.schema.getCustomElements()) {

+					doc.createElement(name);

 				}

 			}

+		},

+

+		clone: function(node, deep) {

+			var self = this, clone, doc;

+

+			// TODO: Add feature detection here in the future

+			if (!isIE || node.nodeType !== 1 || deep) {

+				return node.cloneNode(deep);

+			}

 

-			tinymce.addUnload(t.destroy, t);

+			doc = self.doc;

+

+			// Make a HTML5 safe shallow copy

+			if (!deep) {

+				clone = doc.createElement(node.nodeName);

+

+				// Copy attribs

+				each(self.getAttribs(node), function(attr) {

+					self.setAttrib(clone, attr.nodeName, self.getAttrib(node, attr.nodeName));

+				});

+

+				return clone;

+			}

+/*

+			// Setup HTML5 patched document fragment

+			if (!self.frag) {

+				self.frag = doc.createDocumentFragment();

+				self.fixDoc(self.frag);

+			}

+

+			// Make a deep copy by adding it to the document fragment then removing it this removed the :section

+			clone = doc.createElement('div');

+			self.frag.appendChild(clone);

+			clone.innerHTML = node.outerHTML;

+			self.frag.removeChild(clone);

+*/

+			return clone.firstChild;

 		},

 

 		getRoot : function() {

@@ -3587,8 +4915,8 @@ tinymce.html.Writer = function(settings) {
 				h = 0;

 

 			return {

-				w : parseInt(w) || e.offsetWidth || e.clientWidth,

-				h : parseInt(h) || e.offsetHeight || e.clientHeight

+				w : parseInt(w, 10) || e.offsetWidth || e.clientWidth,

+				h : parseInt(h, 10) || e.offsetHeight || e.clientHeight

 			};

 		},

 

@@ -3873,52 +5201,59 @@ tinymce.html.Writer = function(settings) {
 

 			return this.run(e, function(e) {

 				var s = t.settings;

+				var originalValue = e.getAttribute(n);

+				if (v !== null) {

+					switch (n) {

+						case "style":

+							if (!is(v, 'string')) {

+								each(v, function(v, n) {

+									t.setStyle(e, n, v);

+								});

 

-				switch (n) {

-					case "style":

-						if (!is(v, 'string')) {

-							each(v, function(v, n) {

-								t.setStyle(e, n, v);

-							});

-

-							return;

-						}

+								return;

+							}

 

-						// No mce_style for elements with these since they might get resized by the user

-						if (s.keep_values) {

-							if (v && !t._isRes(v))

-								e.setAttribute('data-mce-style', v, 2);

-							else

-								e.removeAttribute('data-mce-style', 2);

-						}

+							// No mce_style for elements with these since they might get resized by the user

+							if (s.keep_values) {

+								if (v && !t._isRes(v))

+									e.setAttribute('data-mce-style', v, 2);

+								else

+									e.removeAttribute('data-mce-style', 2);

+							}

 

-						e.style.cssText = v;

-						break;

+							e.style.cssText = v;

+							break;

 

-					case "class":

-						e.className = v || ''; // Fix IE null bug

-						break;

+						case "class":

+							e.className = v || ''; // Fix IE null bug

+							break;

 

-					case "src":

-					case "href":

-						if (s.keep_values) {

-							if (s.url_converter)

-								v = s.url_converter.call(s.url_converter_scope || t, v, n, e);

+						case "src":

+						case "href":

+							if (s.keep_values) {

+								if (s.url_converter)

+									v = s.url_converter.call(s.url_converter_scope || t, v, n, e);

 

-							t.setAttrib(e, 'data-mce-' + n, v, 2);

-						}

+								t.setAttrib(e, 'data-mce-' + n, v, 2);

+							}

 

-						break;

+							break;

 

-					case "shape":

-						e.setAttribute('data-mce-style', v);

-						break;

+						case "shape":

+							e.setAttribute('data-mce-style', v);

+							break;

+					}

 				}

-

 				if (is(v) && v !== null && v.length !== 0)

 					e.setAttribute(n, '' + v, 2);

 				else

 					e.removeAttribute(n, 2);

+

+				// fire onChangeAttrib event for attributes that have changed

+				if (tinyMCE.activeEditor && originalValue != v) {

+					var ed = tinyMCE.activeEditor;

+					ed.onSetAttrib.dispatch(ed, e, n, v);

+				}

 			});

 		},

 

@@ -4105,7 +5440,7 @@ tinymce.html.Writer = function(settings) {
 			if (!u)

 				u = '';

 

-			head = t.select('head')[0];

+			head = d.getElementsByTagName('head')[0];

 

 			each(u.split(','), function(u) {

 				var link;

@@ -4320,16 +5655,6 @@ tinymce.html.Writer = function(settings) {
 			});

 		},

 

-		isBlock : function(node) {

-			var type = node.nodeType;

-

-			// If it's a node then check the type and use the nodeName

-			if (type)

-				return !!(type === 1 && blockElementsMap[node.nodeName]);

-

-			return !!blockElementsMap[node];

-		},

-

 		replace : function(n, o, k) {

 			var t = this;

 

@@ -4391,7 +5716,7 @@ tinymce.html.Writer = function(settings) {
 			var c = /^\s*rgb\s*?\(\s*?([0-9]+)\s*?,\s*?([0-9]+)\s*?,\s*?([0-9]+)\s*?\)\s*$/i.exec(s);

 

 			function hex(s) {

-				s = parseInt(s).toString(16);

+				s = parseInt(s, 10).toString(16);

 

 				return s.length > 1 ? s : '0' + s; // 0 -> 00

 			};

@@ -4525,11 +5850,11 @@ tinymce.html.Writer = function(settings) {
 		},

 

 		isEmpty : function(node, elements) {

-			var self = this, i, attributes, type, walker, name, parentNode;

+			var self = this, i, attributes, type, walker, name, brCount = 0;

 

 			node = node.firstChild;

 			if (node) {

-				walker = new tinymce.dom.TreeWalker(node);

+				walker = new tinymce.dom.TreeWalker(node, node.parentNode);

 				elements = elements || self.schema ? self.schema.getNonEmptyElements() : null;

 

 				do {

@@ -4543,9 +5868,9 @@ tinymce.html.Writer = function(settings) {
 						// Keep empty elements like <img />

 						name = node.nodeName.toLowerCase();

 						if (elements && elements[name]) {

-							// Ignore single BR elements in blocks like <p><br /></p>

-							parentNode = node.parentNode;

-							if (name === 'br' && self.isBlock(parentNode) && parentNode.firstChild === node && parentNode.lastChild === node) {

+							// Ignore single BR elements in blocks like <p><br /></p> or <p><span><br /></span></p>

+							if (name === 'br') {

+								brCount++;

 								continue;

 							}

 

@@ -4562,22 +5887,23 @@ tinymce.html.Writer = function(settings) {
 						}

 					}

 

+					// Keep comment nodes

+					if (type == 8)

+						return false;

+

 					// Keep non whitespace text nodes

 					if ((type === 3 && !whiteSpaceRegExp.test(node.nodeValue)))

 						return false;

 				} while (node = walker.next());

 			}

 

-			return true;

+			return brCount <= 1;

 		},

 

 		destroy : function(s) {

 			var t = this;

 

-			if (t.events)

-				t.events.destroy();

-

-			t.win = t.doc = t.root = t.events = null;

+			t.win = t.doc = t.root = t.events = t.frag = null;

 

 			// Manual destroy then remove unload handler

 			if (!s)

@@ -4624,6 +5950,12 @@ tinymce.html.Writer = function(settings) {
 			function trim(node) {

 				var i, children = node.childNodes, type = node.nodeType;

 

+				function surroundedBySpans(node) {

+					var previousIsSpan = node.previousSibling && node.previousSibling.nodeName == 'SPAN';

+					var nextIsSpan = node.nextSibling && node.nextSibling.nodeName == 'SPAN';

+					return previousIsSpan && nextIsSpan;

+				}

+

 				if (type == 1 && node.getAttribute('data-mce-type') == 'bookmark')

 					return;

 

@@ -4634,7 +5966,10 @@ tinymce.html.Writer = function(settings) {
 					// Keep non whitespace text nodes

 					if (type == 3 && node.nodeValue.length > 0) {

 						// If parent element isn't a block or there isn't any useful contents for example "<p>   </p>"

-						if (!t.isBlock(node.parentNode) || tinymce.trim(node.nodeValue).length > 0)

+						// Also keep text nodes with only spaces if surrounded by spans.

+						// eg. "<p><span>a</span> <span>b</span></p>" should keep space between a and b

+						var trimmedLength = tinymce.trim(node.nodeValue).length;

+						if (!t.isBlock(node.parentNode) || trimmedLength > 0 || trimmedLength === 0 && surroundedBySpans(node))

 							return;

 					} else if (type == 1) {

 						// If the only child is a bookmark then move it up

@@ -4671,9 +6006,9 @@ tinymce.html.Writer = function(settings) {
 

 				// Insert middle chunk

 				if (re)

-					pa.replaceChild(re, e);

-				else

-					pa.insertBefore(e, pe);

+				pa.replaceChild(re, e);

+			else

+				pa.insertBefore(e, pe);

 

 				// Insert after chunk

 				pa.insertBefore(trim(aft), pe);

@@ -4684,21 +6019,34 @@ tinymce.html.Writer = function(settings) {
 		},

 

 		bind : function(target, name, func, scope) {

-			var t = this;

+			return this.events.add(target, name, func, scope || this);

+		},

 

-			if (!t.events)

-				t.events = new tinymce.dom.EventUtils();

+		unbind : function(target, name, func) {

+			return this.events.remove(target, name, func);

+		},

 

-			return t.events.add(target, name, func, scope || this);

+		fire : function(target, name, evt) {

+			return this.events.fire(target, name, evt);

 		},

 

-		unbind : function(target, name, func) {

-			var t = this;

+		// Returns the content editable state of a node

+		getContentEditable: function(node) {

+			var contentEditable;

 

-			if (!t.events)

-				t.events = new tinymce.dom.EventUtils();

+			// Check type

+			if (node.nodeType != 1) {

+				return null;

+			}

 

-			return t.events.remove(target, name, func);

+			// Check for fake content editable

+			contentEditable = node.getAttribute("data-mce-contenteditable");

+			if (contentEditable && contentEditable !== "inherit") {

+				return contentEditable;

+			}

+

+			// Check for real content editable

+			return node.contentEditable !== "inherit" ? node.contentEditable : null;

 		},

 

 

@@ -4813,6 +6161,10 @@ tinymce.html.Writer = function(settings) {
 			cloneRange : cloneRange

 		});

 

+		function createDocumentFragment() {

+			return doc.createDocumentFragment();

+		};

+

 		function setStart(n, o) {

 			_setEndPoint(TRUE, n, o);

 		};

@@ -5145,10 +6497,10 @@ tinymce.html.Writer = function(settings) {
 		};

 

 		 function _traverseSameContainer(how) {

-			var frag, s, sub, n, cnt, sibling, xferNode;

+			var frag, s, sub, n, cnt, sibling, xferNode, start, len;

 

 			if (how != DELETE)

-				frag = doc.createDocumentFragment();

+				frag = createDocumentFragment();

 

 			// If selection is empty, just return the fragment

 			if (t[START_OFFSET] == t[END_OFFSET])

@@ -5162,7 +6514,15 @@ tinymce.html.Writer = function(settings) {
 

 				// set the original text node to its new value

 				if (how != CLONE) {

-					t[START_CONTAINER].deleteData(t[START_OFFSET], t[END_OFFSET] - t[START_OFFSET]);

+					n = t[START_CONTAINER];

+					start = t[START_OFFSET];

+					len = t[END_OFFSET] - t[START_OFFSET];

+

+					if (start === 0 && len >= n.nodeValue.length - 1) {

+						n.parentNode.removeChild(n);

+					} else {

+						n.deleteData(start, len);

+					}

 

 					// Nothing is partially selected, so collapse to start point

 					t.collapse(TRUE);

@@ -5171,7 +6531,10 @@ tinymce.html.Writer = function(settings) {
 				if (how == DELETE)

 					return;

 

-				frag.appendChild(doc.createTextNode(sub));

+				if (sub.length > 0) {

+					frag.appendChild(doc.createTextNode(sub));

+				}

+

 				return frag;

 			}

 

@@ -5179,7 +6542,7 @@ tinymce.html.Writer = function(settings) {
 			n = _getSelectedNode(t[START_CONTAINER], t[START_OFFSET]);

 			cnt = t[END_OFFSET] - t[START_OFFSET];

 

-			while (cnt > 0) {

+			while (n && cnt > 0) {

 				sibling = n.nextSibling;

 				xferNode = _traverseFullySelected(n, how);

 

@@ -5201,7 +6564,7 @@ tinymce.html.Writer = function(settings) {
 			var frag, n, endIdx, cnt, sibling, xferNode;

 

 			if (how != DELETE)

-				frag = doc.createDocumentFragment();

+				frag = createDocumentFragment();

 

 			n = _traverseRightBoundary(endAncestor, how);

 

@@ -5248,7 +6611,7 @@ tinymce.html.Writer = function(settings) {
 			var frag, startIdx, n, cnt, sibling, xferNode;

 

 			if (how != DELETE)

-				frag = doc.createDocumentFragment();

+				frag = createDocumentFragment();

 

 			n = _traverseLeftBoundary(startAncestor, how);

 			if (frag)

@@ -5259,7 +6622,7 @@ tinymce.html.Writer = function(settings) {
 

 			cnt = t[END_OFFSET] - startIdx;

 			n = startAncestor.nextSibling;

-			while (cnt > 0) {

+			while (n && cnt > 0) {

 				sibling = n.nextSibling;

 				xferNode = _traverseFullySelected(n, how);

 

@@ -5282,7 +6645,7 @@ tinymce.html.Writer = function(settings) {
 			var n, frag, commonParent, startOffset, endOffset, cnt, sibling, nextSibling;

 

 			if (how != DELETE)

-				frag = doc.createDocumentFragment();

+				frag = createDocumentFragment();

 

 			n = _traverseLeftBoundary(startAncestor, how);

 			if (frag)

@@ -5417,7 +6780,7 @@ tinymce.html.Writer = function(settings) {
 				if (how == DELETE)

 					return;

 

-				newNode = n.cloneNode(FALSE);

+				newNode = dom.clone(n, FALSE);

 				newNode.nodeValue = newNodeValue;

 

 				return newNode;

@@ -5426,12 +6789,12 @@ tinymce.html.Writer = function(settings) {
 			if (how == DELETE)

 				return;

 

-			return n.cloneNode(FALSE);

+			return dom.clone(n, FALSE);

 		};

 

 		function _traverseFullySelected(n, how) {

 			if (how != DELETE)

-				return how == CLONE ? n.cloneNode(TRUE) : n;

+				return how == CLONE ? dom.clone(n, TRUE) : n;

 

 			n.parentNode.removeChild(n);

 		};

@@ -5501,30 +6864,29 @@ tinymce.html.Writer = function(settings) {
 				} else

 					checkRng.collapse(false);

 

-				checkRng.setEndPoint(start ? 'EndToStart' : 'EndToEnd', rng);

-

-				// Fix for edge case: <div style="width: 100px; height:100px;"><table>..</table>ab|c</div>

-				if (checkRng.compareEndPoints(start ? 'StartToStart' : 'StartToEnd', rng) > 0) {

-					checkRng = rng.duplicate();

-					checkRng.collapse(start);

-

-					offset = -1;

-					while (parent == checkRng.parentElement()) {

-						if (checkRng.move('character', -1) == 0)

-							break;

-

-						offset++;

+				// Walk character by character in text node until we hit the selected range endpoint, hit the end of document or parent isn't the right one

+				// We need to walk char by char since rng.text or rng.htmlText will trim line endings

+				offset = 0;

+				while (checkRng.compareEndPoints(start ? 'StartToStart' : 'StartToEnd', rng) !== 0) {

+					if (checkRng.move('character', 1) === 0 || parent != checkRng.parentElement()) {

+						break;

 					}

-				}

 

-				offset = offset || checkRng.text.replace('\r\n', ' ').length;

+					offset++;

+				}

 			} else {

 				// Child position is after the selection endpoint

 				checkRng.collapse(true);

-				checkRng.setEndPoint(start ? 'StartToStart' : 'StartToEnd', rng);

 

-				// Get the length of the text to find where the endpoint is relative to it's container

-				offset = checkRng.text.replace('\r\n', ' ').length;

+				// Walk character by character in text node until we hit the selected range endpoint, hit the end of document or parent isn't the right one

+				offset = 0;

+				while (checkRng.compareEndPoints(start ? 'StartToStart' : 'StartToEnd', rng) !== 0) {

+					if (checkRng.move('character', -1) === 0 || parent != checkRng.parentElement()) {

+						break;

+					}

+

+					offset++;

+				}

 			}

 

 			return {node : child, position : position, offset : offset, inside : inside};

@@ -5685,12 +7047,12 @@ tinymce.html.Writer = function(settings) {
 			var rng = selection.getRng(), start, end, bookmark = {};

 

 			function getIndexes(node) {

-				var node, parent, root, children, i, indexes = [];

+				var parent, root, children, i, indexes = [];

 

 				parent = node.parentNode;

 				root = dom.getRoot().parentNode;

 

-				while (parent != root) {

+				while (parent != root && parent.nodeType !== 9) {

 					children = parent.children;

 

 					i = children.length;

@@ -5826,12 +7188,13 @@ tinymce.html.Writer = function(settings) {
 						}

 

 						tmpRng.moveToElementText(marker);

-					} else {

+					} else if (container.canHaveHTML) {

 						// Empty node selection for example <div>|</div>

-						marker = doc.createTextNode('\uFEFF');

-						container.appendChild(marker);

-						tmpRng.moveToElementText(marker.parentNode);

-						tmpRng.collapse(TRUE);

+						// Setting innerHTML with a span marker then remove that marker seems to keep empty block elements open

+						container.innerHTML = '<span>\uFEFF</span>';

+						marker = container.firstChild;

+						tmpRng.moveToElementText(marker);

+						tmpRng.collapse(FALSE); // Collapse false works better than true for some odd reason

 					}

 

 					ieRng.setEndPoint(start ? 'StartToStart' : 'EndToEnd', tmpRng);

@@ -5847,7 +7210,22 @@ tinymce.html.Writer = function(settings) {
 			ieRng = body.createTextRange();

 

 			// If single element selection then try making a control selection out of it

-			if (startContainer == endContainer && startContainer.nodeType == 1 && startOffset == endOffset - 1) {

+			if (startContainer == endContainer && startContainer.nodeType == 1) {

+				// Trick to place the caret inside an empty block element like <p></p>

+				if (startOffset == endOffset && !startContainer.hasChildNodes()) {

+					if (startContainer.canHaveHTML) {

+						startContainer.innerHTML = '<span>\uFEFF</span><span>\uFEFF</span>';

+						ieRng.moveToElementText(startContainer.lastChild);

+						ieRng.select();

+						dom.doc.selection.clear();

+						startContainer.innerHTML = '';

+						return;

+					} else {

+						startOffset = dom.nodeIndex(startContainer);

+						startContainer = startContainer.parentNode;

+					}

+				}

+

 				if (startOffset == endOffset - 1) {

 					try {

 						ctrlRng = body.createControlRange();

@@ -5878,29 +7256,33 @@ tinymce.html.Writer = function(settings) {
 

 

 /*

- * Sizzle CSS Selector Engine - v1.0

- *  Copyright 2009, The Dojo Foundation

+ * Sizzle CSS Selector Engine

+ *  Copyright, The Dojo Foundation

  *  Released under the MIT, BSD, and GPL Licenses.

  *  More information: http://sizzlejs.com/

  */

 (function(){

 

 var chunker = /((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^\[\]]*\]|['"][^'"]*['"]|[^\[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,

+	expando = "sizcache",

 	done = 0,

 	toString = Object.prototype.toString,

 	hasDuplicate = false,

-	baseHasDuplicate = true;

+	baseHasDuplicate = true,

+	rBackslash = /\\/g,

+	rReturn = /\r\n/g,

+	rNonWord = /\W/;

 

 // Here we check if the JavaScript engine is using some sort of

 // optimization where it does not always call our comparision

 // function. If that is the case, discard the hasDuplicate value.

 //   Thus far that includes Google Chrome.

-[0, 0].sort(function(){

+[0, 0].sort(function() {

 	baseHasDuplicate = false;

 	return 0;

 });

 

-var Sizzle = function(selector, context, results, seed) {

+var Sizzle = function( selector, context, results, seed ) {

 	results = results || [];

 	context = context || document;

 

@@ -5909,24 +7291,27 @@ var Sizzle = function(selector, context, results, seed) {
 	if ( context.nodeType !== 1 && context.nodeType !== 9 ) {

 		return [];

 	}

-	

+

 	if ( !selector || typeof selector !== "string" ) {

 		return results;

 	}

 

-	var parts = [], m, set, checkSet, extra, prune = true, contextXML = Sizzle.isXML(context),

-		soFar = selector, ret, cur, pop, i;

-	

+	var m, set, checkSet, extra, ret, cur, pop, i,

+		prune = true,

+		contextXML = Sizzle.isXML( context ),

+		parts = [],

+		soFar = selector;

+

 	// Reset the position of the chunker regexp (start from head)

 	do {

-		chunker.exec("");

-		m = chunker.exec(soFar);

+		chunker.exec( "" );

+		m = chunker.exec( soFar );

 

 		if ( m ) {

 			soFar = m[3];

-		

+

 			parts.push( m[1] );

-		

+

 			if ( m[2] ) {

 				extra = m[3];

 				break;

@@ -5935,8 +7320,10 @@ var Sizzle = function(selector, context, results, seed) {
 	} while ( m );

 

 	if ( parts.length > 1 && origPOS.exec( selector ) ) {

+

 		if ( parts.length === 2 && Expr.relative[ parts[0] ] ) {

-			set = posProcess( parts[0] + parts[1], context );

+			set = posProcess( parts[0] + parts[1], context, seed );

+

 		} else {

 			set = Expr.relative[ parts[0] ] ?

 				[ context ] :

@@ -5948,27 +7335,35 @@ var Sizzle = function(selector, context, results, seed) {
 				if ( Expr.relative[ selector ] ) {

 					selector += parts.shift();

 				}

-				

-				set = posProcess( selector, set );

+

+				set = posProcess( selector, set, seed );

 			}

 		}

+

 	} else {

 		// Take a shortcut and set the context if the root selector is an ID

 		// (but not if it'll be faster if the inner selector is an ID)

 		if ( !seed && parts.length > 1 && context.nodeType === 9 && !contextXML &&

 				Expr.match.ID.test(parts[0]) && !Expr.match.ID.test(parts[parts.length - 1]) ) {

+

 			ret = Sizzle.find( parts.shift(), context, contextXML );

-			context = ret.expr ? Sizzle.filter( ret.expr, ret.set )[0] : ret.set[0];

+			context = ret.expr ?

+				Sizzle.filter( ret.expr, ret.set )[0] :

+				ret.set[0];

 		}

 

 		if ( context ) {

 			ret = seed ?

 				{ expr: parts.pop(), set: makeArray(seed) } :

 				Sizzle.find( parts.pop(), parts.length === 1 && (parts[0] === "~" || parts[0] === "+") && context.parentNode ? context.parentNode : context, contextXML );

-			set = ret.expr ? Sizzle.filter( ret.expr, ret.set ) : ret.set;

+

+			set = ret.expr ?

+				Sizzle.filter( ret.expr, ret.set ) :

+				ret.set;

 

 			if ( parts.length > 0 ) {

-				checkSet = makeArray(set);

+				checkSet = makeArray( set );

+

 			} else {

 				prune = false;

 			}

@@ -5989,6 +7384,7 @@ var Sizzle = function(selector, context, results, seed) {
 

 				Expr.relative[ cur ]( checkSet, pop, contextXML );

 			}

+

 		} else {

 			checkSet = parts = [];

 		}

@@ -6005,12 +7401,14 @@ var Sizzle = function(selector, context, results, seed) {
 	if ( toString.call(checkSet) === "[object Array]" ) {

 		if ( !prune ) {

 			results.push.apply( results, checkSet );

+

 		} else if ( context && context.nodeType === 1 ) {

 			for ( i = 0; checkSet[i] != null; i++ ) {

 				if ( checkSet[i] && (checkSet[i] === true || checkSet[i].nodeType === 1 && Sizzle.contains(context, checkSet[i])) ) {

 					results.push( set[i] );

 				}

 			}

+

 		} else {

 			for ( i = 0; checkSet[i] != null; i++ ) {

 				if ( checkSet[i] && checkSet[i].nodeType === 1 ) {

@@ -6018,6 +7416,7 @@ var Sizzle = function(selector, context, results, seed) {
 				}

 			}

 		}

+

 	} else {

 		makeArray( checkSet, results );

 	}

@@ -6030,15 +7429,15 @@ var Sizzle = function(selector, context, results, seed) {
 	return results;

 };

 

-Sizzle.uniqueSort = function(results){

+Sizzle.uniqueSort = function( results ) {

 	if ( sortOrder ) {

 		hasDuplicate = baseHasDuplicate;

-		results.sort(sortOrder);

+		results.sort( sortOrder );

 

 		if ( hasDuplicate ) {

 			for ( var i = 1; i < results.length; i++ ) {

-				if ( results[i] === results[i-1] ) {

-					results.splice(i--, 1);

+				if ( results[i] === results[ i - 1 ] ) {

+					results.splice( i--, 1 );

 				}

 			}

 		}

@@ -6047,27 +7446,32 @@ Sizzle.uniqueSort = function(results){
 	return results;

 };

 

-Sizzle.matches = function(expr, set){

-	return Sizzle(expr, null, null, set);

+Sizzle.matches = function( expr, set ) {

+	return Sizzle( expr, null, null, set );

+};

+

+Sizzle.matchesSelector = function( node, expr ) {

+	return Sizzle( expr, null, null, [node] ).length > 0;

 };

 

-Sizzle.find = function(expr, context, isXML){

-	var set;

+Sizzle.find = function( expr, context, isXML ) {

+	var set, i, len, match, type, left;

 

 	if ( !expr ) {

 		return [];

 	}

 

-	for ( var i = 0, l = Expr.order.length; i < l; i++ ) {

-		var type = Expr.order[i], match;

-		

+	for ( i = 0, len = Expr.order.length; i < len; i++ ) {

+		type = Expr.order[i];

+

 		if ( (match = Expr.leftMatch[ type ].exec( expr )) ) {

-			var left = match[1];

-			match.splice(1,1);

+			left = match[1];

+			match.splice( 1, 1 );

 

 			if ( left.substr( left.length - 1 ) !== "\\" ) {

-				match[1] = (match[1] || "").replace(/\\/g, "");

+				match[1] = (match[1] || "").replace( rBackslash, "" );

 				set = Expr.find[ type ]( match, context, isXML );

+

 				if ( set != null ) {

 					expr = expr.replace( Expr.match[ type ], "" );

 					break;

@@ -6077,20 +7481,29 @@ Sizzle.find = function(expr, context, isXML){
 	}

 

 	if ( !set ) {

-		set = context.getElementsByTagName("*");

+		set = typeof context.getElementsByTagName !== "undefined" ?

+			context.getElementsByTagName( "*" ) :

+			[];

 	}

 

-	return {set: set, expr: expr};

+	return { set: set, expr: expr };

 };

 

-Sizzle.filter = function(expr, set, inplace, not){

-	var old = expr, result = [], curLoop = set, match, anyFound,

-		isXMLFilter = set && set[0] && Sizzle.isXML(set[0]);

+Sizzle.filter = function( expr, set, inplace, not ) {

+	var match, anyFound,

+		type, found, item, filter, left,

+		i, pass,

+		old = expr,

+		result = [],

+		curLoop = set,

+		isXMLFilter = set && set[0] && Sizzle.isXML( set[0] );

 

 	while ( expr && set.length ) {

-		for ( var type in Expr.filter ) {

+		for ( type in Expr.filter ) {

 			if ( (match = Expr.leftMatch[ type ].exec( expr )) != null && match[2] ) {

-				var filter = Expr.filter[ type ], found, item, left = match[1];

+				filter = Expr.filter[ type ];

+				left = match[1];

+

 				anyFound = false;

 

 				match.splice(1,1);

@@ -6108,23 +7521,26 @@ Sizzle.filter = function(expr, set, inplace, not){
 

 					if ( !match ) {

 						anyFound = found = true;

+

 					} else if ( match === true ) {

 						continue;

 					}

 				}

 

 				if ( match ) {

-					for ( var i = 0; (item = curLoop[i]) != null; i++ ) {

+					for ( i = 0; (item = curLoop[i]) != null; i++ ) {

 						if ( item ) {

 							found = filter( item, match, i, curLoop );

-							var pass = not ^ !!found;

+							pass = not ^ found;

 

 							if ( inplace && found != null ) {

 								if ( pass ) {

 									anyFound = true;

+

 								} else {

 									curLoop[i] = false;

 								}

+

 							} else if ( pass ) {

 								result.push( item );

 								anyFound = true;

@@ -6153,6 +7569,7 @@ Sizzle.filter = function(expr, set, inplace, not){
 		if ( expr === old ) {

 			if ( anyFound == null ) {

 				Sizzle.error( expr );

+

 			} else {

 				break;

 			}

@@ -6165,35 +7582,78 @@ Sizzle.filter = function(expr, set, inplace, not){
 };

 

 Sizzle.error = function( msg ) {

-	throw "Syntax error, unrecognized expression: " + msg;

+	throw new Error( "Syntax error, unrecognized expression: " + msg );

+};

+

+var getText = Sizzle.getText = function( elem ) {

+    var i, node,

+		nodeType = elem.nodeType,

+		ret = "";

+

+	if ( nodeType ) {

+		if ( nodeType === 1 || nodeType === 9 || nodeType === 11 ) {

+			// Use textContent || innerText for elements

+			if ( typeof elem.textContent === 'string' ) {

+				return elem.textContent;

+			} else if ( typeof elem.innerText === 'string' ) {

+				// Replace IE's carriage returns

+				return elem.innerText.replace( rReturn, '' );

+			} else {

+				// Traverse it's children

+				for ( elem = elem.firstChild; elem; elem = elem.nextSibling) {

+					ret += getText( elem );

+				}

+			}

+		} else if ( nodeType === 3 || nodeType === 4 ) {

+			return elem.nodeValue;

+		}

+	} else {

+

+		// If no nodeType, this is expected to be an array

+		for ( i = 0; (node = elem[i]); i++ ) {

+			// Do not traverse comment nodes

+			if ( node.nodeType !== 8 ) {

+				ret += getText( node );

+			}

+		}

+	}

+	return ret;

 };

 

 var Expr = Sizzle.selectors = {

 	order: [ "ID", "NAME", "TAG" ],

+

 	match: {

 		ID: /#((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,

 		CLASS: /\.((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,

 		NAME: /\[name=['"]*((?:[\w\u00c0-\uFFFF\-]|\\.)+)['"]*\]/,

-		ATTR: /\[\s*((?:[\w\u00c0-\uFFFF\-]|\\.)+)\s*(?:(\S?=)\s*(['"]*)(.*?)\3|)\s*\]/,

+		ATTR: /\[\s*((?:[\w\u00c0-\uFFFF\-]|\\.)+)\s*(?:(\S?=)\s*(?:(['"])(.*?)\3|(#?(?:[\w\u00c0-\uFFFF\-]|\\.)*)|)|)\s*\]/,

 		TAG: /^((?:[\w\u00c0-\uFFFF\*\-]|\\.)+)/,

-		CHILD: /:(only|nth|last|first)-child(?:\((even|odd|[\dn+\-]*)\))?/,

+		CHILD: /:(only|nth|last|first)-child(?:\(\s*(even|odd|(?:[+\-]?\d+|(?:[+\-]?\d*)?n\s*(?:[+\-]\s*\d+)?))\s*\))?/,

 		POS: /:(nth|eq|gt|lt|first|last|even|odd)(?:\((\d*)\))?(?=[^\-]|$)/,

 		PSEUDO: /:((?:[\w\u00c0-\uFFFF\-]|\\.)+)(?:\((['"]?)((?:\([^\)]+\)|[^\(\)]*)+)\2\))?/

 	},

+

 	leftMatch: {},

+

 	attrMap: {

 		"class": "className",

 		"for": "htmlFor"

 	},

+

 	attrHandle: {

-		href: function(elem){

-			return elem.getAttribute("href");

+		href: function( elem ) {

+			return elem.getAttribute( "href" );

+		},

+		type: function( elem ) {

+			return elem.getAttribute( "type" );

 		}

 	},

+

 	relative: {

 		"+": function(checkSet, part){

 			var isPartStr = typeof part === "string",

-				isTag = isPartStr && !/\W/.test(part),

+				isTag = isPartStr && !rNonWord.test( part ),

 				isPartStrNotTag = isPartStr && !isTag;

 

 			if ( isTag ) {

@@ -6214,23 +7674,29 @@ var Expr = Sizzle.selectors = {
 				Sizzle.filter( part, checkSet, true );

 			}

 		},

-		">": function(checkSet, part){

-			var isPartStr = typeof part === "string",

-				elem, i = 0, l = checkSet.length;

 

-			if ( isPartStr && !/\W/.test(part) ) {

+		">": function( checkSet, part ) {

+			var elem,

+				isPartStr = typeof part === "string",

+				i = 0,

+				l = checkSet.length;

+

+			if ( isPartStr && !rNonWord.test( part ) ) {

 				part = part.toLowerCase();

 

 				for ( ; i < l; i++ ) {

 					elem = checkSet[i];

+

 					if ( elem ) {

 						var parent = elem.parentNode;

 						checkSet[i] = parent.nodeName.toLowerCase() === part ? parent : false;

 					}

 				}

+

 			} else {

 				for ( ; i < l; i++ ) {

 					elem = checkSet[i];

+

 					if ( elem ) {

 						checkSet[i] = isPartStr ?

 							elem.parentNode :

@@ -6243,39 +7709,50 @@ var Expr = Sizzle.selectors = {
 				}

 			}

 		},

+

 		"": function(checkSet, part, isXML){

-			var doneName = done++, checkFn = dirCheck, nodeCheck;

+			var nodeCheck,

+				doneName = done++,

+				checkFn = dirCheck;

 

-			if ( typeof part === "string" && !/\W/.test(part) ) {

+			if ( typeof part === "string" && !rNonWord.test( part ) ) {

 				part = part.toLowerCase();

 				nodeCheck = part;

 				checkFn = dirNodeCheck;

 			}

 

-			checkFn("parentNode", part, doneName, checkSet, nodeCheck, isXML);

+			checkFn( "parentNode", part, doneName, checkSet, nodeCheck, isXML );

 		},

-		"~": function(checkSet, part, isXML){

-			var doneName = done++, checkFn = dirCheck, nodeCheck;

 

-			if ( typeof part === "string" && !/\W/.test(part) ) {

+		"~": function( checkSet, part, isXML ) {

+			var nodeCheck,

+				doneName = done++,

+				checkFn = dirCheck;

+

+			if ( typeof part === "string" && !rNonWord.test( part ) ) {

 				part = part.toLowerCase();

 				nodeCheck = part;

 				checkFn = dirNodeCheck;

 			}

 

-			checkFn("previousSibling", part, doneName, checkSet, nodeCheck, isXML);

+			checkFn( "previousSibling", part, doneName, checkSet, nodeCheck, isXML );

 		}

 	},

+

 	find: {

-		ID: function(match, context, isXML){

+		ID: function( match, context, isXML ) {

 			if ( typeof context.getElementById !== "undefined" && !isXML ) {

 				var m = context.getElementById(match[1]);

-				return m ? [m] : [];

+				// Check parentNode to catch when Blackberry 4.6 returns

+				// nodes that are no longer in the document #6963

+				return m && m.parentNode ? [m] : [];

 			}

 		},

-		NAME: function(match, context){

+

+		NAME: function( match, context ) {

 			if ( typeof context.getElementsByName !== "undefined" ) {

-				var ret = [], results = context.getElementsByName(match[1]);

+				var ret = [],

+					results = context.getElementsByName( match[1] );

 

 				for ( var i = 0, l = results.length; i < l; i++ ) {

 					if ( results[i].getAttribute("name") === match[1] ) {

@@ -6286,13 +7763,16 @@ var Expr = Sizzle.selectors = {
 				return ret.length === 0 ? null : ret;

 			}

 		},

-		TAG: function(match, context){

-			return context.getElementsByTagName(match[1]);

+

+		TAG: function( match, context ) {

+			if ( typeof context.getElementsByTagName !== "undefined" ) {

+				return context.getElementsByTagName( match[1] );

+			}

 		}

 	},

 	preFilter: {

-		CLASS: function(match, curLoop, inplace, result, not, isXML){

-			match = " " + match[1].replace(/\\/g, "") + " ";

+		CLASS: function( match, curLoop, inplace, result, not, isXML ) {

+			match = " " + match[1].replace( rBackslash, "" ) + " ";

 

 			if ( isXML ) {

 				return match;

@@ -6300,10 +7780,11 @@ var Expr = Sizzle.selectors = {
 

 			for ( var i = 0, elem; (elem = curLoop[i]) != null; i++ ) {

 				if ( elem ) {

-					if ( not ^ (elem.className && (" " + elem.className + " ").replace(/[\t\n]/g, " ").indexOf(match) >= 0) ) {

+					if ( not ^ (elem.className && (" " + elem.className + " ").replace(/[\t\n\r]/g, " ").indexOf(match) >= 0) ) {

 						if ( !inplace ) {

 							result.push( elem );

 						}

+

 					} else if ( inplace ) {

 						curLoop[i] = false;

 					}

@@ -6312,16 +7793,25 @@ var Expr = Sizzle.selectors = {
 

 			return false;

 		},

-		ID: function(match){

-			return match[1].replace(/\\/g, "");

+

+		ID: function( match ) {

+			return match[1].replace( rBackslash, "" );

 		},

-		TAG: function(match, curLoop){

-			return match[1].toLowerCase();

+

+		TAG: function( match, curLoop ) {

+			return match[1].replace( rBackslash, "" ).toLowerCase();

 		},

-		CHILD: function(match){

+

+		CHILD: function( match ) {

 			if ( match[1] === "nth" ) {

+				if ( !match[2] ) {

+					Sizzle.error( match[0] );

+				}

+

+				match[2] = match[2].replace(/^\+|\s*/g, '');

+

 				// parse equations like 'even', 'odd', '5', '2n', '3n+2', '4n-1', '-n+6'

-				var test = /(-?)(\d*)n((?:\+|-)?\d*)/.exec(

+				var test = /(-?)(\d*)(?:n([+\-]?\d*))?/.exec(

 					match[2] === "even" && "2n" || match[2] === "odd" && "2n+1" ||

 					!/\D/.test( match[2] ) && "0n+" + match[2] || match[2]);

 

@@ -6329,141 +7819,196 @@ var Expr = Sizzle.selectors = {
 				match[2] = (test[1] + (test[2] || 1)) - 0;

 				match[3] = test[3] - 0;

 			}

+			else if ( match[2] ) {

+				Sizzle.error( match[0] );

+			}

 

 			// TODO: Move to normal caching system

 			match[0] = done++;

 

 			return match;

 		},

-		ATTR: function(match, curLoop, inplace, result, not, isXML){

-			var name = match[1].replace(/\\/g, "");

-			

+

+		ATTR: function( match, curLoop, inplace, result, not, isXML ) {

+			var name = match[1] = match[1].replace( rBackslash, "" );

+

 			if ( !isXML && Expr.attrMap[name] ) {

 				match[1] = Expr.attrMap[name];

 			}

 

+			// Handle if an un-quoted value was used

+			match[4] = ( match[4] || match[5] || "" ).replace( rBackslash, "" );

+

 			if ( match[2] === "~=" ) {

 				match[4] = " " + match[4] + " ";

 			}

 

 			return match;

 		},

-		PSEUDO: function(match, curLoop, inplace, result, not){

+

+		PSEUDO: function( match, curLoop, inplace, result, not ) {

 			if ( match[1] === "not" ) {

 				// If we're dealing with a complex expression, or a simple one

 				if ( ( chunker.exec(match[3]) || "" ).length > 1 || /^\w/.test(match[3]) ) {

 					match[3] = Sizzle(match[3], null, null, curLoop);

+

 				} else {

 					var ret = Sizzle.filter(match[3], curLoop, inplace, true ^ not);

+

 					if ( !inplace ) {

 						result.push.apply( result, ret );

 					}

+

 					return false;

 				}

+

 			} else if ( Expr.match.POS.test( match[0] ) || Expr.match.CHILD.test( match[0] ) ) {

 				return true;

 			}

-			

+

 			return match;

 		},

-		POS: function(match){

+

+		POS: function( match ) {

 			match.unshift( true );

+

 			return match;

 		}

 	},

+

 	filters: {

-		enabled: function(elem){

+		enabled: function( elem ) {

 			return elem.disabled === false && elem.type !== "hidden";

 		},

-		disabled: function(elem){

+

+		disabled: function( elem ) {

 			return elem.disabled === true;

 		},

-		checked: function(elem){

+

+		checked: function( elem ) {

 			return elem.checked === true;

 		},

-		selected: function(elem){

+

+		selected: function( elem ) {

 			// Accessing this property makes selected-by-default

 			// options in Safari work properly

-			elem.parentNode.selectedIndex;

+			if ( elem.parentNode ) {

+				elem.parentNode.selectedIndex;

+			}

+

 			return elem.selected === true;

 		},

-		parent: function(elem){

+

+		parent: function( elem ) {

 			return !!elem.firstChild;

 		},

-		empty: function(elem){

+

+		empty: function( elem ) {

 			return !elem.firstChild;

 		},

-		has: function(elem, i, match){

+

+		has: function( elem, i, match ) {

 			return !!Sizzle( match[3], elem ).length;

 		},

-		header: function(elem){

+

+		header: function( elem ) {

 			return (/h\d/i).test( elem.nodeName );

 		},

-		text: function(elem){

-			return "text" === elem.type;

+

+		text: function( elem ) {

+			var attr = elem.getAttribute( "type" ), type = elem.type;

+			// IE6 and 7 will map elem.type to 'text' for new HTML5 types (search, etc)

+			// use getAttribute instead to test this case

+			return elem.nodeName.toLowerCase() === "input" && "text" === type && ( attr === type || attr === null );

 		},

-		radio: function(elem){

-			return "radio" === elem.type;

+

+		radio: function( elem ) {

+			return elem.nodeName.toLowerCase() === "input" && "radio" === elem.type;

 		},

-		checkbox: function(elem){

-			return "checkbox" === elem.type;

+

+		checkbox: function( elem ) {

+			return elem.nodeName.toLowerCase() === "input" && "checkbox" === elem.type;

 		},

-		file: function(elem){

-			return "file" === elem.type;

+

+		file: function( elem ) {

+			return elem.nodeName.toLowerCase() === "input" && "file" === elem.type;

 		},

-		password: function(elem){

-			return "password" === elem.type;

+

+		password: function( elem ) {

+			return elem.nodeName.toLowerCase() === "input" && "password" === elem.type;

 		},

-		submit: function(elem){

-			return "submit" === elem.type;

+

+		submit: function( elem ) {

+			var name = elem.nodeName.toLowerCase();

+			return (name === "input" || name === "button") && "submit" === elem.type;

+		},

+

+		image: function( elem ) {

+			return elem.nodeName.toLowerCase() === "input" && "image" === elem.type;

 		},

-		image: function(elem){

-			return "image" === elem.type;

+

+		reset: function( elem ) {

+			var name = elem.nodeName.toLowerCase();

+			return (name === "input" || name === "button") && "reset" === elem.type;

 		},

-		reset: function(elem){

-			return "reset" === elem.type;

+

+		button: function( elem ) {

+			var name = elem.nodeName.toLowerCase();

+			return name === "input" && "button" === elem.type || name === "button";

 		},

-		button: function(elem){

-			return "button" === elem.type || elem.nodeName.toLowerCase() === "button";

+

+		input: function( elem ) {

+			return (/input|select|textarea|button/i).test( elem.nodeName );

 		},

-		input: function(elem){

-			return (/input|select|textarea|button/i).test(elem.nodeName);

+

+		focus: function( elem ) {

+			return elem === elem.ownerDocument.activeElement;

 		}

 	},

 	setFilters: {

-		first: function(elem, i){

+		first: function( elem, i ) {

 			return i === 0;

 		},

-		last: function(elem, i, match, array){

+

+		last: function( elem, i, match, array ) {

 			return i === array.length - 1;

 		},

-		even: function(elem, i){

+

+		even: function( elem, i ) {

 			return i % 2 === 0;

 		},

-		odd: function(elem, i){

+

+		odd: function( elem, i ) {

 			return i % 2 === 1;

 		},

-		lt: function(elem, i, match){

+

+		lt: function( elem, i, match ) {

 			return i < match[3] - 0;

 		},

-		gt: function(elem, i, match){

+

+		gt: function( elem, i, match ) {

 			return i > match[3] - 0;

 		},

-		nth: function(elem, i, match){

+

+		nth: function( elem, i, match ) {

 			return match[3] - 0 === i;

 		},

-		eq: function(elem, i, match){

+

+		eq: function( elem, i, match ) {

 			return match[3] - 0 === i;

 		}

 	},

 	filter: {

-		PSEUDO: function(elem, match, i, array){

-			var name = match[1], filter = Expr.filters[ name ];

+		PSEUDO: function( elem, match, i, array ) {

+			var name = match[1],

+				filter = Expr.filters[ name ];

 

 			if ( filter ) {

 				return filter( elem, i, match, array );

+

 			} else if ( name === "contains" ) {

-				return (elem.textContent || elem.innerText || Sizzle.getText([ elem ]) || "").indexOf(match[3]) >= 0;

+				return (elem.textContent || elem.innerText || getText([ elem ]) || "").indexOf(match[3]) >= 0;

+

 			} else if ( name === "not" ) {

 				var not = match[3];

 

@@ -6474,72 +8019,96 @@ var Expr = Sizzle.selectors = {
 				}

 

 				return true;

+

 			} else {

-				Sizzle.error( "Syntax error, unrecognized expression: " + name );

+				Sizzle.error( name );

 			}

 		},

-		CHILD: function(elem, match){

-			var type = match[1], node = elem;

-			switch (type) {

-				case 'only':

-				case 'first':

-					while ( (node = node.previousSibling) )	 {

-						if ( node.nodeType === 1 ) { 

-							return false; 

+

+		CHILD: function( elem, match ) {

+			var first, last,

+				doneName, parent, cache,

+				count, diff,

+				type = match[1],

+				node = elem;

+

+			switch ( type ) {

+				case "only":

+				case "first":

+					while ( (node = node.previousSibling) ) {

+						if ( node.nodeType === 1 ) {

+							return false;

 						}

 					}

-					if ( type === "first" ) { 

-						return true; 

+

+					if ( type === "first" ) {

+						return true;

 					}

+

 					node = elem;

-				case 'last':

-					while ( (node = node.nextSibling) )	 {

-						if ( node.nodeType === 1 ) { 

-							return false; 

+

+					/* falls through */

+				case "last":

+					while ( (node = node.nextSibling) ) {

+						if ( node.nodeType === 1 ) {

+							return false;

 						}

 					}

+

 					return true;

-				case 'nth':

-					var first = match[2], last = match[3];

+

+				case "nth":

+					first = match[2];

+					last = match[3];

 

 					if ( first === 1 && last === 0 ) {

 						return true;

 					}

-					

-					var doneName = match[0],

-						parent = elem.parentNode;

-	

-					if ( parent && (parent.sizcache !== doneName || !elem.nodeIndex) ) {

-						var count = 0;

+

+					doneName = match[0];

+					parent = elem.parentNode;

+

+					if ( parent && (parent[ expando ] !== doneName || !elem.nodeIndex) ) {

+						count = 0;

+

 						for ( node = parent.firstChild; node; node = node.nextSibling ) {

 							if ( node.nodeType === 1 ) {

 								node.nodeIndex = ++count;

 							}

-						} 

-						parent.sizcache = doneName;

+						}

+

+						parent[ expando ] = doneName;

 					}

-					

-					var diff = elem.nodeIndex - last;

+

+					diff = elem.nodeIndex - last;

+

 					if ( first === 0 ) {

 						return diff === 0;

+

 					} else {

 						return ( diff % first === 0 && diff / first >= 0 );

 					}

 			}

 		},

-		ID: function(elem, match){

+

+		ID: function( elem, match ) {

 			return elem.nodeType === 1 && elem.getAttribute("id") === match;

 		},

-		TAG: function(elem, match){

-			return (match === "*" && elem.nodeType === 1) || elem.nodeName.toLowerCase() === match;

+

+		TAG: function( elem, match ) {

+			return (match === "*" && elem.nodeType === 1) || !!elem.nodeName && elem.nodeName.toLowerCase() === match;

 		},

-		CLASS: function(elem, match){

+

+		CLASS: function( elem, match ) {

 			return (" " + (elem.className || elem.getAttribute("class")) + " ")

 				.indexOf( match ) > -1;

 		},

-		ATTR: function(elem, match){

+

+		ATTR: function( elem, match ) {

 			var name = match[1],

-				result = Expr.attrHandle[ name ] ?

+				result = Sizzle.attr ?

+					Sizzle.attr( elem, name ) :

+					Expr.attrHandle[ name ] ?

 					Expr.attrHandle[ name ]( elem ) :

 					elem[ name ] != null ?

 						elem[ name ] :

@@ -6550,6 +8119,8 @@ var Expr = Sizzle.selectors = {
 

 			return result == null ?

 				type === "!=" :

+				!type && Sizzle.attr ?

+				result != null :

 				type === "=" ?

 				value === check :

 				type === "*=" ?

@@ -6568,8 +8139,10 @@ var Expr = Sizzle.selectors = {
 				value === check || value.substr(0, check.length + 1) === check + "-" :

 				false;

 		},

-		POS: function(elem, match, i, array){

-			var name = match[2], filter = Expr.setFilters[ name ];

+

+		POS: function( elem, match, i, array ) {

+			var name = match[2],

+				filter = Expr.setFilters[ name ];

 

 			if ( filter ) {

 				return filter( elem, i, match, array );

@@ -6587,15 +8160,18 @@ for ( var type in Expr.match ) {
 	Expr.match[ type ] = new RegExp( Expr.match[ type ].source + (/(?![^\[]*\])(?![^\(]*\))/.source) );

 	Expr.leftMatch[ type ] = new RegExp( /(^(?:.|\r|\n)*?)/.source + Expr.match[ type ].source.replace(/\\(\d+)/g, fescape) );

 }

+// Expose origPOS

+// "global" as in regardless of relation to brackets/parens

+Expr.match.globalPOS = origPOS;

 

-var makeArray = function(array, results) {

+var makeArray = function( array, results ) {

 	array = Array.prototype.slice.call( array, 0 );

 

 	if ( results ) {

 		results.push.apply( results, array );

 		return results;

 	}

-	

+

 	return array;

 };

 

@@ -6607,17 +8183,20 @@ try {
 	Array.prototype.slice.call( document.documentElement.childNodes, 0 )[0].nodeType;

 

 // Provide a fallback method if it does not work

-} catch(e){

-	makeArray = function(array, results) {

-		var ret = results || [], i = 0;

+} catch( e ) {

+	makeArray = function( array, results ) {

+		var i = 0,

+			ret = results || [];

 

 		if ( toString.call(array) === "[object Array]" ) {

 			Array.prototype.push.apply( ret, array );

+

 		} else {

 			if ( typeof array.length === "number" ) {

 				for ( var l = array.length; i < l; i++ ) {

 					ret.push( array[i] );

 				}

+

 			} else {

 				for ( ; array[i]; i++ ) {

 					ret.push( array[i] );

@@ -6629,110 +8208,141 @@ try {
 	};

 }

 

-var sortOrder;

+var sortOrder, siblingCheck;

 

 if ( document.documentElement.compareDocumentPosition ) {

 	sortOrder = function( a, b ) {

+		if ( a === b ) {

+			hasDuplicate = true;

+			return 0;

+		}

+

 		if ( !a.compareDocumentPosition || !b.compareDocumentPosition ) {

-			if ( a == b ) {

-				hasDuplicate = true;

-			}

 			return a.compareDocumentPosition ? -1 : 1;

 		}

 

-		var ret = a.compareDocumentPosition(b) & 4 ? -1 : a === b ? 0 : 1;

-		if ( ret === 0 ) {

-			hasDuplicate = true;

-		}

-		return ret;

+		return a.compareDocumentPosition(b) & 4 ? -1 : 1;

 	};

-} else if ( "sourceIndex" in document.documentElement ) {

+

+} else {

 	sortOrder = function( a, b ) {

-		if ( !a.sourceIndex || !b.sourceIndex ) {

-			if ( a == b ) {

-				hasDuplicate = true;

-			}

-			return a.sourceIndex ? -1 : 1;

+		// The nodes are identical, we can exit early

+		if ( a === b ) {

+			hasDuplicate = true;

+			return 0;

+

+		// Fallback to using sourceIndex (in IE) if it's available on both nodes

+		} else if ( a.sourceIndex && b.sourceIndex ) {

+			return a.sourceIndex - b.sourceIndex;

 		}

 

-		var ret = a.sourceIndex - b.sourceIndex;

-		if ( ret === 0 ) {

-			hasDuplicate = true;

+		var al, bl,

+			ap = [],

+			bp = [],

+			aup = a.parentNode,

+			bup = b.parentNode,

+			cur = aup;

+

+		// If the nodes are siblings (or identical) we can do a quick check

+		if ( aup === bup ) {

+			return siblingCheck( a, b );

+

+		// If no parents were found then the nodes are disconnected

+		} else if ( !aup ) {

+			return -1;

+

+		} else if ( !bup ) {

+			return 1;

 		}

-		return ret;

-	};

-} else if ( document.createRange ) {

-	sortOrder = function( a, b ) {

-		if ( !a.ownerDocument || !b.ownerDocument ) {

-			if ( a == b ) {

-				hasDuplicate = true;

-			}

-			return a.ownerDocument ? -1 : 1;

+

+		// Otherwise they're somewhere else in the tree so we need

+		// to build up a full list of the parentNodes for comparison

+		while ( cur ) {

+			ap.unshift( cur );

+			cur = cur.parentNode;

 		}

 

-		var aRange = a.ownerDocument.createRange(), bRange = b.ownerDocument.createRange();

-		aRange.setStart(a, 0);

-		aRange.setEnd(a, 0);

-		bRange.setStart(b, 0);

-		bRange.setEnd(b, 0);

-		var ret = aRange.compareBoundaryPoints(Range.START_TO_END, bRange);

-		if ( ret === 0 ) {

-			hasDuplicate = true;

+		cur = bup;

+

+		while ( cur ) {

+			bp.unshift( cur );

+			cur = cur.parentNode;

 		}

-		return ret;

+

+		al = ap.length;

+		bl = bp.length;

+

+		// Start walking down the tree looking for a discrepancy

+		for ( var i = 0; i < al && i < bl; i++ ) {

+			if ( ap[i] !== bp[i] ) {

+				return siblingCheck( ap[i], bp[i] );

+			}

+		}

+

+		// We ended someplace up the tree so do a sibling check

+		return i === al ?

+			siblingCheck( a, bp[i], -1 ) :

+			siblingCheck( ap[i], b, 1 );

 	};

-}

 

-// Utility function for retreiving the text value of an array of DOM nodes

-Sizzle.getText = function( elems ) {

-	var ret = "", elem;

+	siblingCheck = function( a, b, ret ) {

+		if ( a === b ) {

+			return ret;

+		}

 

-	for ( var i = 0; elems[i]; i++ ) {

-		elem = elems[i];

+		var cur = a.nextSibling;

 

-		// Get the text from text nodes and CDATA nodes

-		if ( elem.nodeType === 3 || elem.nodeType === 4 ) {

-			ret += elem.nodeValue;

+		while ( cur ) {

+			if ( cur === b ) {

+				return -1;

+			}

 

-		// Traverse everything else, except comment nodes

-		} else if ( elem.nodeType !== 8 ) {

-			ret += Sizzle.getText( elem.childNodes );

+			cur = cur.nextSibling;

 		}

-	}

 

-	return ret;

-};

+		return 1;

+	};

+}

 

 // Check to see if the browser returns elements by name when

 // querying by getElementById (and provide a workaround)

 (function(){

 	// We're going to inject a fake input element with a specified name

 	var form = document.createElement("div"),

-		id = "script" + (new Date()).getTime();

+		id = "script" + (new Date()).getTime(),

+		root = document.documentElement;

+

 	form.innerHTML = "<a name='" + id + "'/>";

 

 	// Inject it into the root element, check its status, and remove it quickly

-	var root = document.documentElement;

 	root.insertBefore( form, root.firstChild );

 

 	// The workaround has to do additional checks after a getElementById

 	// Which slows things down for other browsers (hence the branching)

 	if ( document.getElementById( id ) ) {

-		Expr.find.ID = function(match, context, isXML){

+		Expr.find.ID = function( match, context, isXML ) {

 			if ( typeof context.getElementById !== "undefined" && !isXML ) {

 				var m = context.getElementById(match[1]);

-				return m ? m.id === match[1] || typeof m.getAttributeNode !== "undefined" && m.getAttributeNode("id").nodeValue === match[1] ? [m] : undefined : [];

+

+				return m ?

+					m.id === match[1] || typeof m.getAttributeNode !== "undefined" && m.getAttributeNode("id").nodeValue === match[1] ?

+						[m] :

+						undefined :

+					[];

 			}

 		};

 

-		Expr.filter.ID = function(elem, match){

+		Expr.filter.ID = function( elem, match ) {

 			var node = typeof elem.getAttributeNode !== "undefined" && elem.getAttributeNode("id");

+

 			return elem.nodeType === 1 && node && node.nodeValue === match;

 		};

 	}

 

 	root.removeChild( form );

-	root = form = null; // release memory in IE

+

+	// release memory in IE

+	root = form = null;

 })();

 

 (function(){

@@ -6745,8 +8355,8 @@ Sizzle.getText = function( elems ) {
 

 	// Make sure no comments are found

 	if ( div.getElementsByTagName("*").length > 0 ) {

-		Expr.find.TAG = function(match, context){

-			var results = context.getElementsByTagName(match[1]);

+		Expr.find.TAG = function( match, context ) {

+			var results = context.getElementsByTagName( match[1] );

 

 			// Filter out possible comments

 			if ( match[1] === "*" ) {

@@ -6767,19 +8377,25 @@ Sizzle.getText = function( elems ) {
 

 	// Check to see if an attribute returns normalized href attributes

 	div.innerHTML = "<a href='#'></a>";

+

 	if ( div.firstChild && typeof div.firstChild.getAttribute !== "undefined" &&

 			div.firstChild.getAttribute("href") !== "#" ) {

-		Expr.attrHandle.href = function(elem){

-			return elem.getAttribute("href", 2);

+

+		Expr.attrHandle.href = function( elem ) {

+			return elem.getAttribute( "href", 2 );

 		};

 	}

 

-	div = null; // release memory in IE

+	// release memory in IE

+	div = null;

 })();

 

 if ( document.querySelectorAll ) {

 	(function(){

-		var oldSizzle = Sizzle, div = document.createElement("div");

+		var oldSizzle = Sizzle,

+			div = document.createElement("div"),

+			id = "__sizzle__";

+

 		div.innerHTML = "<p class='TEST'></p>";

 

 		// Safari can't handle uppercase or unicode characters when

@@ -6787,18 +8403,89 @@ if ( document.querySelectorAll ) {
 		if ( div.querySelectorAll && div.querySelectorAll(".TEST").length === 0 ) {

 			return;

 		}

-	

-		Sizzle = function(query, context, extra, seed){

+

+		Sizzle = function( query, context, extra, seed ) {

 			context = context || document;

 

 			// Only use querySelectorAll on non-XML documents

 			// (ID selectors don't work in non-HTML documents)

-			if ( !seed && context.nodeType === 9 && !Sizzle.isXML(context) ) {

-				try {

-					return makeArray( context.querySelectorAll(query), extra );

-				} catch(e){}

+			if ( !seed && !Sizzle.isXML(context) ) {

+				// See if we find a selector to speed up

+				var match = /^(\w+$)|^\.([\w\-]+$)|^#([\w\-]+$)/.exec( query );

+

+				if ( match && (context.nodeType === 1 || context.nodeType === 9) ) {

+					// Speed-up: Sizzle("TAG")

+					if ( match[1] ) {

+						return makeArray( context.getElementsByTagName( query ), extra );

+

+					// Speed-up: Sizzle(".CLASS")

+					} else if ( match[2] && Expr.find.CLASS && context.getElementsByClassName ) {

+						return makeArray( context.getElementsByClassName( match[2] ), extra );

+					}

+				}

+

+				if ( context.nodeType === 9 ) {

+					// Speed-up: Sizzle("body")

+					// The body element only exists once, optimize finding it

+					if ( query === "body" && context.body ) {

+						return makeArray( [ context.body ], extra );

+

+					// Speed-up: Sizzle("#ID")

+					} else if ( match && match[3] ) {

+						var elem = context.getElementById( match[3] );

+

+						// Check parentNode to catch when Blackberry 4.6 returns

+						// nodes that are no longer in the document #6963

+						if ( elem && elem.parentNode ) {

+							// Handle the case where IE and Opera return items

+							// by name instead of ID

+							if ( elem.id === match[3] ) {

+								return makeArray( [ elem ], extra );

+							}

+

+						} else {

+							return makeArray( [], extra );

+						}

+					}

+

+					try {

+						return makeArray( context.querySelectorAll(query), extra );

+					} catch(qsaError) {}

+

+				// qSA works strangely on Element-rooted queries

+				// We can work around this by specifying an extra ID on the root

+				// and working up from there (Thanks to Andrew Dupont for the technique)

+				// IE 8 doesn't work on object elements

+				} else if ( context.nodeType === 1 && context.nodeName.toLowerCase() !== "object" ) {

+					var oldContext = context,

+						old = context.getAttribute( "id" ),

+						nid = old || id,

+						hasParent = context.parentNode,

+						relativeHierarchySelector = /^\s*[+~]/.test( query );

+

+					if ( !old ) {

+						context.setAttribute( "id", nid );

+					} else {

+						nid = nid.replace( /'/g, "\\$&" );

+					}

+					if ( relativeHierarchySelector && hasParent ) {

+						context = context.parentNode;

+					}

+

+					try {

+						if ( !relativeHierarchySelector || hasParent ) {

+							return makeArray( context.querySelectorAll( "[id='" + nid + "'] " + query ), extra );

+						}

+

+					} catch(pseudoError) {

+					} finally {

+						if ( !old ) {

+							oldContext.removeAttribute( "id" );

+						}

+					}

+				}

 			}

-		

+

 			return oldSizzle(query, context, extra, seed);

 		};

 

@@ -6806,11 +8493,56 @@ if ( document.querySelectorAll ) {
 			Sizzle[ prop ] = oldSizzle[ prop ];

 		}

 

-		div = null; // release memory in IE

+		// release memory in IE

+		div = null;

 	})();

 }

 

 (function(){

+	var html = document.documentElement,

+		matches = html.matchesSelector || html.mozMatchesSelector || html.webkitMatchesSelector || html.msMatchesSelector;

+

+	if ( matches ) {

+		// Check to see if it's possible to do matchesSelector

+		// on a disconnected node (IE 9 fails this)

+		var disconnectedMatch = !matches.call( document.createElement( "div" ), "div" ),

+			pseudoWorks = false;

+

+		try {

+			// This should fail with an exception

+			// Gecko does not error, returns false instead

+			matches.call( document.documentElement, "[test!='']:sizzle" );

+

+		} catch( pseudoError ) {

+			pseudoWorks = true;

+		}

+

+		Sizzle.matchesSelector = function( node, expr ) {

+			// Make sure that attribute selectors are quoted

+			expr = expr.replace(/\=\s*([^'"\]]*)\s*\]/g, "='$1']");

+

+			if ( !Sizzle.isXML( node ) ) {

+				try {

+					if ( pseudoWorks || !Expr.match.PSEUDO.test( expr ) && !/!=/.test( expr ) ) {

+						var ret = matches.call( node, expr );

+

+						// IE 9's matchesSelector returns false on disconnected nodes

+						if ( ret || !disconnectedMatch ||

+								// As well, disconnected nodes are said to be in a document

+								// fragment in IE 9, so check for that

+								node.document && node.document.nodeType !== 11 ) {

+							return ret;

+						}

+					}

+				} catch(e) {}

+			}

+

+			return Sizzle(expr, null, null, [node]).length > 0;

+		};

+	}

+})();

+

+(function(){

 	var div = document.createElement("div");

 

 	div.innerHTML = "<div class='test e'></div><div class='test'></div>";

@@ -6827,32 +8559,35 @@ if ( document.querySelectorAll ) {
 	if ( div.getElementsByClassName("e").length === 1 ) {

 		return;

 	}

-	

+

 	Expr.order.splice(1, 0, "CLASS");

-	Expr.find.CLASS = function(match, context, isXML) {

+	Expr.find.CLASS = function( match, context, isXML ) {

 		if ( typeof context.getElementsByClassName !== "undefined" && !isXML ) {

 			return context.getElementsByClassName(match[1]);

 		}

 	};

 

-	div = null; // release memory in IE

+	// release memory in IE

+	div = null;

 })();

 

 function dirNodeCheck( dir, cur, doneName, checkSet, nodeCheck, isXML ) {

 	for ( var i = 0, l = checkSet.length; i < l; i++ ) {

 		var elem = checkSet[i];

+

 		if ( elem ) {

-			elem = elem[dir];

 			var match = false;

 

+			elem = elem[dir];

+

 			while ( elem ) {

-				if ( elem.sizcache === doneName ) {

+				if ( elem[ expando ] === doneName ) {

 					match = checkSet[elem.sizset];

 					break;

 				}

 

 				if ( elem.nodeType === 1 && !isXML ){

-					elem.sizcache = doneName;

+					elem[ expando ] = doneName;

 					elem.sizset = i;

 				}

 

@@ -6872,21 +8607,24 @@ function dirNodeCheck( dir, cur, doneName, checkSet, nodeCheck, isXML ) {
 function dirCheck( dir, cur, doneName, checkSet, nodeCheck, isXML ) {

 	for ( var i = 0, l = checkSet.length; i < l; i++ ) {

 		var elem = checkSet[i];

+

 		if ( elem ) {

-			elem = elem[dir];

 			var match = false;

 

+			elem = elem[dir];

+

 			while ( elem ) {

-				if ( elem.sizcache === doneName ) {

+				if ( elem[ expando ] === doneName ) {

 					match = checkSet[elem.sizset];

 					break;

 				}

 

 				if ( elem.nodeType === 1 ) {

 					if ( !isXML ) {

-						elem.sizcache = doneName;

+						elem[ expando ] = doneName;

 						elem.sizset = i;

 					}

+

 					if ( typeof cur !== "string" ) {

 						if ( elem === cur ) {

 							match = true;

@@ -6907,21 +8645,34 @@ function dirCheck( dir, cur, doneName, checkSet, nodeCheck, isXML ) {
 	}

 }

 

-Sizzle.contains = document.compareDocumentPosition ? function(a, b){

-	return !!(a.compareDocumentPosition(b) & 16);

-} : function(a, b){

-	return a !== b && (a.contains ? a.contains(b) : true);

-};

+if ( document.documentElement.contains ) {

+	Sizzle.contains = function( a, b ) {

+		return a !== b && (a.contains ? a.contains(b) : true);

+	};

 

-Sizzle.isXML = function(elem){

+} else if ( document.documentElement.compareDocumentPosition ) {

+	Sizzle.contains = function( a, b ) {

+		return !!(a.compareDocumentPosition(b) & 16);

+	};

+

+} else {

+	Sizzle.contains = function() {

+		return false;

+	};

+}

+

+Sizzle.isXML = function( elem ) {

 	// documentElement is verified for cases where it doesn't yet exist

-	// (such as loading iframes in IE - #4833) 

+	// (such as loading iframes in IE - #4833)

 	var documentElement = (elem ? elem.ownerDocument || elem : 0).documentElement;

+

 	return documentElement ? documentElement.nodeName !== "HTML" : false;

 };

 

-var posProcess = function(selector, context){

-	var tmpSet = [], later = "", match,

+var posProcess = function( selector, context, seed ) {

+	var match,

+		tmpSet = [],

+		later = "",

 		root = context.nodeType ? [context] : context;

 

 	// Position selectors must be done after the filter

@@ -6934,7 +8685,7 @@ var posProcess = function(selector, context){
 	selector = Expr.relative[selector] ? selector + "*" : selector;

 

 	for ( var i = 0, l = root.length; i < l; i++ ) {

-		Sizzle( selector, root[i], tmpSet );

+		Sizzle( selector, root[i], tmpSet, seed );

 	}

 

 	return Sizzle.filter( later, tmpSet );

@@ -6948,290 +8699,6 @@ window.tinymce.dom.Sizzle = Sizzle;
 

 

 (function(tinymce) {

-	// Shorten names

-	var each = tinymce.each, DOM = tinymce.DOM, isIE = tinymce.isIE, isWebKit = tinymce.isWebKit, Event;

-

-	tinymce.create('tinymce.dom.EventUtils', {

-		EventUtils : function() {

-			this.inits = [];

-			this.events = [];

-		},

-

-		add : function(o, n, f, s) {

-			var cb, t = this, el = t.events, r;

-

-			if (n instanceof Array) {

-				r = [];

-

-				each(n, function(n) {

-					r.push(t.add(o, n, f, s));

-				});

-

-				return r;

-			}

-

-			// Handle array

-			if (o && o.hasOwnProperty && o instanceof Array) {

-				r = [];

-

-				each(o, function(o) {

-					o = DOM.get(o);

-					r.push(t.add(o, n, f, s));

-				});

-

-				return r;

-			}

-

-			o = DOM.get(o);

-

-			if (!o)

-				return;

-

-			// Setup event callback

-			cb = function(e) {

-				// Is all events disabled

-				if (t.disabled)

-					return;

-

-				e = e || window.event;

-

-				// Patch in target, preventDefault and stopPropagation in IE it's W3C valid

-				if (e && isIE) {

-					if (!e.target)

-						e.target = e.srcElement;

-

-					// Patch in preventDefault, stopPropagation methods for W3C compatibility

-					tinymce.extend(e, t._stoppers);

-				}

-

-				if (!s)

-					return f(e);

-

-				return f.call(s, e);

-			};

-

-			if (n == 'unload') {

-				tinymce.unloads.unshift({func : cb});

-				return cb;

-			}

-

-			if (n == 'init') {

-				if (t.domLoaded)

-					cb();

-				else

-					t.inits.push(cb);

-

-				return cb;

-			}

-

-			// Store away listener reference

-			el.push({

-				obj : o,

-				name : n,

-				func : f,

-				cfunc : cb,

-				scope : s

-			});

-

-			t._add(o, n, cb);

-

-			return f;

-		},

-

-		remove : function(o, n, f) {

-			var t = this, a = t.events, s = false, r;

-

-			// Handle array

-			if (o && o.hasOwnProperty && o instanceof Array) {

-				r = [];

-

-				each(o, function(o) {

-					o = DOM.get(o);

-					r.push(t.remove(o, n, f));

-				});

-

-				return r;

-			}

-

-			o = DOM.get(o);

-

-			each(a, function(e, i) {

-				if (e.obj == o && e.name == n && (!f || (e.func == f || e.cfunc == f))) {

-					a.splice(i, 1);

-					t._remove(o, n, e.cfunc);

-					s = true;

-					return false;

-				}

-			});

-

-			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);

-					}

-				}

-			}

-		},

-

-		cancel : function(e) {

-			if (!e)

-				return false;

-

-			this.stop(e);

-

-			return this.prevent(e);

-		},

-

-		stop : function(e) {

-			if (e.stopPropagation)

-				e.stopPropagation();

-			else

-				e.cancelBubble = true;

-

-			return false;

-		},

-

-		prevent : function(e) {

-			if (e.preventDefault)

-				e.preventDefault();

-			else

-				e.returnValue = false;

-

-			return false;

-		},

-

-		destroy : function() {

-			var t = this;

-

-			each(t.events, function(e, i) {

-				t._remove(e.obj, e.name, e.cfunc);

-				e.obj = e.cfunc = null;

-			});

-

-			t.events = [];

-			t = null;

-		},

-

-		_add : function(o, n, f) {

-			if (o.attachEvent)

-				o.attachEvent('on' + n, f);

-			else if (o.addEventListener)

-				o.addEventListener(n, f, false);

-			else

-				o['on' + n] = f;

-		},

-

-		_remove : function(o, n, f) {

-			if (o) {

-				try {

-					if (o.detachEvent)

-						o.detachEvent('on' + n, f);

-					else if (o.removeEventListener)

-						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(win) {

-			var t = this;

-

-			// Keep it from running more than once

-			if (t.domLoaded)

-				return;

-

-			t.domLoaded = true;

-

-			each(t.inits, function(c) {

-				c();

-			});

-

-			t.inits = [];

-		},

-

-		_wait : function(win) {

-			var t = this, doc = win.document;

-

-			// No need since the document is already loaded

-			if (win.tinyMCE_GZ && tinyMCE_GZ.loaded) {

-				t.domLoaded = 1;

-				return;

-			}

-

-			// Use IE method

-			if (doc.attachEvent) {

-				doc.attachEvent("onreadystatechange", function() {

-					if (doc.readyState === "complete") {

-						doc.detachEvent("onreadystatechange", arguments.callee);

-						t._pageInit(win);

-					}

-				});

-

-				if (doc.documentElement.doScroll && win == win.top) {

-					(function() {

-						if (t.domLoaded)

-							return;

-

-						try {

-							// If IE is used, use the trick by Diego Perini licensed under MIT by request to the author.

-							// http://javascript.nwbox.com/IEContentLoaded/

-							doc.documentElement.doScroll("left");

-						} catch (ex) {

-							setTimeout(arguments.callee, 0);

-							return;

-						}

-

-						t._pageInit(win);

-					})();

-				}

-			} else if (doc.addEventListener) {

-				t._add(win, 'DOMContentLoaded', function() {

-					t._pageInit(win);

-				});

-			}

-

-			t._add(win, 'load', function() {

-				t._pageInit(win);

-			});

-		},

-

-		_stoppers : {

-			preventDefault : function() {

-				this.returnValue = false;

-			},

-

-			stopPropagation : function() {

-				this.cancelBubble = true;

-			}

-		}

-	});

-

-	Event = tinymce.dom.Event = new tinymce.dom.EventUtils();

-

-	// Dispatch DOM content loaded event for IE and Safari

-	Event._wait(window);

-

-	tinymce.addUnload(function() {

-		Event.destroy();

-	});

-})(tinymce);

-

-(function(tinymce) {

 	tinymce.dom.Element = function(id, settings) {

 		var t = this, dom, el;

 

@@ -7247,20 +8714,20 @@ window.tinymce.dom.Sizzle = Sizzle;
 				('getPos,getRect,getParent,add,setStyle,getStyle,setStyles,' + 

 				'setAttrib,setAttribs,getAttrib,addClass,removeClass,' + 

 				'hasClass,getOuterHTML,setOuterHTML,remove,show,hide,' + 

-				'isHidden,setHTML,get').split(/,/)

-			, function(k) {

-				t[k] = function() {

-					var a = [id], i;

+				'isHidden,setHTML,get').split(/,/), function(k) {

+					t[k] = function() {

+						var a = [id], i;

 

-					for (i = 0; i < arguments.length; i++)

-						a.push(arguments[i]);

+						for (i = 0; i < arguments.length; i++)

+							a.push(arguments[i]);

 

-					a = dom[k].apply(dom, a);

-					t.update(k);

+						a = dom[k].apply(dom, a);

+						t.update(k);

 

-					return a;

-				};

-		});

+						return a;

+					};

+			}

+		);

 

 		tinymce.extend(t, {

 			on : function(n, f, s) {

@@ -7346,7 +8813,7 @@ window.tinymce.dom.Sizzle = Sizzle;
 	};

 

 	// Shorten names

-	var is = tinymce.is, isIE = tinymce.isIE, each = tinymce.each;

+	var is = tinymce.is, isIE = tinymce.isIE, each = tinymce.each, TreeWalker = tinymce.dom.TreeWalker;

 

 	tinymce.create('tinymce.dom.Selection', {

 		Selection : function(dom, win, serializer) {

@@ -7453,7 +8920,7 @@ window.tinymce.dom.Sizzle = Sizzle;
 				} else {

 					rng.deleteContents();

 

-					if (doc.body.childNodes.length == 0) {

+					if (doc.body.childNodes.length === 0) {

 						doc.body.innerHTML = content;

 					} else {

 						// createContextualFragment doesn't exists in IE 9 DOMRanges

@@ -7589,46 +9056,69 @@ window.tinymce.dom.Sizzle = Sizzle;
 				return index;

 			};

 

-			if (type == 2) {

-				function getLocation() {

-					var rng = t.getRng(true), root = dom.getRoot(), bookmark = {};

+			function normalizeTableCellSelection(rng) {

+				function moveEndPoint(start) {

+					var container, offset, childNodes, prefix = start ? 'start' : 'end';

 

-					function getPoint(rng, start) {

-						var container = rng[start ? 'startContainer' : 'endContainer'],

-							offset = rng[start ? 'startOffset' : 'endOffset'], point = [], node, childNodes, after = 0;

+					container = rng[prefix + 'Container'];

+					offset = rng[prefix + 'Offset'];

 

-						if (container.nodeType == 3) {

-							if (normalized) {

-								for (node = container.previousSibling; node && node.nodeType == 3; node = node.previousSibling)

-									offset += node.nodeValue.length;

-							}

+					if (container.nodeType == 1 && container.nodeName == "TR") {

+						childNodes = container.childNodes;

+						container = childNodes[Math.min(start ? offset : offset - 1, childNodes.length - 1)];

+						if (container) {

+							offset = start ? 0 : container.childNodes.length;

+							rng['set' + (start ? 'Start' : 'End')](container, offset);

+						}

+					}

+				};

 

-							point.push(offset);

-						} else {

-							childNodes = container.childNodes;

+				moveEndPoint(true);

+				moveEndPoint();

 

-							if (offset >= childNodes.length && childNodes.length) {

-								after = 1;

-								offset = Math.max(0, childNodes.length - 1);

-							}

+				return rng;

+			};

+

+			function getLocation() {

+				var rng = t.getRng(true), root = dom.getRoot(), bookmark = {};

+

+				function getPoint(rng, start) {

+					var container = rng[start ? 'startContainer' : 'endContainer'],

+						offset = rng[start ? 'startOffset' : 'endOffset'], point = [], node, childNodes, after = 0;

 

-							point.push(t.dom.nodeIndex(childNodes[offset], normalized) + after);

+					if (container.nodeType == 3) {

+						if (normalized) {

+							for (node = container.previousSibling; node && node.nodeType == 3; node = node.previousSibling)

+								offset += node.nodeValue.length;

 						}

 

-						for (; container && container != root; container = container.parentNode)

-							point.push(t.dom.nodeIndex(container, normalized));

+						point.push(offset);

+					} else {

+						childNodes = container.childNodes;

 

-						return point;

-					};

+						if (offset >= childNodes.length && childNodes.length) {

+							after = 1;

+							offset = Math.max(0, childNodes.length - 1);

+						}

 

-					bookmark.start = getPoint(rng, true);

+						point.push(t.dom.nodeIndex(childNodes[offset], normalized) + after);

+					}

 

-					if (!t.isCollapsed())

-						bookmark.end = getPoint(rng);

+					for (; container && container != root; container = container.parentNode)

+						point.push(t.dom.nodeIndex(container, normalized));

 

-					return bookmark;

+					return point;

 				};

 

+				bookmark.start = getPoint(rng, true);

+

+				if (!t.isCollapsed())

+					bookmark.end = getPoint(rng);

+

+				return bookmark;

+			};

+

+			if (type == 2) {

 				if (t.tridentSel)

 					return t.tridentSel.getBookmark(type);

 

@@ -7661,7 +9151,7 @@ window.tinymce.dom.Sizzle = Sizzle;
 

 							// Detect the empty space after block elements in IE and move the end back one character <p></p>] becomes <p>]</p>

 							rng.moveToElementText(rng2.parentElement());

-							if (rng.compareEndPoints('StartToEnd', rng2) == 0)

+							if (rng.compareEndPoints('StartToEnd', rng2) === 0)

 								rng2.move('character', -1);

 

 							rng2.pasteHTML('<span data-mce-type="bookmark" id="' + id + '_end" style="' + styles + '">' + chr + '</span>');

@@ -7684,7 +9174,7 @@ window.tinymce.dom.Sizzle = Sizzle;
 					return {name : name, index : findIndex(name, element)};

 

 				// W3C method

-				rng2 = rng.cloneRange();

+				rng2 = normalizeTableCellSelection(rng.cloneRange());

 

 				// Insert end marker

 				if (!collapsed) {

@@ -7692,6 +9182,7 @@ window.tinymce.dom.Sizzle = Sizzle;
 					rng2.insertNode(dom.create('span', {'data-mce-type' : "bookmark", id : id + '_end', style : styles}, chr));

 				}

 

+				rng = normalizeTableCellSelection(rng);

 				rng.collapse(true);

 				rng.insertNode(dom.create('span', {'data-mce-type' : "bookmark", id : id + '_start', style : styles}, chr));

 			}

@@ -7704,122 +9195,122 @@ window.tinymce.dom.Sizzle = Sizzle;
 		moveToBookmark : function(bookmark) {

 			var t = this, dom = t.dom, marker1, marker2, rng, root, startContainer, endContainer, startOffset, endOffset;

 

-			if (bookmark) {

-				if (bookmark.start) {

-					rng = dom.createRng();

-					root = dom.getRoot();

+			function setEndPoint(start) {

+				var point = bookmark[start ? 'start' : 'end'], i, node, offset, children;

 

-					function setEndPoint(start) {

-						var point = bookmark[start ? 'start' : 'end'], i, node, offset, children;

+				if (point) {

+					offset = point[0];

 

-						if (point) {

-							offset = point[0];

+					// Find container node

+					for (node = root, i = point.length - 1; i >= 1; i--) {

+						children = node.childNodes;

 

-							// Find container node

-							for (node = root, i = point.length - 1; i >= 1; i--) {

-								children = node.childNodes;

+						if (point[i] > children.length - 1)

+							return;

 

-								if (point[i] > children.length - 1)

-									return;

+						node = children[point[i]];

+					}

 

-								node = children[point[i]];

-							}

+					// Move text offset to best suitable location

+					if (node.nodeType === 3)

+						offset = Math.min(point[0], node.nodeValue.length);

 

-							// Move text offset to best suitable location

-							if (node.nodeType === 3)

-								offset = Math.min(point[0], node.nodeValue.length);

+					// Move element offset to best suitable location

+					if (node.nodeType === 1)

+						offset = Math.min(point[0], node.childNodes.length);

 

-							// Move element offset to best suitable location

-							if (node.nodeType === 1)

-								offset = Math.min(point[0], node.childNodes.length);

+					// Set offset within container node

+					if (start)

+						rng.setStart(node, offset);

+					else

+						rng.setEnd(node, offset);

+				}

 

-							// Set offset within container node

-							if (start)

-								rng.setStart(node, offset);

-							else

-								rng.setEnd(node, offset);

-						}

+				return true;

+			};

 

-						return true;

-					};

+			function restoreEndPoint(suffix) {

+				var marker = dom.get(bookmark.id + '_' + suffix), node, idx, next, prev, keep = bookmark.keep;

 

-					if (t.tridentSel)

-						return t.tridentSel.moveToBookmark(bookmark);

+				if (marker) {

+					node = marker.parentNode;

 

-					if (setEndPoint(true) && setEndPoint()) {

-						t.setRng(rng);

+					if (suffix == 'start') {

+						if (!keep) {

+							idx = dom.nodeIndex(marker);

+						} else {

+							node = marker.firstChild;

+							idx = 1;

+						}

+

+						startContainer = endContainer = node;

+						startOffset = endOffset = idx;

+					} else {

+						if (!keep) {

+							idx = dom.nodeIndex(marker);

+						} else {

+							node = marker.firstChild;

+							idx = 1;

+						}

+

+						endContainer = node;

+						endOffset = idx;

 					}

-				} else if (bookmark.id) {

-					function restoreEndPoint(suffix) {

-						var marker = dom.get(bookmark.id + '_' + suffix), node, idx, next, prev, keep = bookmark.keep;

 

-						if (marker) {

-							node = marker.parentNode;

+					if (!keep) {

+						prev = marker.previousSibling;

+						next = marker.nextSibling;

 

-							if (suffix == 'start') {

-								if (!keep) {

-									idx = dom.nodeIndex(marker);

-								} else {

-									node = marker.firstChild;

-									idx = 1;

-								}

+						// Remove all marker text nodes

+						each(tinymce.grep(marker.childNodes), function(node) {

+							if (node.nodeType == 3)

+								node.nodeValue = node.nodeValue.replace(/\uFEFF/g, '');

+						});

+

+						// Remove marker but keep children if for example contents where inserted into the marker

+						// Also remove duplicated instances of the marker for example by a split operation or by WebKit auto split on paste feature

+						while (marker = dom.get(bookmark.id + '_' + suffix))

+							dom.remove(marker, 1);

+

+						// If siblings are text nodes then merge them unless it's Opera since it some how removes the node

+						// and we are sniffing since adding a lot of detection code for a browser with 3% of the market isn't worth the effort. Sorry, Opera but it's just a fact

+						if (prev && next && prev.nodeType == next.nodeType && prev.nodeType == 3 && !tinymce.isOpera) {

+							idx = prev.nodeValue.length;

+							prev.appendData(next.nodeValue);

+							dom.remove(next);

 

-								startContainer = endContainer = node;

+							if (suffix == 'start') {

+								startContainer = endContainer = prev;

 								startOffset = endOffset = idx;

 							} else {

-								if (!keep) {

-									idx = dom.nodeIndex(marker);

-								} else {

-									node = marker.firstChild;

-									idx = 1;

-								}

-

-								endContainer = node;

+								endContainer = prev;

 								endOffset = idx;

 							}

+						}

+					}

+				}

+			};

 

-							if (!keep) {

-								prev = marker.previousSibling;

-								next = marker.nextSibling;

-

-								// Remove all marker text nodes

-								each(tinymce.grep(marker.childNodes), function(node) {

-									if (node.nodeType == 3)

-										node.nodeValue = node.nodeValue.replace(/\uFEFF/g, '');

-								});

+			function addBogus(node) {

+				// Adds a bogus BR element for empty block elements

+				if (dom.isBlock(node) && !node.innerHTML && !isIE)

+					node.innerHTML = '<br data-mce-bogus="1" />';

 

-								// Remove marker but keep children if for example contents where inserted into the marker

-								// Also remove duplicated instances of the marker for example by a split operation or by WebKit auto split on paste feature

-								while (marker = dom.get(bookmark.id + '_' + suffix))

-									dom.remove(marker, 1);

-

-								// If siblings are text nodes then merge them unless it's Opera since it some how removes the node

-								// and we are sniffing since adding a lot of detection code for a browser with 3% of the market isn't worth the effort. Sorry, Opera but it's just a fact

-								if (prev && next && prev.nodeType == next.nodeType && prev.nodeType == 3 && !tinymce.isOpera) {

-									idx = prev.nodeValue.length;

-									prev.appendData(next.nodeValue);

-									dom.remove(next);

-

-									if (suffix == 'start') {

-										startContainer = endContainer = prev;

-										startOffset = endOffset = idx;

-									} else {

-										endContainer = prev;

-										endOffset = idx;

-									}

-								}

-							}

-						}

-					};

+				return node;

+			};

 

-					function addBogus(node) {

-						// Adds a bogus BR element for empty block elements or just a space on IE since it renders BR elements incorrectly

-						if (dom.isBlock(node) && !node.innerHTML)

-							node.innerHTML = !isIE ? '<br data-mce-bogus="1" />' : ' ';

+			if (bookmark) {

+				if (bookmark.start) {

+					rng = dom.createRng();

+					root = dom.getRoot();

 

-						return node;

-					};

+					if (t.tridentSel)

+						return t.tridentSel.moveToBookmark(bookmark);

 

+					if (setEndPoint(true) && setEndPoint()) {

+						t.setRng(rng);

+					}

+				} else if (bookmark.id) {

 					// Restore start/end points

 					restoreEndPoint('start');

 					restoreEndPoint('end');

@@ -7840,6 +9331,32 @@ window.tinymce.dom.Sizzle = Sizzle;
 		select : function(node, content) {

 			var t = this, dom = t.dom, rng = dom.createRng(), idx;

 

+			function setPoint(node, start) {

+				var walker = new TreeWalker(node, node);

+

+				do {

+					// Text node

+					if (node.nodeType == 3 && tinymce.trim(node.nodeValue).length !== 0) {

+						if (start)

+							rng.setStart(node, 0);

+						else

+							rng.setEnd(node, node.nodeValue.length);

+

+						return;

+					}

+

+					// BR element

+					if (node.nodeName == 'BR') {

+						if (start)

+							rng.setStartBefore(node);

+						else

+							rng.setEndBefore(node);

+

+						return;

+					}

+				} while (node = (start ? walker.next() : walker.prev()));

+			};

+

 			if (node) {

 				idx = dom.nodeIndex(node);

 				rng.setStart(node.parentNode, idx);

@@ -7847,32 +9364,6 @@ window.tinymce.dom.Sizzle = Sizzle;
 

 				// Find first/last text node or BR element

 				if (content) {

-					function setPoint(node, start) {

-						var walker = new tinymce.dom.TreeWalker(node, node);

-

-						do {

-							// Text node

-							if (node.nodeType == 3 && tinymce.trim(node.nodeValue).length != 0) {

-								if (start)

-									rng.setStart(node, 0);

-								else

-									rng.setEnd(node, node.nodeValue.length);

-

-								return;

-							}

-

-							// BR element

-							if (node.nodeName == 'BR') {

-								if (start)

-									rng.setStartBefore(node);

-								else

-									rng.setEndBefore(node);

-

-								return;

-							}

-						} while (node = (start ? walker.next() : walker.prev()));

-					};

-

 					setPoint(node, 1);

 					setPoint(node);

 				}

@@ -7916,50 +9407,60 @@ window.tinymce.dom.Sizzle = Sizzle;
 		},

 

 		getRng : function(w3c) {

-			var t = this, s, r, elm, doc = t.win.document;

+			var self = this, selection, rng, elm, doc = self.win.document;

 

 			// Found tridentSel object then we need to use that one

-			if (w3c && t.tridentSel)

-				return t.tridentSel.getRangeAt(0);

+			if (w3c && self.tridentSel) {

+				return self.tridentSel.getRangeAt(0);

+			}

 

 			try {

-				if (s = t.getSel())

-					r = s.rangeCount > 0 ? s.getRangeAt(0) : (s.createRange ? s.createRange() : doc.createRange());

+				if (selection = self.getSel()) {

+					rng = selection.rangeCount > 0 ? selection.getRangeAt(0) : (selection.createRange ? selection.createRange() : doc.createRange());

+				}

 			} catch (ex) {

 				// IE throws unspecified error here if TinyMCE is placed in a frame/iframe

 			}

 

 			// We have W3C ranges and it's IE then fake control selection since IE9 doesn't handle that correctly yet

-			if (tinymce.isIE && r && r.setStart && doc.selection.createRange().item) {

+			if (tinymce.isIE && rng && rng.setStart && doc.selection.createRange().item) {

 				elm = doc.selection.createRange().item(0);

-				r = doc.createRange();

-				r.setStartBefore(elm);

-				r.setEndAfter(elm);

+				rng = doc.createRange();

+				rng.setStartBefore(elm);

+				rng.setEndAfter(elm);

 			}

 

 			// No range found then create an empty one

 			// This can occur when the editor is placed in a hidden container element on Gecko

 			// Or on IE when there was an exception

-			if (!r)

-				r = doc.createRange ? doc.createRange() : doc.body.createTextRange();

+			if (!rng) {

+				rng = doc.createRange ? doc.createRange() : doc.body.createTextRange();

+			}

 

-			if (t.selectedRange && t.explicitRange) {

-				if (r.compareBoundaryPoints(r.START_TO_START, t.selectedRange) === 0 && r.compareBoundaryPoints(r.END_TO_END, t.selectedRange) === 0) {

+			// If range is at start of document then move it to start of body

+			if (rng.setStart && rng.startContainer.nodeType === 9 && rng.collapsed) {

+				elm = self.dom.getRoot();

+				rng.setStart(elm, 0);

+				rng.setEnd(elm, 0);

+			}

+

+			if (self.selectedRange && self.explicitRange) {

+				if (rng.compareBoundaryPoints(rng.START_TO_START, self.selectedRange) === 0 && rng.compareBoundaryPoints(rng.END_TO_END, self.selectedRange) === 0) {

 					// Safari, Opera and Chrome only ever select text which causes the range to change.

 					// This lets us use the originally set range if the selection hasn't been changed by the user.

-					r = t.explicitRange;

+					rng = self.explicitRange;

 				} else {

-					t.selectedRange = null;

-					t.explicitRange = null;

+					self.selectedRange = null;

+					self.explicitRange = null;

 				}

 			}

 

-			return r;

+			return rng;

 		},

 

-		setRng : function(r) {

+		setRng : function(r, forward) {

 			var s, t = this;

-			

+

 			if (!t.tridentSel) {

 				s = t.getSel();

 

@@ -7973,13 +9474,25 @@ window.tinymce.dom.Sizzle = Sizzle;
 					}

 

 					s.addRange(r);

-					t.selectedRange = s.getRangeAt(0);

+

+					// Forward is set to false and we have an extend function

+					if (forward === false && s.extend) {

+						s.collapse(r.endContainer, r.endOffset);

+						s.extend(r.startContainer, r.startOffset);

+					}

+

+					// adding range isn't always successful so we need to check range count otherwise an exception can occur

+					t.selectedRange = s.rangeCount > 0 ? s.getRangeAt(0) : null;

 				}

 			} else {

 				// Is W3C Range

 				if (r.cloneRange) {

-					t.tridentSel.addRange(r);

-					return;

+					try {

+						t.tridentSel.addRange(r);

+						return;

+					} catch (ex) {

+						//IE9 throws an error here if called before selection is placed in the editor

+					}

 				}

 

 				// Is IE specific range

@@ -8002,6 +9515,14 @@ window.tinymce.dom.Sizzle = Sizzle;
 		getNode : function() {

 			var t = this, rng = t.getRng(), sel = t.getSel(), elm, start = rng.startContainer, end = rng.endContainer;

 

+			function skipEmptyTextNodes(n, forwards) {

+				var orig = n;

+				while (n && n.nodeType === 3 && n.length === 0) {

+					n = forwards ? n.nextSibling : n.previousSibling;

+				}

+				return n || orig;

+			};

+

 			// Range maybe lost after the editor is made visible again

 			if (!rng)

 				return t.dom.getRoot();

@@ -8019,19 +9540,12 @@ window.tinymce.dom.Sizzle = Sizzle;
 					}

 

 					// If the anchor node is a element instead of a text node then return this element

-					//if (tinymce.isWebKit && sel.anchorNode && sel.anchorNode.nodeType == 1) 

+					//if (tinymce.isWebKit && sel.anchorNode && sel.anchorNode.nodeType == 1)

 					//	return sel.anchorNode.childNodes[sel.anchorOffset];

 

 					// Handle cases where the selection is immediately wrapped around a node and return that node instead of it's parent.

 					// This happens when you double click an underlined word in FireFox.

 					if (start.nodeType === 3 && end.nodeType === 3) {

-						function skipEmptyTextNodes(n, forwards) {

-							var orig = n;

-							while (n && n.nodeType === 3 && n.length === 0) {

-								n = forwards ? n.nextSibling : n.previousSibling;

-							}

-							return n || orig;

-						}

 						if (start.length === rng.startOffset) {

 							start = skipEmptyTextNodes(start.nextSibling, true);

 						} else {

@@ -8069,7 +9583,8 @@ window.tinymce.dom.Sizzle = Sizzle;
 			if (sb && eb && sb != eb) {

 				n = sb;

 

-				while ((n = n.nextSibling) && n != eb) {

+				var walker = new TreeWalker(sb, dom.getRoot());

+				while ((n = walker.next()) && n != eb) {

 					if (dom.isBlock(n))

 						bl.push(n);

 				}

@@ -8081,76 +9596,191 @@ window.tinymce.dom.Sizzle = Sizzle;
 			return bl;

 		},

 

-		normalize : function() {

-			var self = this, rng, normalized;

+		isForward: function(){

+			var dom = this.dom, sel = this.getSel(), anchorRange, focusRange;

 

-			// Normalize only on non IE browsers for now

-			if (tinymce.isIE)

-				return;

+			// No support for selection direction then always return true

+			if (!sel || sel.anchorNode == null || sel.focusNode == null) {

+				return true;

+			}

+

+			anchorRange = dom.createRng();

+			anchorRange.setStart(sel.anchorNode, sel.anchorOffset);

+			anchorRange.collapse(true);

+

+			focusRange = dom.createRng();

+			focusRange.setStart(sel.focusNode, sel.focusOffset);

+			focusRange.collapse(true);

+

+			return anchorRange.compareBoundaryPoints(anchorRange.START_TO_START, focusRange) <= 0;

+		},

+

+		normalize : function() {

+			var self = this, rng, normalized, collapsed, node, sibling;

 

 			function normalizeEndPoint(start) {

-				var container, offset, walker, dom = self.dom, body = dom.getRoot(), node;

+				var container, offset, walker, dom = self.dom, body = dom.getRoot(), node, nonEmptyElementsMap, nodeName;

+

+				function hasBrBeforeAfter(node, left) {

+					var walker = new TreeWalker(node, dom.getParent(node.parentNode, dom.isBlock) || body);

+

+					while (node = walker[left ? 'prev' : 'next']()) {

+						if (node.nodeName === "BR") {

+							return true;

+						}

+					}

+				};

+

+				// Walks the dom left/right to find a suitable text node to move the endpoint into

+				// It will only walk within the current parent block or body and will stop if it hits a block or a BR/IMG

+				function findTextNodeRelative(left, startNode) {

+					var walker, lastInlineElement;

+

+					startNode = startNode || container;

+					walker = new TreeWalker(startNode, dom.getParent(startNode.parentNode, dom.isBlock) || body);

+

+					// Walk left until we hit a text node we can move to or a block/br/img

+					while (node = walker[left ? 'prev' : 'next']()) {

+						// Found text node that has a length

+						if (node.nodeType === 3 && node.nodeValue.length > 0) {

+							container = node;

+							offset = left ? node.nodeValue.length : 0;

+							normalized = true;

+							return;

+						}

+

+						// Break if we find a block or a BR/IMG/INPUT etc

+						if (dom.isBlock(node) || nonEmptyElementsMap[node.nodeName.toLowerCase()]) {

+							return;

+						}

+

+						lastInlineElement = node;

+					}

+

+					// Only fetch the last inline element when in caret mode for now

+					if (collapsed && lastInlineElement) {

+						container = lastInlineElement;

+						normalized = true;

+						offset = 0;

+					}

+				};

 

 				container = rng[(start ? 'start' : 'end') + 'Container'];

 				offset = rng[(start ? 'start' : 'end') + 'Offset'];

+				nonEmptyElementsMap = dom.schema.getNonEmptyElements();

 

 				// If the container is a document move it to the body element

 				if (container.nodeType === 9) {

-					container = container.body;

+					container = dom.getRoot();

 					offset = 0;

 				}

 

 				// If the container is body try move it into the closest text node or position

-				// TODO: Add more logic here to handle element selection cases

 				if (container === body) {

+					// If start is before/after a image, table etc

+					if (start) {

+						node = container.childNodes[offset > 0 ? offset - 1 : 0];

+						if (node) {

+							nodeName = node.nodeName.toLowerCase();

+							if (nonEmptyElementsMap[node.nodeName] || node.nodeName == "TABLE") {

+								return;

+							}

+						}

+					}

+

 					// Resolve the index

 					if (container.hasChildNodes()) {

 						container = container.childNodes[Math.min(!start && offset > 0 ? offset - 1 : offset, container.childNodes.length - 1)];

 						offset = 0;

 

 						// Don't walk into elements that doesn't have any child nodes like a IMG

-						if (container.hasChildNodes()) {

+						if (container.hasChildNodes() && !/TABLE/.test(container.nodeName)) {

 							// Walk the DOM to find a text node to place the caret at or a BR

 							node = container;

-							walker = new tinymce.dom.TreeWalker(container, body);

+							walker = new TreeWalker(container, body);

+

 							do {

 								// Found a text node use that position

-								if (node.nodeType === 3) {

-									offset = start ? 0 : node.nodeValue.length - 1;

+								if (node.nodeType === 3 && node.nodeValue.length > 0) {

+									offset = start ? 0 : node.nodeValue.length;

 									container = node;

+									normalized = true;

 									break;

 								}

 

-								// Found a BR element that we can place the caret before

-								if (node.nodeName === 'BR') {

+								// Found a BR/IMG element that we can place the caret before

+								if (nonEmptyElementsMap[node.nodeName.toLowerCase()]) {

 									offset = dom.nodeIndex(node);

 									container = node.parentNode;

+

+									// Put caret after image when moving the end point

+									if (node.nodeName ==  "IMG" && !start) {

+										offset++;

+									}

+

+									normalized = true;

 									break;

 								}

 							} while (node = (start ? walker.next() : walker.prev()));

+						}

+					}

+				}

 

-							normalized = true;

+				// Lean the caret to the left if possible

+				if (collapsed) {

+					// So this: <b>x</b><i>|x</i>

+					// Becomes: <b>x|</b><i>x</i>

+					// Seems that only gecko has issues with this

+					if (container.nodeType === 3 && offset === 0) {

+						findTextNodeRelative(true);

+					}

+

+					// Lean left into empty inline elements when the caret is before a BR

+					// So this: <i><b></b><i>|<br></i>

+					// Becomes: <i><b>|</b><i><br></i>

+					// Seems that only gecko has issues with this

+					if (container.nodeType === 1) {

+						node = container.childNodes[offset];

+						if(node && node.nodeName === 'BR' && !hasBrBeforeAfter(node) && !hasBrBeforeAfter(node, true)) {

+							findTextNodeRelative(true, container.childNodes[offset]);

 						}

 					}

 				}

 

+				// Lean the start of the selection right if possible

+				// So this: x[<b>x]</b>

+				// Becomes: x<b>[x]</b>

+				if (start && !collapsed && container.nodeType === 3 && offset === container.nodeValue.length) {

+					findTextNodeRelative(false);

+				}

+

 				// Set endpoint if it was normalized

 				if (normalized)

 					rng['set' + (start ? 'Start' : 'End')](container, offset);

 			};

 

+			// Normalize only on non IE browsers for now

+			if (tinymce.isIE)

+				return;

+			

 			rng = self.getRng();

+			collapsed = rng.collapsed;

 

 			// Normalize the end points

 			normalizeEndPoint(true);

-			

-			if (rng.collapsed)

+

+			if (!collapsed)

 				normalizeEndPoint();

 

 			// Set the selection if it was normalized

 			if (normalized) {

+				// If it was collapsed then make sure it still is

+				if (collapsed) {

+					rng.collapse(true);

+				}

+

 				//console.log(self.dom.dumpRng(rng));

-				self.setRng(rng);

+				self.setRng(rng, self.isForward());

 			}

 		},

 

@@ -8168,9 +9798,6 @@ window.tinymce.dom.Sizzle = Sizzle;
 		_fixIESelection : function() {

 			var dom = this.dom, doc = dom.doc, body = doc.body, started, startRng, htmlElm;

 

-			// Make HTML element unselectable since we are going to handle selection by hand

-			doc.documentElement.unselectable = true;

-

 			// Return range from point or null if it failed

 			function rngFromPoint(x, y) {

 				var rng = body.createTextRange();

@@ -8220,6 +9847,9 @@ window.tinymce.dom.Sizzle = Sizzle;
 				startRng = started = 0;

 			};

 

+			// Make HTML element unselectable since we are going to handle selection by hand

+			doc.documentElement.unselectable = true;

+			

 			// Detect when user selects outside BODY

 			dom.bind(doc, ['mousedown', 'contextmenu'], function(e) {

 				if (e.target.nodeName === 'HTML') {

@@ -8256,12 +9886,11 @@ window.tinymce.dom.Sizzle = Sizzle;
 		if (!settings.apply_source_formatting)

 			settings.indent = false;

 

-		settings.remove_trailing_brs = true;

-

 		// Default DOM and Schema if they are undefined

 		dom = dom || tinymce.DOM;

 		schema = schema || new tinymce.html.Schema(settings);

 		settings.entity_encoding = settings.entity_encoding || 'named';

+		settings.remove_trailing_brs = "remove_trailing_brs" in settings ? settings.remove_trailing_brs : true;

 

 		onPreProcess = new tinymce.util.Dispatcher(self);

 

@@ -8295,13 +9924,13 @@ window.tinymce.dom.Sizzle = Sizzle;
 			}

 		});

 

-		// Remove internal classes mceItem<..>

+		// Remove internal classes mceItem<..> or mceSelected

 		htmlParser.addAttributeFilter('class', function(nodes, name) {

 			var i = nodes.length, node, value;

 

 			while (i--) {

 				node = nodes[i];

-				value = node.attr('class').replace(/\s*mce(Item\w+|Selected)\s*/g, '');

+				value = node.attr('class').replace(/(?:^|\s)mce(Item\w+|Selected)(?!\S)/g, '');

 				node.attr('class', value.length > 0 ? value : null);

 			}

 		});

@@ -8318,6 +9947,15 @@ window.tinymce.dom.Sizzle = Sizzle;
 			}

 		});

 

+		// Remove expando attributes

+		htmlParser.addAttributeFilter('data-mce-expando', function(nodes, name, args) {

+			var i = nodes.length;

+

+			while (i--) {

+				nodes[i].attr(name, null);

+			}

+		});

+

 		// Force script into CDATA sections and remove the mce- prefix also add comments around styles

 		htmlParser.addNodeFilter('script,style', function(nodes, name) {

 			var i = nodes.length, node, value;

@@ -8325,8 +9963,8 @@ window.tinymce.dom.Sizzle = Sizzle;
 			function trim(value) {

 				return value.replace(/(<!--\[CDATA\[|\]\]-->)/g, '\n')

 						.replace(/^[\r\n]*|[\r\n]*$/g, '')

-						.replace(/^\s*(\/\/\s*<!--|\/\/\s*<!\[CDATA\[|<!--|<!\[CDATA\[)[\r\n]*/g, '')

-						.replace(/\s*(\/\/\s*\]\]>|\/\/\s*-->|\]\]>|-->|\]\]-->)\s*$/g, '');

+						.replace(/^\s*((<!--)?(\s*\/\/)?\s*<!\[CDATA\[|(<!--\s*)?\/\*\s*<!\[CDATA\[\s*\*\/|(\/\/)?\s*<!--|\/\*\s*<!--\s*\*\/)\s*[\r\n]*/gi, '')

+						.replace(/\s*(\/\*\s*\]\]>\s*\*\/(-->)?|\s*\/\/\s*\]\]>(-->)?|\/\/\s*(-->)?|\]\]>|\/\*\s*-->\s*\*\/|\s*-->\s*)\s*$/g, '');

 			};

 

 			while (i--) {

@@ -8470,12 +10108,12 @@ window.tinymce.dom.Sizzle = Sizzle;
 

 				// Parse and serialize HTML

 				args.content = htmlSerializer.serialize(

-					htmlParser.parse(args.getInner ? node.innerHTML : tinymce.trim(dom.getOuterHTML(node), args), args)

+					htmlParser.parse(tinymce.trim(args.getInner ? node.innerHTML : dom.getOuterHTML(node)), args)

 				);

 

 				// Replace all BOM characters for now until we can find a better solution

 				if (!args.cleanup)

-					args.content = args.content.replace(/\uFEFF/g, '');

+					args.content = args.content.replace(/\uFEFF|\u200B/g, '');

 

 				// Post process

 				if (!args.no_events)

@@ -8510,7 +10148,7 @@ window.tinymce.dom.Sizzle = Sizzle;
 			scriptLoadedCallbacks = {},

 			queueLoadedCallbacks = [],

 			loading = 0,

-			undefined;

+			undef;

 

 		function loadScript(url, callback) {

 			var t = this, dom = tinymce.DOM, elm, uri, loc, id;

@@ -8619,7 +10257,7 @@ window.tinymce.dom.Sizzle = Sizzle;
 			var item, state = states[url];

 

 			// Add url to load queue

-			if (state == undefined) {

+			if (state == undef) {

 				queue.push(url);

 				states[url] = QUEUED;

 			}

@@ -8649,7 +10287,7 @@ window.tinymce.dom.Sizzle = Sizzle;
 					callback.func.call(callback.scope);

 				});

 

-				scriptLoadedCallbacks[url] = undefined;

+				scriptLoadedCallbacks[url] = undef;

 			};

 

 			queueLoadedCallbacks.push({

@@ -8706,46 +10344,6 @@ window.tinymce.dom.Sizzle = Sizzle;
 	tinymce.ScriptLoader = new tinymce.dom.ScriptLoader();

 })(tinymce);

 

-tinymce.dom.TreeWalker = function(start_node, root_node) {

-	var node = start_node;

-

-	function findSibling(node, start_name, sibling_name, shallow) {

-		var sibling, parent;

-

-		if (node) {

-			// Walk into nodes if it has a start

-			if (!shallow && node[start_name])

-				return node[start_name];

-

-			// Return the sibling if it has one

-			if (node != root_node) {

-				sibling = node[sibling_name];

-				if (sibling)

-					return sibling;

-

-				// Walk up the parents to look for siblings

-				for (parent = node.parentNode; parent && parent != root_node; parent = parent.parentNode) {

-					sibling = parent[sibling_name];

-					if (sibling)

-						return sibling;

-				}

-			}

-		}

-	};

-

-	this.current = function() {

-		return node;

-	};

-

-	this.next = function(shallow) {

-		return (node = findSibling(node, 'firstChild', 'nextSibling', shallow));

-	};

-

-	this.prev = function(shallow) {

-		return (node = findSibling(node, 'lastChild', 'previousSibling', shallow));

-	};

-};

-

 (function(tinymce) {

 	tinymce.dom.RangeUtils = function(dom) {

 		var INVISIBLE_CHAR = '\uFEFF';

@@ -8769,6 +10367,24 @@ tinymce.dom.TreeWalker = function(start_node, root_node) {
 				return;

 			}

 

+			function exclude(nodes) {

+				var node;

+

+				// First node is excluded

+				node = nodes[0];

+				if (node.nodeType === 3 && node === startContainer && startOffset >= node.nodeValue.length) {

+					nodes.splice(0, 1);

+				}

+

+				// Last node is excluded

+				node = nodes[nodes.length - 1];

+				if (endOffset === 0 && nodes.length > 0 && node === endContainer && node.nodeType === 3) {

+					nodes.splice(nodes.length - 1, 1);

+				}

+

+				return nodes;

+			};

+

 			function collectSiblings(node, name, end_node) {

 				var siblings = [];

 

@@ -8798,7 +10414,7 @@ tinymce.dom.TreeWalker = function(start_node, root_node) {
 						if (!next)

 							siblings.reverse();

 

-						callback(siblings);

+						callback(exclude(siblings));

 					}

 				}

 			};

@@ -8811,28 +10427,28 @@ tinymce.dom.TreeWalker = function(start_node, root_node) {
 			if (endContainer.nodeType == 1 && endContainer.hasChildNodes())

 				endContainer = endContainer.childNodes[Math.min(endOffset - 1, endContainer.childNodes.length - 1)];

 

-			// Find common ancestor and end points

-			ancestor = dom.findCommonAncestor(startContainer, endContainer);

-

 			// Same container

 			if (startContainer == endContainer)

-				return callback([startContainer]);

+				return callback(exclude([startContainer]));

 

+			// Find common ancestor and end points

+			ancestor = dom.findCommonAncestor(startContainer, endContainer);

+				

 			// Process left side

 			for (node = startContainer; node; node = node.parentNode) {

-				if (node == endContainer)

+				if (node === endContainer)

 					return walkBoundary(startContainer, ancestor, true);

 

-				if (node == ancestor)

+				if (node === ancestor)

 					break;

 			}

 

 			// Process right side

 			for (node = endContainer; node; node = node.parentNode) {

-				if (node == startContainer)

+				if (node === startContainer)

 					return walkBoundary(endContainer, ancestor);

 

-				if (node == ancestor)

+				if (node === ancestor)

 					break;

 			}

 

@@ -8851,48 +10467,46 @@ tinymce.dom.TreeWalker = function(start_node, root_node) {
 			);

 

 			if (siblings.length)

-				callback(siblings);

+				callback(exclude(siblings));

 

 			// Walk right leaf

 			walkBoundary(endContainer, endPoint);

 		};

 

-		/*		this.split = function(rng) {

+		this.split = function(rng) {

 			var startContainer = rng.startContainer,

 				startOffset = rng.startOffset,

 				endContainer = rng.endContainer,

 				endOffset = rng.endOffset;

 

 			function splitText(node, offset) {

-				if (offset == node.nodeValue.length)

-					node.appendData(INVISIBLE_CHAR);

-

-				node = node.splitText(offset);

-

-				if (node.nodeValue === INVISIBLE_CHAR)

-					node.nodeValue = '';

-

-				return node;

+				return node.splitText(offset);

 			};

 

 			// Handle single text node

-			if (startContainer == endContainer) {

-				if (startContainer.nodeType == 3) {

-					if (startOffset != 0)

-						startContainer = endContainer = splitText(startContainer, startOffset);

-

-					if (endOffset - startOffset != startContainer.nodeValue.length)

-						splitText(startContainer, endOffset - startOffset);

+			if (startContainer == endContainer && startContainer.nodeType == 3) {

+				if (startOffset > 0 && startOffset < startContainer.nodeValue.length) {

+					endContainer = splitText(startContainer, startOffset);

+					startContainer = endContainer.previousSibling;

+

+					if (endOffset > startOffset) {

+						endOffset = endOffset - startOffset;

+						startContainer = endContainer = splitText(endContainer, endOffset).previousSibling;

+						endOffset = endContainer.nodeValue.length;

+						startOffset = 0;

+					} else {

+						endOffset = 0;

+					}

 				}

 			} else {

 				// Split startContainer text node if needed

-				if (startContainer.nodeType == 3 && startOffset != 0) {

+				if (startContainer.nodeType == 3 && startOffset > 0 && startOffset < startContainer.nodeValue.length) {

 					startContainer = splitText(startContainer, startOffset);

 					startOffset = 0;

 				}

 

 				// Split endContainer text node if needed

-				if (endContainer.nodeType == 3 && endOffset != endContainer.nodeValue.length) {

+				if (endContainer.nodeType == 3 && endOffset > 0 && endOffset < endContainer.nodeValue.length) {

 					endContainer = splitText(endContainer, endOffset).previousSibling;

 					endOffset = endContainer.nodeValue.length;

 				}

@@ -8905,7 +10519,7 @@ tinymce.dom.TreeWalker = function(start_node, root_node) {
 				endOffset : endOffset

 			};

 		};

-*/

+

 	};

 

 	tinymce.dom.RangeUtils.compareRanges = function(rng1, rng2) {

@@ -9390,8 +11004,8 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
 		update : function() {

 			var t = this, s = t.settings, tb = DOM.get('menu_' + t.id + '_tbl'), co = DOM.get('menu_' + t.id + '_co'), tw, th;

 

-			tw = s.max_width ? Math.min(tb.clientWidth, s.max_width) : tb.clientWidth;

-			th = s.max_height ? Math.min(tb.clientHeight, s.max_height) : tb.clientHeight;

+			tw = s.max_width ? Math.min(tb.offsetWidth, s.max_width) : tb.offsetWidth;

+			th = s.max_height ? Math.min(tb.offsetHeight, s.max_height) : tb.offsetHeight;

 

 			if (!DOM.boxModel)

 				t.element.setStyles({width : tw + 2, height : th + 2});

@@ -9481,7 +11095,7 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
 					if (m.settings.onclick)

 						m.settings.onclick(e);

 

-					return Event.cancel(e); // Cancel to fix onbeforeunload problem

+					return false; // Cancel to fix onbeforeunload problem

 				}

 			});

 

@@ -9611,7 +11225,7 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
 		// Internal functions

 		_setupKeyboardNav : function(){

 			var contextMenu, menuItems, t=this; 

-			contextMenu = DOM.select('#menu_' + t.id)[0];

+			contextMenu = DOM.get('menu_' + t.id);

 			menuItems = DOM.select('a[role=option]', 'menu_' + t.id);

 			menuItems.splice(0,0,contextMenu);

 			t.keyboardNav = new tinymce.ui.KeyboardNavigation({

@@ -9674,8 +11288,12 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
 

 			n = DOM.add(n, s.element || 'span', {'class' : 'mceText', title : o.settings.title}, o.settings.title);

 

-			if (o.settings.style)

+			if (o.settings.style) {

+				if (typeof o.settings.style == "function")

+					o.settings.style = o.settings.style();

+

 				DOM.setAttrib(n, 'style', o.settings.style);

+			}

 

 			if (tb.childNodes.length == 1)

 				DOM.addClass(ro, 'mceFirst');

@@ -9718,10 +11336,27 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
 		},

 

 		postRender : function() {

-			var t = this, s = t.settings;

-

+			var t = this, s = t.settings, imgBookmark;

+

+			// In IE a large image that occupies the entire editor area will be deselected when a button is clicked, so

+			// need to keep the selection in case the selection is lost

+			if (tinymce.isIE && t.editor) {

+				tinymce.dom.Event.add(t.id, 'mousedown', function(e) {

+					var nodeName = t.editor.selection.getNode().nodeName;

+					imgBookmark = nodeName === 'IMG' ? t.editor.selection.getBookmark() : null;

+				});

+			}

 			tinymce.dom.Event.add(t.id, 'click', function(e) {

-				if (!t.isDisabled())

+				if (!t.isDisabled()) {

+					// restore the selection in case the selection is lost in IE

+					if (tinymce.isIE && t.editor && imgBookmark !== null) {

+						t.editor.selection.moveToBookmark(imgBookmark);

+					}

+					return s.onclick.call(s.scope, e);

+				}

+			});

+			tinymce.dom.Event.add(t.id, 'keyup', function(e) {

+				if (!t.isDisabled() && e.keyCode==tinymce.VK.SPACEBAR)

 					return s.onclick.call(s.scope, e);

 			});

 		}

@@ -9729,7 +11364,7 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
 })(tinymce);

 

 (function(tinymce) {

-	var DOM = tinymce.DOM, Event = tinymce.dom.Event, each = tinymce.each, Dispatcher = tinymce.util.Dispatcher;

+	var DOM = tinymce.DOM, Event = tinymce.dom.Event, each = tinymce.each, Dispatcher = tinymce.util.Dispatcher, undef;

 

 	tinymce.create('tinymce.ui.ListBox:tinymce.ui.Control', {

 		ListBox : function(id, s, ed) {

@@ -9748,16 +11383,19 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
 			t.onRenderMenu = new tinymce.util.Dispatcher(this);

 

 			t.classPrefix = 'mceListBox';

+			t.marked = {};

 		},

 

 		select : function(va) {

 			var t = this, fv, f;

 

-			if (va == undefined)

+			t.marked = {};

+

+			if (va == undef)

 				return t.selectByIndex(-1);

 

 			// Is string or number make function selector

-			if (va && va.call)

+			if (va && typeof(va)=="function")

 				f = va;

 			else {

 				f = function(v) {

@@ -9784,6 +11422,8 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
 		selectByIndex : function(idx) {

 			var t = this, e, o, label;

 

+			t.marked = {};

+

 			if (idx != t.selectedIndex) {

 				e = DOM.get(t.id + '_text');

 				label = DOM.get(t.id + '_voiceDesc');

@@ -9807,6 +11447,10 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
 			}

 		},

 

+		mark : function(value) {

+			this.marked[value] = true;

+		},

+

 		add : function(n, v, o) {

 			var t = this;

 

@@ -9839,7 +11483,7 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
 		showMenu : function() {

 			var t = this, p2, e = DOM.get(this.id), m;

 

-			if (t.isDisabled() || t.items.length == 0)

+			if (t.isDisabled() || t.items.length === 0)

 				return;

 

 			if (t.menu && t.menu.isMenuVisible)

@@ -9858,13 +11502,19 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
 			m.settings.keyboard_focus = !tinymce.isOpera; // Opera is buggy when it comes to auto focus

 

 			// Select in menu

-			if (t.oldID)

-				m.items[t.oldID].setSelected(0);

+			each(t.items, function(o) {

+				if (m.items[o.id]) {

+					m.items[o.id].setSelected(0);

+				}

+			});

 

 			each(t.items, function(o) {

+				if (m.items[o.id] && t.marked[o.value]) {

+					m.items[o.id].setSelected(1);

+				}

+

 				if (o.value === t.selectedValue) {

 					m.items[o.id].setSelected(1);

-					t.oldID = o.id;

 				}

 			});

 

@@ -9900,7 +11550,7 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
 			m = t.settings.control_manager.createDropMenu(t.id + '_menu', {

 				menu_line : 1,

 				'class' : t.classPrefix + 'Menu mceNoIcons',

-				max_width : 150,

+				max_width : 250,

 				max_height : 150

 			});

 

@@ -9920,7 +11570,7 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
 

 			each(t.items, function(o) {

 				// No value then treat it as a title

-				if (o.value === undefined) {

+				if (o.value === undef) {

 					m.add({

 						title : o.title,

 						role : "option",

@@ -10010,7 +11660,7 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
 })(tinymce);

 

 (function(tinymce) {

-	var DOM = tinymce.DOM, Event = tinymce.dom.Event, each = tinymce.each, Dispatcher = tinymce.util.Dispatcher;

+	var DOM = tinymce.DOM, Event = tinymce.dom.Event, each = tinymce.each, Dispatcher = tinymce.util.Dispatcher, undef;

 

 	tinymce.create('tinymce.ui.NativeListBox:tinymce.ui.ListBox', {

 		NativeListBox : function(id, s) {

@@ -10030,11 +11680,11 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
 		select : function(va) {

 			var t = this, fv, f;

 

-			if (va == undefined)

+			if (va == undef)

 				return t.selectByIndex(-1);

 

 			// Is string or number make function selector

-			if (va && va.call)

+			if (va && typeof(va)=="function")

 				f = va;

 			else {

 				f = function(v) {

@@ -10183,7 +11833,7 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
 			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);

+			m.showMenu(0, e.firstChild.clientHeight);

 

 			Event.add(DOM.doc, 'mousedown', t.hideMenu, t);

 			t.setState('Selected', 1);

@@ -10367,7 +12017,7 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
 			p2 = DOM.getPos(e);

 			DOM.setStyles(t.id + '_menu', {

 				left : p2.x,

-				top : p2.y + e.clientHeight,

+				top : p2.y + e.firstChild.clientHeight,

 				zIndex : 200000

 			});

 			e = 0;

@@ -10410,7 +12060,7 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
 		renderMenu : function() {

 			var t = this, m, i = 0, s = t.settings, n, tb, tr, w, context;

 

-			w = DOM.add(s.menu_container, 'div', {role: 'listbox', id : t.id + '_menu', 'class' : s['menu_class'] + ' ' + s['class'], style : 'position:absolute;left:0;top:-1000px;'});

+			w = DOM.add(s.menu_container, 'div', {role: 'listbox', id : t.id + '_menu', 'class' : s.menu_class + ' ' + s['class'], style : 'position:absolute;left:0;top:-1000px;'});

 			m = DOM.add(w, 'div', {'class' : s['class'] + ' mceSplitButtonMenu'});

 			DOM.add(m, 'span', {'class' : 'mceMenuLine'});

 

@@ -10428,15 +12078,21 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
 				}

 

 				n = DOM.add(tr, 'td');

-				n = DOM.add(n, 'a', {

-					role : 'option',

+				var settings = {

 					href : 'javascript:;',

 					style : {

 						backgroundColor : '#' + c

 					},

 					'title': t.editor.getLang('colors.' + c, c),

 					'data-mce-color' : '#' + c

-				});

+				};

+

+				// adding a proper ARIA role = button causes JAWS to read things incorrectly on IE.

+				if (!tinymce.isIE ) {

+					settings.role = 'option';

+				}

+

+				n = DOM.add(n, 'a', settings);

 

 				if (t.editor.forcedHighContrastMode) {

 					n = DOM.add(n, 'canvas', { width: 16, height: 16, 'aria-hidden': 'true' });

@@ -10483,7 +12139,7 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
 				if (e && e.nodeName.toLowerCase() == 'a' && (c = e.getAttribute('data-mce-color')))

 					t.setColor(c);

 

-				return Event.cancel(e); // Prevent IE auto save warning

+				return false; // Prevent IE auto save warning

 			});

 

 			return w;

@@ -10729,7 +12385,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 			if (typeof u === "object")

 				url = u.prefix + u.resource + u.suffix;

 

-			if (url.indexOf('/') != 0 && url.indexOf('://') == -1)

+			if (url.indexOf('/') !== 0 && url.indexOf('://') == -1)

 				url = tinymce.baseURL + '/' + url;

 

 			t.urls[n] = url.substring(0, url.lastIndexOf('/'));

@@ -10753,7 +12409,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 		DOM = tinymce.DOM, Event = tinymce.dom.Event,

 		ThemeManager = tinymce.ThemeManager, PluginManager = tinymce.PluginManager,

 		explode = tinymce.explode,

-		Dispatcher = tinymce.util.Dispatcher, undefined, instanceCounter = 0;

+		Dispatcher = tinymce.util.Dispatcher, undef, instanceCounter = 0;

 

 	// Setup some URLs where the editor API is located and where the document is

 	tinymce.documentBaseURL = window.location.href.replace(/[\?#].*$/, '').replace(/[\/\\][^\/]+$/, '');

@@ -10788,6 +12444,26 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 		init : function(s) {

 			var t = this, pl, sl = tinymce.ScriptLoader, e, el = [], ed;

 

+			function createId(elm) {

+				var id = elm.id;

+	

+				// Use element id, or unique name or generate a unique id

+				if (!id) {

+					id = elm.name;

+	

+					if (id && !DOM.get(id)) {

+						id = elm.name;

+					} else {

+						// Generate unique name

+						id = DOM.uniqueId();

+					}

+

+					elm.setAttribute('id', id);

+				}

+

+				return id;

+			};

+

 			function execCallback(se, n, s) {

 				var f = se[n];

 

@@ -10803,6 +12479,10 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 				return f.apply(s || this, Array.prototype.slice.call(arguments, 2));

 			};

 

+			function hasClass(n, c) {

+				return c.constructor === RegExp ? c.test(n.className) : DOM.hasClass(n, c);

+			};

+

 			s = extend({

 				theme : "simple",

 				language : "en"

@@ -10811,7 +12491,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 			t.settings = s;

 

 			// Legacy call

-			Event.add(document, 'init', function() {

+			Event.bind(window, 'ready', function() {

 				var l, co;

 

 				execCallback(s, 'onpageload');

@@ -10846,30 +12526,36 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 

 					case "textareas":

 					case "specific_textareas":

-						function hasClass(n, c) {

-							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))

+						each(DOM.select('textarea'), function(elm) {

+							if (s.editor_deselector && hasClass(elm, s.editor_deselector))

 								return;

 

-							if (!s.editor_selector || hasClass(v, s.editor_selector)) {

-								// 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();

-

-								ed = new tinymce.Editor(v.id, s);

+							if (!s.editor_selector || hasClass(elm, s.editor_selector)) {

+								ed = new tinymce.Editor(createId(elm), s);

 								el.push(ed);

 								ed.render(1);

 							}

 						});

 						break;

+					

+					default:

+						if (s.types) {

+							// Process type specific selector

+							each(s.types, function(type) {

+								each(DOM.select(type.selector), function(elm) {

+									var editor = new tinymce.Editor(createId(elm), tinymce.extend({}, s, type));

+									el.push(editor);

+									editor.render(1);

+								});

+							});

+						} else if (s.selector) {

+							// Process global selector

+							each(DOM.select(s.selector), function(elm) {

+								var editor = new tinymce.Editor(createId(elm), s);

+								el.push(editor);

+								editor.render(1);

+							});

+						}

 				}

 

 				// Call onInit when all editors are initialized

@@ -10900,7 +12586,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 		},

 

 		get : function(id) {

-			if (id === undefined)

+			if (id === undef)

 				return this.editors;

 

 			return this.editors[id];

@@ -10953,6 +12639,12 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 		execCommand : function(c, u, v) {

 			var t = this, ed = t.get(v), w;

 

+			function clr() {

+				ed.destroy();

+				w.detachEvent('onunload', clr);

+				w = w.tinyMCE = w.tinymce = null; // IE leak

+			};

+

 			// Manager commands

 			switch (c) {

 				case "mceFocus":

@@ -10981,12 +12673,6 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 

 					// 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);

 					}

 

@@ -11069,104 +12755,18 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 (function(tinymce) {

 	// Shorten these names

 	var DOM = tinymce.DOM, Event = tinymce.dom.Event, extend = tinymce.extend,

-		Dispatcher = tinymce.util.Dispatcher, each = tinymce.each, isGecko = tinymce.isGecko,

+		each = tinymce.each, isGecko = tinymce.isGecko,

 		isIE = tinymce.isIE, isWebKit = tinymce.isWebKit, is = tinymce.is,

 		ThemeManager = tinymce.ThemeManager, PluginManager = tinymce.PluginManager,

-		inArray = tinymce.inArray, grep = tinymce.grep, explode = tinymce.explode;

+		explode = tinymce.explode;

 

 	tinymce.create('tinymce.Editor', {

-		Editor : function(id, s) {

-			var t = this;

-

-			t.id = t.editorId = id;

-

-			t.execCommands = {};

-			t.queryStateCommands = {};

-			t.queryValueCommands = {};

-

-			t.isNotDirty = false;

-

-			t.plugins = {};

-

-			// Add events to the editor

-			each([

-				'onPreInit',

-

-				'onBeforeRenderUI',

+		Editor : function(id, settings) {

+			var self = this, TRUE = true;

 

-				'onPostRender',

-

-				'onInit',

-

-				'onRemove',

-

-				'onActivate',

-

-				'onDeactivate',

-

-				'onClick',

-

-				'onEvent',

-

-				'onMouseUp',

-

-				'onMouseDown',

-

-				'onDblClick',

-

-				'onKeyDown',

-

-				'onKeyUp',

-

-				'onKeyPress',

-

-				'onContextMenu',

-

-				'onSubmit',

-

-				'onReset',

-

-				'onPaste',

-

-				'onPreProcess',

-

-				'onPostProcess',

-

-				'onBeforeSetContent',

-

-				'onBeforeGetContent',

-

-				'onSetContent',

-

-				'onGetContent',

-

-				'onLoadContent',

-

-				'onSaveContent',

-

-				'onNodeChange',

-

-				'onChange',

-

-				'onBeforeExecCommand',

-

-				'onExecCommand',

-

-				'onUndo',

-

-				'onRedo',

-

-				'onVisualAid',

-

-				'onSetProgressState'

-			], function(e) {

-				t[e] = new Dispatcher(t);

-			});

-

-			t.settings = s = extend({

+			self.settings = settings = extend({

 				id : id,

 				language : 'en',

-				docs_language : 'en',

 				theme : 'simple',

 				skin : 'default',

 				delta_width : 0,

@@ -11174,57 +12774,63 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 				popup_css : '',

 				plugins : '',

 				document_base_url : tinymce.documentBaseURL,

-				add_form_submit_trigger : 1,

-				submit_patch : 1,

-				add_unload_trigger : 1,

-				convert_urls : 1,

-				relative_urls : 1,

-				remove_script_host : 1,

-				table_inline_editing : 0,

-				object_resizing : 1,

-				cleanup : 1,

-				accessibility_focus : 1,

-				custom_shortcuts : 1,

-				custom_undo_redo_keyboard_shortcuts : 1,

-				custom_undo_redo_restore_selection : 1,

-				custom_undo_redo : 1,

+				add_form_submit_trigger : TRUE,

+				submit_patch : TRUE,

+				add_unload_trigger : TRUE,

+				convert_urls : TRUE,

+				relative_urls : TRUE,

+				remove_script_host : TRUE,

+				table_inline_editing : false,

+				object_resizing : TRUE,

+				accessibility_focus : TRUE,

 				doctype : tinymce.isIE6 ? '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">' : '<!DOCTYPE>', // Use old doctype on IE 6 to avoid horizontal scroll

-				visual_table_class : 'mceItemTable',

-				visual : 1,

+				visual : TRUE,

 				font_size_style_values : 'xx-small,x-small,small,medium,large,x-large,xx-large',

-				apply_source_formatting : 1,

+				font_size_legacy_values : 'xx-small,small,medium,large,x-large,xx-large,300%', // See: http://www.w3.org/TR/CSS2/fonts.html#propdef-font-size

+				apply_source_formatting : TRUE,

 				directionality : 'ltr',

 				forced_root_block : 'p',

-				hidden_input : 1,

-				padd_empty_editor : 1,

-				render_ui : 1,

-				init_theme : 1,

-				force_p_newlines : 1,

+				hidden_input : TRUE,

+				padd_empty_editor : TRUE,

+				render_ui : TRUE,

 				indentation : '30px',

-				keep_styles : 1,

-				fix_table_elements : 1,

-				inline_styles : 1,

-				convert_fonts_to_spans : true,

+				fix_table_elements : TRUE,

+				inline_styles : TRUE,

+				convert_fonts_to_spans : TRUE,

 				indent : 'simple',

-				indent_before : 'p,h1,h2,h3,h4,h5,h6,blockquote,div,title,style,pre,script,td,ul,li,area,table,thead,tfoot,tbody,tr',

-				indent_after : 'p,h1,h2,h3,h4,h5,h6,blockquote,div,title,style,pre,script,td,ul,li,area,table,thead,tfoot,tbody,tr',

-				validate : true,

+				indent_before : 'p,h1,h2,h3,h4,h5,h6,blockquote,div,title,style,pre,script,td,ul,li,area,table,thead,tfoot,tbody,tr,section,article,hgroup,aside,figure',

+				indent_after : 'p,h1,h2,h3,h4,h5,h6,blockquote,div,title,style,pre,script,td,ul,li,area,table,thead,tfoot,tbody,tr,section,article,hgroup,aside,figure',

+				validate : TRUE,

 				entity_encoding : 'named',

-				url_converter : t.convertURL,

-				url_converter_scope : t,

-				ie7_compat : true

-			}, s);

+				url_converter : self.convertURL,

+				url_converter_scope : self,

+				ie7_compat : TRUE

+			}, settings);

 

-			t.documentBaseURI = new tinymce.util.URI(s.document_base_url || tinymce.documentBaseURL, {

+			self.id = self.editorId = id;

+

+			self.isNotDirty = false;

+

+			self.plugins = {};

+

+			self.documentBaseURI = new tinymce.util.URI(settings.document_base_url || tinymce.documentBaseURL, {

 				base_uri : tinyMCE.baseURI

 			});

 

-			t.baseURI = tinymce.baseURI;

+			self.baseURI = tinymce.baseURI;

 

-			t.contentCSS = [];

+			self.contentCSS = [];

+

+			// Creates all events like onClick, onSetContent etc see Editor.Events.js for the actual logic

+			self.setupEvents();

+

+			// Internal command handler objects

+			self.execCommands = {};

+			self.queryStateCommands = {};

+			self.queryValueCommands = {};

 

 			// Call setup

-			t.execCallback('setup', t);

+			self.execCallback('setup', self);

 		},

 

 		render : function(nst) {

@@ -11232,7 +12838,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 

 			// Page is not loaded yet, wait for it

 			if (!Event.domLoaded) {

-				Event.add(document, 'init', function() {

+				Event.add(window, 'ready', function() {

 					t.render();

 				});

 				return;

@@ -11245,8 +12851,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 				return;

 

 			// Is a iPad/iPhone and not on iOS5, then skip initialization. We need to sniff 

-			// here since the browser says it has contentEditable support but there is no visible

-			// caret We will remove this check ones Apple implements full contentEditable support

+			// here since the browser says it has contentEditable support but there is no visible caret.

 			if (tinymce.isIDevice && !tinymce.isIOS5)

 				return;

 

@@ -11325,9 +12930,8 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 							var dependencies = PluginManager.dependencies(p);

 							each(dependencies, function(dep) {

 								var defaultSettings = {prefix:'plugins/', resource: dep, suffix:'/editor_plugin' + tinymce.suffix + '.js'};

-								var dep = PluginManager.createUrl(defaultSettings, dep);

+								dep = PluginManager.createUrl(defaultSettings, dep);

 								PluginManager.load(dep.resource, dep);

-								

 							});

 						} else {

 							// Skip safari plugin, since it is removed as of 3.3b1

@@ -11361,7 +12965,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 				o = ThemeManager.get(s.theme);

 				t.theme = new o();

 

-				if (t.theme.init && s.init_theme)

+				if (t.theme.init)

 					t.theme.init(t, ThemeManager.urls[s.theme] || tinymce.documentBaseURL.replace(/\/$/, ''));

 			}

 			function initPlugin(p) {

@@ -11397,51 +13001,27 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 

 			t.controlManager = new tinymce.ControlManager(t);

 

-			if (s.custom_undo_redo) {

-				t.onBeforeExecCommand.add(function(ed, cmd, ui, val, a) {

-					if (cmd != 'Undo' && cmd != 'Redo' && cmd != 'mceRepaint' && (!a || !a.skip_undo))

-						t.undoManager.beforeChange();

-				});

-

-				t.onExecCommand.add(function(ed, cmd, ui, val, a) {

-					if (cmd != 'Undo' && cmd != 'Redo' && cmd != 'mceRepaint' && (!a || !a.skip_undo))

-						t.undoManager.add();

-				});

-			}

-

 			t.onExecCommand.add(function(ed, c) {

 				// Don't refresh the select lists until caret move

 				if (!/^(FontName|FontSize)$/.test(c))

 					t.nodeChanged();

 			});

 

-			// Remove ghost selections on images and tables in Gecko

-			if (isGecko) {

-				function repaint(a, o) {

-					if (!o || !o.initial)

-						t.execCommand('mceRepaint');

-				};

-

-				t.onUndo.add(repaint);

-				t.onRedo.add(repaint);

-				t.onSetContent.add(repaint);

-			}

-

 			// Enables users to override the control factory

 			t.onBeforeRenderUI.dispatch(t, t.controlManager);

 

 			// Measure box

-			if (s.render_ui) {

+			if (s.render_ui && t.theme) {

 				w = s.width || e.style.width || e.offsetWidth;

 				h = s.height || e.style.height || e.offsetHeight;

 				t.orgDisplay = e.style.display;

 				re = /^[0-9\.]+(|px)$/i;

 

 				if (re.test('' + w))

-					w = Math.max(parseInt(w) + (o.deltaWidth || 0), 100);

+					w = Math.max(parseInt(w, 10) + (o.deltaWidth || 0), 100);

 

 				if (re.test('' + h))

-					h = Math.max(parseInt(h) + (o.deltaHeight || 0), 100);

+					h = Math.max(parseInt(h, 10) + (o.deltaHeight || 0), 100);

 

 				// Render UI

 				o = t.theme.renderUI({

@@ -11455,6 +13035,18 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 				t.editorContainer = o.editorContainer;

 			}

 

+			// Load specified content CSS last

+			if (s.content_css) {

+				each(explode(s.content_css), function(u) {

+					t.contentCSS.push(t.documentBaseURI.toAbsolute(u));

+				});

+			}

+

+			// Content editable mode ends here

+			if (s.content_editable) {

+				e = n = o = null; // Fix IE leak

+				return t.initContentBody();

+			}

 

 			// User specified a document.domain value

 			if (document.domain && location.hostname != document.domain)

@@ -11466,13 +13058,6 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 				height : h

 			});

 

-			// Load specified content CSS last

-			if (s.content_css) {

-				tinymce.each(explode(s.content_css), function(u) {

-					t.contentCSS.push(t.documentBaseURI.toAbsolute(u));

-				});

-			}

-

 			h = (o.iframeHeight || h) + (typeof(h) == 'number' ? (o.deltaHeight || 0) : '');

 			if (h < 100)

 				h = 100;

@@ -11497,6 +13082,8 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 				t.iframeHTML += '<link type="text/css" rel="stylesheet" href="' + t.contentCSS[i] + '" />';

 			}

 

+			t.contentCSS = [];

+

 			bi = s.body_id || 'tinymce';

 			if (bi.indexOf('=') != -1) {

 				bi = t.getParam('body_id', '', 'hash');

@@ -11509,12 +13096,12 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 				bc = bc[t.id] || '';

 			}

 

-			t.iframeHTML += '</head><body id="' + bi + '" class="mceContentBody ' + bc + '"><br></body></html>';

+			t.iframeHTML += '</head><body id="' + bi + '" class="mceContentBody ' + bc + '" onload="window.parent.tinyMCE.get(\'' + t.id + '\').onLoad.dispatch();"><br></body></html>';

 

 			// Domain relaxing enabled, then set document domain

 			if (tinymce.relaxedDomain && (isIE || (tinymce.isOpera && parseFloat(opera.version()) < 11))) {

 				// We need to write the contents here in IE since multiple writes messes up refresh button and back button

-				u = 'javascript:(function(){document.open();document.domain="' + document.domain + '";var ed = window.parent.tinyMCE.get("' + t.id + '");document.write(ed.iframeHTML);document.close();ed.setupIframe();})()';

+				u = 'javascript:(function(){document.open();document.domain="' + document.domain + '";var ed = window.parent.tinyMCE.get("' + t.id + '");document.write(ed.iframeHTML);document.close();ed.initContentBody();})()';

 			}

 

 			// Create iframe

@@ -11538,73 +13125,61 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 			DOM.setAttrib(t.id, 'aria-hidden', true);

 

 			if (!tinymce.relaxedDomain || !u)

-				t.setupIframe();

+				t.initContentBody();

 

 			e = n = o = null; // Cleanup

 		},

 

-		setupIframe : function() {

-			var t = this, s = t.settings, e = DOM.get(t.id), d = t.getDoc(), h, b;

+		initContentBody : function() {

+			var self = this, settings = self.settings, targetElm = DOM.get(self.id), doc = self.getDoc(), html, body;

 

 			// Setup iframe body

-			if (!isIE || !tinymce.relaxedDomain) {

-				d.open();

-				d.write(t.iframeHTML);

-				d.close();

+			if ((!isIE || !tinymce.relaxedDomain) && !settings.content_editable) {

+				doc.open();

+				doc.write(self.iframeHTML);

+				doc.close();

 

 				if (tinymce.relaxedDomain)

-					d.domain = tinymce.relaxedDomain;

+					doc.domain = tinymce.relaxedDomain;

+			}

+

+			if (settings.content_editable) {

+				DOM.addClass(targetElm, 'mceContentBody');

+				self.contentDocument = doc = settings.content_document || document;

+				self.contentWindow = settings.content_window || window;

+				self.bodyElement = targetElm;

+

+				// Prevent leak in IE

+				settings.content_document = settings.content_window = null;

 			}

 

 			// It will not steal focus while setting contentEditable

-			b = t.getBody();

-			b.disabled = true;

+			body = self.getBody();

+			body.disabled = true;

 

-			if (!s.readonly)

-				b.contentEditable = true;

+			if (!settings.readonly)

+				body.contentEditable = self.getParam('content_editable_state', true);

 

-			b.disabled = false;

+			body.disabled = false;

 

-			t.schema = new tinymce.html.Schema(s);

+			self.schema = new tinymce.html.Schema(settings);

 

-			t.dom = new tinymce.dom.DOMUtils(t.getDoc(), {

+			self.dom = new tinymce.dom.DOMUtils(doc, {

 				keep_values : true,

-				url_converter : t.convertURL,

-				url_converter_scope : t,

-				hex_colors : s.force_hex_style_colors,

-				class_filter : s.class_filter,

-				update_styles : 1,

-				fix_ie_paragraphs : 1,

-				schema : t.schema

+				url_converter : self.convertURL,

+				url_converter_scope : self,

+				hex_colors : settings.force_hex_style_colors,

+				class_filter : settings.class_filter,

+				update_styles : true,

+				root_element : settings.content_editable ? self.id : null,

+				schema : self.schema

 			});

 

-			t.parser = new tinymce.html.DomParser(s, t.schema);

-

-			// Force anchor names closed, unless the setting "allow_html_in_named_anchor" is explicitly included.

-			if (!t.settings.allow_html_in_named_anchor) {

-				t.parser.addAttributeFilter('name', function(nodes, name) {

-					var i = nodes.length, sibling, prevSibling, parent, node;

-	

-					while (i--) {

-						node = nodes[i];

-						if (node.name === 'a' && node.firstChild) {

-							parent = node.parent;

-	

-							// Move children after current node

-							sibling = node.lastChild;

-							do {

-								prevSibling = sibling.prev;

-								parent.insert(sibling, node);

-								sibling = prevSibling;

-							} while (sibling);

-						}

-					}

-				});

-			}

+			self.parser = new tinymce.html.DomParser(settings, self.schema);

 

 			// Convert src and href into data-mce-src, data-mce-href and data-mce-style

-			t.parser.addAttributeFilter('src,href,style', function(nodes, name) {

-				var i = nodes.length, node, dom = t.dom, value, internalName;

+			self.parser.addAttributeFilter('src,href,style', function(nodes, name) {

+				var i = nodes.length, node, dom = self.dom, value, internalName;

 

 				while (i--) {

 					node = nodes[i];

@@ -11616,20 +13191,22 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 						if (name === "style")

 							node.attr(internalName, dom.serializeStyle(dom.parseStyle(value), node.name));

 						else

-							node.attr(internalName, t.convertURL(value, name, node.name));

+							node.attr(internalName, self.convertURL(value, name, node.name));

 					}

 				}

 			});

 

 			// Keep scripts from executing

-			t.parser.addNodeFilter('script', function(nodes, name) {

-				var i = nodes.length;

+			self.parser.addNodeFilter('script', function(nodes, name) {

+				var i = nodes.length, node;

 

-				while (i--)

-					nodes[i].attr('type', 'mce-text/javascript');

+				while (i--) {

+					node = nodes[i];

+					node.attr('type', 'mce-' + (node.attr('type') || 'text/javascript'));

+				}

 			});

 

-			t.parser.addNodeFilter('#cdata', function(nodes, name) {

+			self.parser.addNodeFilter('#cdata', function(nodes, name) {

 				var i = nodes.length, node;

 

 				while (i--) {

@@ -11640,8 +13217,8 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 				}

 			});

 

-			t.parser.addNodeFilter('p,h1,h2,h3,h4,h5,h6,div', function(nodes, name) {

-				var i = nodes.length, node, nonEmptyElements = t.schema.getNonEmptyElements();

+			self.parser.addNodeFilter('p,h1,h2,h3,h4,h5,h6,div', function(nodes, name) {

+				var i = nodes.length, node, nonEmptyElements = self.schema.getNonEmptyElements();

 

 				while (i--) {

 					node = nodes[i];

@@ -11651,307 +13228,89 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 				}

 			});

 

-			t.serializer = new tinymce.dom.Serializer(s, t.dom, t.schema);

-

-			t.selection = new tinymce.dom.Selection(t.dom, t.getWin(), t.serializer);

-

-			t.formatter = new tinymce.Formatter(this);

-

-			// Register default formats

-			t.formatter.register({

-				alignleft : [

-					{selector : 'p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li', styles : {textAlign : 'left'}},

-					{selector : 'img,table', collapsed : false, styles : {'float' : 'left'}}

-				],

-

-				aligncenter : [

-					{selector : 'p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li', styles : {textAlign : 'center'}},

-					{selector : 'img', collapsed : false, styles : {display : 'block', marginLeft : 'auto', marginRight : 'auto'}},

-					{selector : 'table', collapsed : false, styles : {marginLeft : 'auto', marginRight : 'auto'}}

-				],

-

-				alignright : [

-					{selector : 'p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li', styles : {textAlign : 'right'}},

-					{selector : 'img,table', collapsed : false, styles : {'float' : 'right'}}

-				],

-

-				alignfull : [

-					{selector : 'p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li', styles : {textAlign : 'justify'}}

-				],

-

-				bold : [

-					{inline : 'strong', remove : 'all'},

-					{inline : 'span', styles : {fontWeight : 'bold'}},

-					{inline : 'b', remove : 'all'}

-				],

-

-				italic : [

-					{inline : 'em', remove : 'all'},

-					{inline : 'span', styles : {fontStyle : 'italic'}},

-					{inline : 'i', remove : 'all'}

-				],

-

-				underline : [

-					{inline : 'span', styles : {textDecoration : 'underline'}, exact : true},

-					{inline : 'u', remove : 'all'}

-				],

-

-				strikethrough : [

-					{inline : 'span', styles : {textDecoration : 'line-through'}, exact : true},

-					{inline : 'strike', remove : 'all'}

-				],

-

-				forecolor : {inline : 'span', styles : {color : '%value'}, wrap_links : false},

-				hilitecolor : {inline : 'span', styles : {backgroundColor : '%value'}, wrap_links : false},

-				fontname : {inline : 'span', styles : {fontFamily : '%value'}},

-				fontsize : {inline : 'span', styles : {fontSize : '%value'}},

-				fontsize_class : {inline : 'span', attributes : {'class' : '%value'}},

-				blockquote : {block : 'blockquote', wrapper : 1, remove : 'all'},

-				subscript : {inline : 'sub'},

-				superscript : {inline : 'sup'},

-

-				link : {inline : 'a', selector : 'a', remove : 'all', split : true, deep : true,

-					onmatch : function(node) {

-						return true;

-					},

-

-					onformat : function(elm, fmt, vars) {

-						each(vars, function(value, key) {

-							t.dom.setAttrib(elm, key, value);

-						});

-					}

-				},

-

-				removeformat : [

-					{selector : 'b,strong,em,i,font,u,strike', remove : 'all', split : true, expand : false, block_expand : true, deep : true},

-					{selector : 'span', attributes : ['style', 'class'], remove : 'empty', split : true, expand : false, deep : true},

-					{selector : '*', attributes : ['style', 'class'], split : false, expand : false, deep : true}

-				]

-			});

-

-			// Register default block formats

-			each('p h1 h2 h3 h4 h5 h6 div address pre div code dt dd samp'.split(/\s/), function(name) {

-				t.formatter.register(name, {block : name, remove : 'all'});

-			});

-

-			// Register user defined formats

-			t.formatter.register(t.settings.formats);

+			self.serializer = new tinymce.dom.Serializer(settings, self.dom, self.schema);

 

-			t.undoManager = new tinymce.UndoManager(t);

+			self.selection = new tinymce.dom.Selection(self.dom, self.getWin(), self.serializer);

 

-			// Pass through

-			t.undoManager.onAdd.add(function(um, l) {

-				if (um.hasUndo())

-					return t.onChange.dispatch(t, l, um);

-			});

+			self.formatter = new tinymce.Formatter(self);

 

-			t.undoManager.onUndo.add(function(um, l) {

-				return t.onUndo.dispatch(t, l, um);

-			});

-

-			t.undoManager.onRedo.add(function(um, l) {

-				return t.onRedo.dispatch(t, l, um);

-			});

-

-			t.forceBlocks = new tinymce.ForceBlocks(t, {

-				forced_root_block : s.forced_root_block

-			});

+			self.undoManager = new tinymce.UndoManager(self);

 

-			t.editorCommands = new tinymce.EditorCommands(t);

+			self.forceBlocks = new tinymce.ForceBlocks(self);

+			self.enterKey = new tinymce.EnterKey(self);

+			self.editorCommands = new tinymce.EditorCommands(self);

 

 			// Pass through

-			t.serializer.onPreProcess.add(function(se, o) {

-				return t.onPreProcess.dispatch(t, o, se);

+			self.serializer.onPreProcess.add(function(se, o) {

+				return self.onPreProcess.dispatch(self, o, se);

 			});

 

-			t.serializer.onPostProcess.add(function(se, o) {

-				return t.onPostProcess.dispatch(t, o, se);

+			self.serializer.onPostProcess.add(function(se, o) {

+				return self.onPostProcess.dispatch(self, o, se);

 			});

 

-			t.onPreInit.dispatch(t);

-

-			if (!s.gecko_spellcheck)

-				t.getBody().spellcheck = 0;

-

-			if (!s.readonly)

-				t._addEvents();

-

-			t.controlManager.onPostRender.dispatch(t, t.controlManager);

-			t.onPostRender.dispatch(t);

-

-			t.quirks = new tinymce.util.Quirks(this);

-

-			if (s.directionality)

-				t.getBody().dir = s.directionality;

-

-			if (s.nowrap)

-				t.getBody().style.whiteSpace = "nowrap";

-

-			if (s.handle_node_change_callback) {

-				t.onNodeChange.add(function(ed, cm, n) {

-					t.execCallback('handle_node_change_callback', t.id, n, -1, -1, true, t.selection.isCollapsed());

-				});

-			}

-

-			if (s.save_callback) {

-				t.onSaveContent.add(function(ed, o) {

-					var h = t.execCallback('save_callback', t.id, o.content, t.getBody());

-

-					if (h)

-						o.content = h;

-				});

-			}

-

-			if (s.onchange_callback) {

-				t.onChange.add(function(ed, l) {

-					t.execCallback('onchange_callback', t, l);

-				});

-			}

-

-			if (s.protect) {

-				t.onBeforeSetContent.add(function(ed, o) {

-					if (s.protect) {

-						each(s.protect, function(pattern) {

-							o.content = o.content.replace(pattern, function(str) {

-								return '<!--mce:protected ' + escape(str) + '-->';

-							});

-						});

-					}

-				});

-			}

+			self.onPreInit.dispatch(self);

 

-			if (s.convert_newlines_to_brs) {

-				t.onBeforeSetContent.add(function(ed, o) {

-					if (o.initial)

-						o.content = o.content.replace(/\r?\n/g, '<br />');

-				});

-			}

-

-			if (s.preformatted) {

-				t.onPostProcess.add(function(ed, o) {

-					o.content = o.content.replace(/^\s*<pre.*?>/, '');

-					o.content = o.content.replace(/<\/pre>\s*$/, '');

+			if (!settings.gecko_spellcheck)

+				doc.body.spellcheck = false;

 

-					if (o.set)

-						o.content = '<pre class="mceItemHidden">' + o.content + '</pre>';

-				});

+			if (!settings.readonly) {

+				self.bindNativeEvents();

 			}

 

-			if (s.verify_css_classes) {

-				t.serializer.attribValueFilter = function(n, v) {

-					var s, cl;

+			self.controlManager.onPostRender.dispatch(self, self.controlManager);

+			self.onPostRender.dispatch(self);

 

-					if (n == 'class') {

-						// Build regexp for classes

-						if (!t.classesRE) {

-							cl = t.dom.getClasses();

+			self.quirks = tinymce.util.Quirks(self);

 

-							if (cl.length > 0) {

-								s = '';

+			if (settings.directionality)

+				body.dir = settings.directionality;

 

-								each (cl, function(o) {

-									s += (s ? '|' : '') + o['class'];

-								});

+			if (settings.nowrap)

+				body.style.whiteSpace = "nowrap";

 

-								t.classesRE = new RegExp('(' + s + ')', 'gi');

-							}

-						}

-

-						return !t.classesRE || /(\bmceItem\w+\b|\bmceTemp\w+\b)/g.test(v) || t.classesRE.test(v) ? v : '';

-					}

-

-					return v;

-				};

-			}

-

-			if (s.cleanup_callback) {

-				t.onBeforeSetContent.add(function(ed, o) {

-					o.content = t.execCallback('cleanup_callback', 'insert_to_editor', o.content, o);

-				});

-

-				t.onPreProcess.add(function(ed, o) {

-					if (o.set)

-						t.execCallback('cleanup_callback', 'insert_to_editor_dom', o.node, o);

-

-					if (o.get)

-						t.execCallback('cleanup_callback', 'get_from_editor_dom', o.node, o);

-				});

-

-				t.onPostProcess.add(function(ed, o) {

-					if (o.set)

-						o.content = t.execCallback('cleanup_callback', 'insert_to_editor', o.content, o);

-

-					if (o.get)						

-						o.content = t.execCallback('cleanup_callback', 'get_from_editor', o.content, o);

-				});

-			}

-

-			if (s.save_callback) {

-				t.onGetContent.add(function(ed, o) {

-					if (o.save)

-						o.content = t.execCallback('save_callback', t.id, o.content, t.getBody());

-				});

-			}

-

-			if (s.handle_event_callback) {

-				t.onEvent.add(function(ed, e, o) {

-					if (t.execCallback('handle_event_callback', e, ed, o) === false)

-						Event.cancel(e);

+			if (settings.protect) {

+				self.onBeforeSetContent.add(function(ed, o) {

+					each(settings.protect, function(pattern) {

+						o.content = o.content.replace(pattern, function(str) {

+							return '<!--mce:protected ' + escape(str) + '-->';

+						});

+					});

 				});

 			}

 

 			// Add visual aids when new contents is added

-			t.onSetContent.add(function() {

-				t.addVisual(t.getBody());

+			self.onSetContent.add(function() {

+				self.addVisual(self.getBody());

 			});

 

 			// Remove empty contents

-			if (s.padd_empty_editor) {

-				t.onPostProcess.add(function(ed, o) {

+			if (settings.padd_empty_editor) {

+				self.onPostProcess.add(function(ed, o) {

 					o.content = o.content.replace(/^(<p[^>]*>(&nbsp;|&#160;|\s|\u00a0|)<\/p>[\r\n]*|<br \/>[\r\n]*)$/, '');

 				});

 			}

 

-			if (isGecko) {

-				// Fix gecko link bug, when a link is placed at the end of block elements there is

-				// no way to move the caret behind the link. This fix adds a bogus br element after the link

-				function fixLinks(ed, o) {

-					each(ed.dom.select('a'), function(n) {

-						var pn = n.parentNode;

-

-						if (ed.dom.isBlock(pn) && pn.lastChild === n)

-							ed.dom.add(pn, 'br', {'data-mce-bogus' : 1});

-					});

-				};

-

-				t.onExecCommand.add(function(ed, cmd) {

-					if (cmd === 'CreateLink')

-						fixLinks(ed);

-				});

-

-				t.onSetContent.add(t.selection.onSetContent.add(fixLinks));

-			}

+			self.load({initial : true, format : 'html'});

+			self.startContent = self.getContent({format : 'raw'});

 

-			t.load({initial : true, format : 'html'});

-			t.startContent = t.getContent({format : 'raw'});

-			t.undoManager.add();

-			t.initialized = true;

+			self.initialized = true;

 

-			t.onInit.dispatch(t);

-			t.execCallback('setupcontent_callback', t.id, t.getBody(), t.getDoc());

-			t.execCallback('init_instance_callback', t);

-			t.focus(true);

-			t.nodeChanged({initial : 1});

+			self.onInit.dispatch(self);

+			self.execCallback('setupcontent_callback', self.id, body, doc);

+			self.execCallback('init_instance_callback', self);

+			self.focus(true);

+			self.nodeChanged({initial : true});

 

 			// Load specified content CSS last

-			each(t.contentCSS, function(u) {

-				t.dom.loadCSS(u);

+			each(self.contentCSS, function(url) {

+				self.dom.loadCSS(url);

 			});

 

 			// Handle auto focus

-			if (s.auto_focus) {

+			if (settings.auto_focus) {

 				setTimeout(function () {

-					var ed = tinymce.get(s.auto_focus);

+					var ed = tinymce.get(settings.auto_focus);

 

 					ed.selection.select(ed.getBody(), 1);

 					ed.selection.collapse(1);

@@ -11960,30 +13319,41 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 				}, 100);

 			}

 

-			e = null;

+			// Clean up references for IE

+			targetElm = doc = body = null;

 		},

 

+		focus : function(skip_focus) {

+			var oed, self = this, selection = self.selection, contentEditable = self.settings.content_editable, ieRng, controlElm, doc = self.getDoc(), body;

 

-		focus : function(sf) {

-			var oed, t = this, selection = t.selection, ce = t.settings.content_editable, ieRng, controlElm, doc = t.getDoc();

-

-			if (!sf) {

+			if (!skip_focus) {

 				// Get selected control element

 				ieRng = selection.getRng();

 				if (ieRng.item) {

 					controlElm = ieRng.item(0);

 				}

 

-				t._refreshContentEditable();

-				selection.normalize();

+				self._refreshContentEditable();

 

-				// Is not content editable

-				if (!ce)

-					t.getWin().focus();

+				// Focus the window iframe

+				if (!contentEditable) {

+					self.getWin().focus();

+				}

 

 				// Focus the body as well since it's contentEditable

-				if (tinymce.isGecko) {

-					t.getBody().focus();

+				if (tinymce.isGecko || contentEditable) {

+					body = self.getBody();

+

+					// Check for setActive since it doesn't scroll to the element

+					if (body.setActive) {

+						body.setActive();

+					} else {

+						body.focus();

+					}

+

+					if (contentEditable) {

+						selection.normalize();

+					}

 				}

 

 				// Restore selected control element

@@ -11994,17 +13364,16 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 					ieRng.addElement(controlElm);

 					ieRng.select();

 				}

-

 			}

 

-			if (tinymce.activeEditor != t) {

+			if (tinymce.activeEditor != self) {

 				if ((oed = tinymce.activeEditor) != null)

-					oed.onDeactivate.dispatch(oed, t);

+					oed.onDeactivate.dispatch(oed, self);

 

-				t.onActivate.dispatch(t, oed);

+				self.onActivate.dispatch(self, oed);

 			}

 

-			tinymce._setActive(t);

+			tinymce._setActive(self);

 		},

 

 		execCallback : function(n) {

@@ -12036,7 +13405,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 			if (!s)

 				return '';

 

-			return i18n[c + '.' + s] || s.replace(/{\#([^}]+)\}/g, function(a, b) {

+			return i18n[c + '.' + s] || s.replace(/\{\#([^\}]+)\}/g, function(a, b) {

 				return i18n[c + '.' + b] || '{#' + b + '}';

 			});

 		},

@@ -12070,37 +13439,43 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 		},

 

 		nodeChanged : function(o) {

-			var t = this, s = t.selection, n = s.getStart() || t.getBody();

+			var self = this, selection = self.selection, node;

 

 			// Fix for bug #1896577 it seems that this can not be fired while the editor is loading

-			if (t.initialized) {

+			if (self.initialized) {

 				o = o || {};

-				n = isIE && n.ownerDocument != t.getDoc() ? t.getBody() : n; // Fix for IE initial state

+

+				// Normalize selection for example <b>a</b><i>|a</i> becomes <b>a|</b><i>a</i>

+				selection.normalize();

+

+				// Get start node

+				node = selection.getStart() || self.getBody();

+				node = isIE && node.ownerDocument != self.getDoc() ? self.getBody() : node; // Fix for IE initial state

 

 				// Get parents and add them to object

 				o.parents = [];

-				t.dom.getParent(n, function(node) {

+				self.dom.getParent(node, function(node) {

 					if (node.nodeName == 'BODY')

 						return true;

 

 					o.parents.push(node);

 				});

 

-				t.onNodeChange.dispatch(

-					t,

-					o ? o.controlManager || t.controlManager : t.controlManager,

-					n,

-					s.isCollapsed(),

+				self.onNodeChange.dispatch(

+					self,

+					o ? o.controlManager || self.controlManager : self.controlManager,

+					node,

+					selection.isCollapsed(),

 					o

 				);

 			}

 		},

 

-		addButton : function(n, s) {

-			var t = this;

+		addButton : function(name, settings) {

+			var self = this;

 

-			t.buttons = t.buttons || {};

-			t.buttons[n] = s;

+			self.buttons = self.buttons || {};

+			self.buttons[name] = settings;

 		},

 

 		addCommand : function(name, callback, scope) {

@@ -12118,7 +13493,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 		addShortcut : function(pa, desc, cmd_func, sc) {

 			var t = this, c;

 

-			if (!t.settings.custom_shortcuts)

+			if (t.settings.custom_shortcuts === false)

 				return false;

 

 			t.shortcuts = t.shortcuts || {};

@@ -12143,7 +13518,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 				var o = {

 					func : cmd_func,

 					scope : sc || this,

-					desc : desc,

+					desc : t.translate(desc),

 					alt : false,

 					ctrl : false,

 					shift : false

@@ -12175,9 +13550,9 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 			if (!/^(mceAddUndoLevel|mceEndUndoLevel|mceBeginUndoLevel|mceRepaint|SelectAll)$/.test(cmd) && (!a || !a.skip_focus))

 				t.focus();

 

-			o = {};

-			t.onBeforeExecCommand.dispatch(t, cmd, ui, val, o);

-			if (o.terminate)

+			a = extend({}, a);

+			t.onBeforeExecCommand.dispatch(t, cmd, ui, val, a);

+			if (a.terminate)

 				return false;

 

 			// Command callback

@@ -12285,24 +13660,24 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 		},

 

 		show : function() {

-			var t = this;

+			var self = this;

 

-			DOM.show(t.getContainer());

-			DOM.hide(t.id);

-			t.load();

+			DOM.show(self.getContainer());

+			DOM.hide(self.id);

+			self.load();

 		},

 

 		hide : function() {

-			var t = this, d = t.getDoc();

+			var self = this, doc = self.getDoc();

 

 			// Fixed bug where IE has a blinking cursor left from the editor

-			if (isIE && d)

-				d.execCommand('SelectAll');

+			if (isIE && doc)

+				doc.execCommand('SelectAll');

 

 			// We must save before we hide so Safari doesn't crash

-			t.save();

-			DOM.hide(t.getContainer());

-			DOM.setStyle(t.id, 'display', t.orgDisplay);

+			self.save();

+			DOM.hide(self.getContainer());

+			DOM.setStyle(self.id, 'display', self.orgDisplay);

 		},

 

 		isHidden : function() {

@@ -12344,12 +13719,6 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 			o = o || {};

 			o.save = true;

 

-			// Add undo level will trigger onchange event

-			if (!o.no_events) {

-				t.undoManager.typing = false;

-				t.undoManager.add();

-			}

-

 			o.element = e;

 			h = o.content = t.getContent(o);

 

@@ -12435,6 +13804,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 			args = args || {};

 			args.format = args.format || 'html';

 			args.get = true;

+			args.getInner = true;

 

 			// Do preprocessing

 			if (!args.no_events)

@@ -12462,12 +13832,12 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 		},

 

 		getContainer : function() {

-			var t = this;

+			var self = this;

 

-			if (!t.container)

-				t.container = DOM.get(t.editorContainer || t.id + '_parent');

+			if (!self.container)

+				self.container = DOM.get(self.editorContainer || self.id + '_parent');

 

-			return t.container;

+			return self.container;

 		},

 

 		getContentAreaContainer : function() {

@@ -12479,111 +13849,126 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 		},

 

 		getWin : function() {

-			var t = this, e;

+			var self = this, elm;

 

-			if (!t.contentWindow) {

-				e = DOM.get(t.id + "_ifr");

+			if (!self.contentWindow) {

+				elm = DOM.get(self.id + "_ifr");

 

-				if (e)

-					t.contentWindow = e.contentWindow;

+				if (elm)

+					self.contentWindow = elm.contentWindow;

 			}

 

-			return t.contentWindow;

+			return self.contentWindow;

 		},

 

 		getDoc : function() {

-			var t = this, w;

+			var self = this, win;

 

-			if (!t.contentDocument) {

-				w = t.getWin();

+			if (!self.contentDocument) {

+				win = self.getWin();

 

-				if (w)

-					t.contentDocument = w.document;

+				if (win)

+					self.contentDocument = win.document;

 			}

 

-			return t.contentDocument;

+			return self.contentDocument;

 		},

 

 		getBody : function() {

 			return this.bodyElement || this.getDoc().body;

 		},

 

-		convertURL : function(u, n, e) {

-			var t = this, s = t.settings;

+		convertURL : function(url, name, elm) {

+			var self = this, settings = self.settings;

 

 			// Use callback instead

-			if (s.urlconverter_callback)

-				return t.execCallback('urlconverter_callback', u, e, true, n);

+			if (settings.urlconverter_callback)

+				return self.execCallback('urlconverter_callback', url, elm, true, name);

 

 			// Don't convert link href since thats the CSS files that gets loaded into the editor also skip local file URLs

-			if (!s.convert_urls || (e && e.nodeName == 'LINK') || u.indexOf('file:') === 0)

-				return u;

+			if (!settings.convert_urls || (elm && elm.nodeName == 'LINK') || url.indexOf('file:') === 0)

+				return url;

 

 			// Convert to relative

-			if (s.relative_urls)

-				return t.documentBaseURI.toRelative(u);

+			if (settings.relative_urls)

+				return self.documentBaseURI.toRelative(url);

 

 			// Convert to absolute

-			u = t.documentBaseURI.toAbsolute(u, s.remove_script_host);

+			url = self.documentBaseURI.toAbsolute(url, settings.remove_script_host);

 

-			return u;

+			return url;

 		},

 

-		addVisual : function(e) {

-			var t = this, s = t.settings;

+		addVisual : function(elm) {

+			var self = this, settings = self.settings, dom = self.dom, cls;

 

-			e = e || t.getBody();

+			elm = elm || self.getBody();

 

-			if (!is(t.hasVisual))

-				t.hasVisual = s.visual;

+			if (!is(self.hasVisual))

+				self.hasVisual = settings.visual;

 

-			each(t.dom.select('table,a', e), function(e) {

-				var v;

+			each(dom.select('table,a', elm), function(elm) {

+				var value;

 

-				switch (e.nodeName) {

+				switch (elm.nodeName) {

 					case 'TABLE':

-						v = t.dom.getAttrib(e, 'border');

+						cls = settings.visual_table_class || 'mceItemTable';

+						value = dom.getAttrib(elm, 'border');

 

-						if (!v || v == '0') {

-							if (t.hasVisual)

-								t.dom.addClass(e, s.visual_table_class);

+						if (!value || value == '0') {

+							if (self.hasVisual)

+								dom.addClass(elm, cls);

 							else

-								t.dom.removeClass(e, s.visual_table_class);

+								dom.removeClass(elm, cls);

 						}

 

 						return;

 

 					case 'A':

-						v = t.dom.getAttrib(e, 'name');

+						value = dom.getAttrib(elm, 'name');

+						cls = 'mceItemAnchor';

 

-						if (v) {

-							if (t.hasVisual)

-								t.dom.addClass(e, 'mceItemAnchor');

+						if (value) {

+							if (self.hasVisual)

+								dom.addClass(elm, cls);

 							else

-								t.dom.removeClass(e, 'mceItemAnchor');

+								dom.removeClass(elm, cls);

 						}

 

 						return;

 				}

 			});

 

-			t.onVisualAid.dispatch(t, e, t.hasVisual);

+			self.onVisualAid.dispatch(self, elm, self.hasVisual);

 		},

 

 		remove : function() {

-			var t = this, e = t.getContainer();

+			var self = this, elm = self.getContainer();

+

+			if (!self.removed) {

+				self.removed = 1; // Cancels post remove event execution

+				self.hide();

 

-			t.removed = 1; // Cancels post remove event execution

-			t.hide();

+				// Don't clear the window or document if content editable

+				// is enabled since other instances might still be present

+				if (!self.settings.content_editable) {

+					Event.clear(self.getWin());

+					Event.clear(self.getDoc());

+				}

 

-			t.execCallback('remove_instance_callback', t);

-			t.onRemove.dispatch(t);

+				Event.clear(self.getBody());

+				Event.clear(self.formElement);

+				Event.unbind(elm);

 

-			// Clear all execCommand listeners this is required to avoid errors if the editor was removed inside another command

-			t.onExecCommand.listeners = [];

+				self.execCallback('remove_instance_callback', self);

+				self.onRemove.dispatch(self);

 

-			tinymce.remove(t);

-			DOM.remove(e);

+				// Clear all execCommand listeners this is required to avoid errors if the editor was removed inside another command

+				self.onExecCommand.listeners = [];

+

+				tinymce.remove(self);

+				DOM.remove(elm);

+			}

 		},

 

 		destroy : function(s) {

@@ -12593,6 +13978,13 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 			if (t.destroyed)

 				return;

 

+			// We must unbind on Gecko since it would otherwise produce the pesky "attempt to run compile-and-go script on a cleared scope" message

+			if (isGecko) {

+				Event.unbind(t.getDoc());

+				Event.unbind(t.getWin());

+				Event.unbind(t.getBody());

+			}

+

 			if (!s) {

 				tinymce.removeUnload(t.destroy);

 				tinyMCE.onBeforeUnload.remove(t._beforeUnload);

@@ -12605,18 +13997,6 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 				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) {

@@ -12634,437 +14014,311 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 

 		// Internal functions

 

-		_addEvents : function() {

-			// 'focus', 'blur', 'dblclick', 'beforedeactivate', submit, reset

-			var t = this, i, s = t.settings, dom = t.dom, lo = {

-				mouseup : 'onMouseUp',

-				mousedown : 'onMouseDown',

-				click : 'onClick',

-				keyup : 'onKeyUp',

-				keydown : 'onKeyDown',

-				keypress : 'onKeyPress',

-				submit : 'onSubmit',

-				reset : 'onReset',

-				contextmenu : 'onContextMenu',

-				dblclick : 'onDblClick',

-				paste : 'onPaste' // Doesn't work in all browsers yet

-			};

-

-			function eventHandler(e, o) {

-				var ty = e.type;

-

-				// Don't fire events when it's removed

-				if (t.removed)

-					return;

-

-				// Generic event handler

-				if (t.onEvent.dispatch(t, e, o) !== false) {

-					// Specific event handler

-					t[lo[e.fakeType || e.type]].dispatch(t, e, o);

-				}

-			};

-

-			// Add DOM events

-			each(lo, function(v, k) {

-				switch (k) {

-					case 'contextmenu':

-						dom.bind(t.getDoc(), k, eventHandler);

-						break;

+		_refreshContentEditable : function() {

+			var self = this, body, parent;

 

-					case 'paste':

-						dom.bind(t.getBody(), k, function(e) {

-							eventHandler(e);

-						});

-						break;

+			// Check if the editor was hidden and the re-initalize contentEditable mode by removing and adding the body again

+			if (self._isHidden()) {

+				body = self.getBody();

+				parent = body.parentNode;

 

-					case 'submit':

-					case 'reset':

-						dom.bind(t.getElement().form || DOM.getParent(t.id, 'form'), k, eventHandler);

-						break;

+				parent.removeChild(body);

+				parent.appendChild(body);

 

-					default:

-						dom.bind(s.content_editable ? t.getBody() : t.getDoc(), k, eventHandler);

-				}

-			});

+				body.focus();

+			}

+		},

 

-			dom.bind(s.content_editable ? t.getBody() : (isGecko ? t.getDoc() : t.getWin()), 'focus', function(e) {

-				t.focus(true);

-			});

+		_isHidden : function() {

+			var s;

 

+			if (!isGecko)

+				return 0;

 

-			// 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) {

-				dom.bind(t.getDoc(), 'DOMNodeInserted', function(e) {

-					var v;

+			// Weird, wheres that cursor selection?

+			s = this.selection.getSel();

+			return (!s || !s.rangeCount || s.rangeCount === 0);

+		}

+	});

+})(tinymce);

+(function(tinymce) {

+	var each = tinymce.each;

 

-					e = e.target;

+	tinymce.Editor.prototype.setupEvents = function() {

+		var self = this, settings = self.settings;

 

-					if (e.nodeType === 1 && e.nodeName === 'IMG' && (v = e.getAttribute('data-mce-src')))

-						e.src = t.documentBaseURI.toAbsolute(v);

-				});

-			}

+		// Add events to the editor

+		each([

+			'onPreInit',

 

-			// Set various midas options in Gecko

-			if (isGecko) {

-				function setOpts() {

-					var t = this, d = t.getDoc(), s = t.settings;

+			'onBeforeRenderUI',

 

-					if (isGecko && !s.readonly) {

-						t._refreshContentEditable();

+			'onPostRender',

 

-						try {

-							// Try new Gecko method

-							d.execCommand("styleWithCSS", 0, false);

-						} catch (ex) {

-							// Use old method

-							if (!t._isHidden())

-								try {d.execCommand("useCSS", 0, true);} catch (ex) {}

-						}

+			'onLoad',

 

-						if (!s.table_inline_editing)

-							try {d.execCommand('enableInlineTableEditing', false, false);} catch (ex) {}

+			'onInit',

 

-						if (!s.object_resizing)

-							try {d.execCommand('enableObjectResizing', false, false);} catch (ex) {}

-					}

-				};

+			'onRemove',

 

-				t.onBeforeExecCommand.add(setOpts);

-				t.onMouseDown.add(setOpts);

-			}

+			'onActivate',

 

-			// Add node change handlers

-			t.onMouseUp.add(t.nodeChanged);

-			//t.onClick.add(t.nodeChanged);

-			t.onKeyUp.add(function(ed, e) {

-				var c = e.keyCode;

+			'onDeactivate',

 

-				if ((c >= 33 && c <= 36) || (c >= 37 && c <= 40) || c == 13 || c == 45 || c == 46 || c == 8 || (tinymce.isMac && (c == 91 || c == 93)) || e.ctrlKey)

-					t.nodeChanged();

-			});

+			'onClick',

 

+			'onEvent',

 

-			// Add block quote deletion handler

-			t.onKeyDown.add(function(ed, e) {

-				// Was the BACKSPACE key pressed?

-				if (e.keyCode != 8)

-					return;

+			'onMouseUp',

 

-				var n = ed.selection.getRng().startContainer;

-				var offset = ed.selection.getRng().startOffset;

+			'onMouseDown',

 

-				while (n && n.nodeType && n.nodeType != 1 && n.parentNode)

-					n = n.parentNode;

-					

-				// Is the cursor at the beginning of a blockquote?

-				if (n && n.parentNode && n.parentNode.tagName === 'BLOCKQUOTE' && n.parentNode.firstChild == n && offset == 0) {

-					// Remove the blockquote

-					ed.formatter.toggle('blockquote', null, n.parentNode);

-

-					// Move the caret to the beginning of n

-					var rng = ed.selection.getRng();

-					rng.setStart(n, 0);

-					rng.setEnd(n, 0);

-					ed.selection.setRng(rng);

-					ed.selection.collapse(false);

-				}

-			});

- 

+			'onDblClick',

 

+			'onKeyDown',

 

-			// Add reset handler

-			t.onReset.add(function() {

-				t.setContent(t.startContent, {format : 'raw'});

-			});

+			'onKeyUp',

 

-			// Add shortcuts

-			if (s.custom_shortcuts) {

-				if (s.custom_undo_redo_keyboard_shortcuts) {

-					t.addShortcut('ctrl+z', t.getLang('undo_desc'), 'Undo');

-					t.addShortcut('ctrl+y', t.getLang('redo_desc'), 'Redo');

-				}

+			'onKeyPress',

 

-				// Add default shortcuts for gecko

-				t.addShortcut('ctrl+b', t.getLang('bold_desc'), 'Bold');

-				t.addShortcut('ctrl+i', t.getLang('italic_desc'), 'Italic');

-				t.addShortcut('ctrl+u', t.getLang('underline_desc'), 'Underline');

+			'onContextMenu',

 

-				// BlockFormat shortcuts keys

-				for (i=1; i<=6; i++)

-					t.addShortcut('ctrl+' + i, '', ['FormatBlock', false, 'h' + i]);

+			'onSubmit',

 

-				t.addShortcut('ctrl+7', '', ['FormatBlock', false, 'p']);

-				t.addShortcut('ctrl+8', '', ['FormatBlock', false, 'div']);

-				t.addShortcut('ctrl+9', '', ['FormatBlock', false, 'address']);

+			'onReset',

 

-				function find(e) {

-					var v = null;

+			'onPaste',

 

-					if (!e.altKey && !e.ctrlKey && !e.metaKey)

-						return v;

+			'onPreProcess',

 

-					each(t.shortcuts, function(o) {

-						if (tinymce.isMac && o.ctrl != e.metaKey)

-							return;

-						else if (!tinymce.isMac && o.ctrl != e.ctrlKey)

-							return;

+			'onPostProcess',

 

-						if (o.alt != e.altKey)

-							return;

+			'onBeforeSetContent',

 

-						if (o.shift != e.shiftKey)

-							return;

+			'onBeforeGetContent',

 

-						if (e.keyCode == o.keyCode || (e.charCode && e.charCode == o.charCode)) {

-							v = o;

-							return false;

-						}

-					});

+			'onSetContent',

 

-					return v;

-				};

+			'onGetContent',

 

-				t.onKeyUp.add(function(ed, e) {

-					var o = find(e);

+			'onLoadContent',

 

-					if (o)

-						return Event.cancel(e);

-				});

+			'onSaveContent',

 

-				t.onKeyPress.add(function(ed, e) {

-					var o = find(e);

+			'onNodeChange',

 

-					if (o)

-						return Event.cancel(e);

-				});

+			'onChange',

 

-				t.onKeyDown.add(function(ed, e) {

-					var o = find(e);

+			'onBeforeExecCommand',

 

-					if (o) {

-						o.func.call(o.scope);

-						return Event.cancel(e);

-					}

-				});

-			}

+			'onExecCommand',

 

-			if (tinymce.isIE) {

-				// Fix so resize will only update the width and height attributes not the styles of an image

-				// It will also block mceItemNoResize items

-				dom.bind(t.getDoc(), 'controlselect', function(e) {

-					var re = t.resizeInfo, cb;

+			'onUndo',

 

-					e = e.target;

+			'onRedo',

 

-					// Don't do this action for non image elements

-					if (e.nodeName !== 'IMG')

-						return;

+			'onVisualAid',

 

-					if (re)

-						dom.unbind(re.node, re.ev, re.cb);

+			'onSetProgressState',

 

-					if (!dom.hasClass(e, 'mceItemNoResize')) {

-						ev = 'resizeend';

-						cb = dom.bind(e, ev, function(e) {

-							var v;

+			'onSetAttrib'

+		], function(name) {

+			self[name] = new tinymce.util.Dispatcher(self);

+		});

 

-							e = e.target;

+		// Handle legacy cleanup_callback option

+		if (settings.cleanup_callback) {

+			self.onBeforeSetContent.add(function(ed, o) {

+				o.content = ed.execCallback('cleanup_callback', 'insert_to_editor', o.content, o);

+			});

 

-							if (v = dom.getStyle(e, 'width')) {

-								dom.setAttrib(e, 'width', v.replace(/[^0-9%]+/g, ''));

-								dom.setStyle(e, 'width', '');

-							}

+			self.onPreProcess.add(function(ed, o) {

+				if (o.set)

+					ed.execCallback('cleanup_callback', 'insert_to_editor_dom', o.node, o);

 

-							if (v = dom.getStyle(e, 'height')) {

-								dom.setAttrib(e, 'height', v.replace(/[^0-9%]+/g, ''));

-								dom.setStyle(e, 'height', '');

-							}

-						});

-					} else {

-						ev = 'resizestart';

-						cb = dom.bind(e, 'resizestart', Event.cancel, Event);

-					}

+				if (o.get)

+					ed.execCallback('cleanup_callback', 'get_from_editor_dom', o.node, o);

+			});

 

-					re = t.resizeInfo = {

-						node : e,

-						ev : ev,

-						cb : cb

-					};

-				});

-			}

+			self.onPostProcess.add(function(ed, o) {

+				if (o.set)

+					o.content = ed.execCallback('cleanup_callback', 'insert_to_editor', o.content, o);

 

-			if (tinymce.isOpera) {

-				t.onClick.add(function(ed, e) {

-					Event.prevent(e);

-				});

-			}

+				if (o.get)						

+					o.content = ed.execCallback('cleanup_callback', 'get_from_editor', o.content, o);

+			});

+		}

 

-			// Add custom undo/redo handlers

-			if (s.custom_undo_redo) {

-				function addUndo() {

-					t.undoManager.typing = false;

-					t.undoManager.add();

-				};

+		// Handle legacy save_callback option

+		if (settings.save_callback) {

+			self.onGetContent.add(function(ed, o) {

+				if (o.save)

+					o.content = ed.execCallback('save_callback', ed.id, o.content, ed.getBody());

+			});

+		}

 

-				dom.bind(t.getDoc(), 'focusout', function(e) {

-					if (!t.removed && t.undoManager.typing)

-						addUndo();

-				});

+		// Handle legacy handle_event_callback option

+		if (settings.handle_event_callback) {

+			self.onEvent.add(function(ed, e, o) {

+				if (self.execCallback('handle_event_callback', e, ed, o) === false)

+					Event.cancel(e);

+			});

+		}

 

-				// Add undo level when contents is drag/dropped within the editor

-				t.dom.bind(t.dom.getRoot(), 'dragend', function(e) {

-					addUndo();

-				});

+		// Handle legacy handle_node_change_callback option

+		if (settings.handle_node_change_callback) {

+			self.onNodeChange.add(function(ed, cm, n) {

+				ed.execCallback('handle_node_change_callback', ed.id, n, -1, -1, true, ed.selection.isCollapsed());

+			});

+		}

 

-				t.onKeyUp.add(function(ed, e) {

-					var keyCode = e.keyCode;

+		// Handle legacy save_callback option

+		if (settings.save_callback) {

+			self.onSaveContent.add(function(ed, o) {

+				var h = ed.execCallback('save_callback', ed.id, o.content, ed.getBody());

 

-					if ((keyCode >= 33 && keyCode <= 36) || (keyCode >= 37 && keyCode <= 40) || keyCode == 13 || keyCode == 45 || e.ctrlKey)

-						addUndo();

-				});

+				if (h)

+					o.content = h;

+			});

+		}

 

-				t.onKeyDown.add(function(ed, e) {

-					var keyCode = e.keyCode, sel;

+		// Handle legacy onchange_callback option

+		if (settings.onchange_callback) {

+			self.onChange.add(function(ed, l) {

+				ed.execCallback('onchange_callback', ed, l);

+			});

+		}

+	};

 

-					if (keyCode == 8) {

-						sel = t.getDoc().selection;

+	tinymce.Editor.prototype.bindNativeEvents = function() {

+		// 'focus', 'blur', 'dblclick', 'beforedeactivate', submit, reset

+		var self = this, i, settings = self.settings, dom = self.dom, nativeToDispatcherMap;

+

+		nativeToDispatcherMap = {

+			mouseup : 'onMouseUp',

+			mousedown : 'onMouseDown',

+			click : 'onClick',

+			keyup : 'onKeyUp',

+			keydown : 'onKeyDown',

+			keypress : 'onKeyPress',

+			submit : 'onSubmit',

+			reset : 'onReset',

+			contextmenu : 'onContextMenu',

+			dblclick : 'onDblClick',

+			paste : 'onPaste' // Doesn't work in all browsers yet

+		};

 

-						// Fix IE control + backspace browser bug

-						if (sel && sel.createRange && sel.createRange().item) {

-							t.undoManager.beforeChange();

-							ed.dom.remove(sel.createRange().item(0));

-							addUndo();

+		// Handler that takes a native event and sends it out to a dispatcher like onKeyDown

+		function eventHandler(evt, args) {

+			var type = evt.type;

 

-							return Event.cancel(e);

-						}

-					}

+			// Don't fire events when it's removed

+			if (self.removed)

+				return;

 

-					// Is caracter positon keys left,right,up,down,home,end,pgdown,pgup,enter

-					if ((keyCode >= 33 && keyCode <= 36) || (keyCode >= 37 && keyCode <= 40) || keyCode == 13 || keyCode == 45) {

-						// Add position before enter key is pressed, used by IE since it still uses the default browser behavior

-						// Todo: Remove this once we normalize enter behavior on IE

-						if (tinymce.isIE && keyCode == 13)

-							t.undoManager.beforeChange();

+			// Sends the native event out to a global dispatcher then to the specific event dispatcher

+			if (self.onEvent.dispatch(self, evt, args) !== false) {

+				self[nativeToDispatcherMap[evt.fakeType || evt.type]].dispatch(self, evt, args);

+			}

+		};

 

-						if (t.undoManager.typing)

-							addUndo();

+		// Opera doesn't support focus event for contentEditable elements so we need to fake it

+		function doOperaFocus(e) {

+			self.focus(true);

+		};

 

-						return;

-					}

+		// Add DOM events

+		each(nativeToDispatcherMap, function(dispatcherName, nativeName) {

+			var root = settings.content_editable ? self.getBody() : self.getDoc();

 

-					// If key isn't shift,ctrl,alt,capslock,metakey

-					if ((keyCode < 16 || keyCode > 20) && keyCode != 224 && keyCode != 91 && !t.undoManager.typing) {

-						t.undoManager.beforeChange();

-						t.undoManager.typing = true;

-						t.undoManager.add();

-					}

-				});

+			switch (nativeName) {

+				case 'contextmenu':

+					dom.bind(root, nativeName, eventHandler);

+					break;

 

-				t.onMouseDown.add(function() {

-					if (t.undoManager.typing)

-						addUndo();

-				});

-			}

+				case 'paste':

+					dom.bind(self.getBody(), nativeName, eventHandler);

+					break;

 

-			// Fire a nodeChanged when the selection is changed on WebKit this fixes selection issues on iOS5

-			// It only fires the nodeChange event every 50ms since it would other wise update the UI when you type and it hogs the CPU

-			if (tinymce.isWebKit) {

-				dom.bind(t.getDoc(), 'selectionchange', function() {

-					if (t.selectionTimer) {

-						clearTimeout(t.selectionTimer);

-						t.selectionTimer = 0;

-					}

+				case 'submit':

+				case 'reset':

+					dom.bind(self.getElement().form || tinymce.DOM.getParent(self.id, 'form'), nativeName, eventHandler);

+					break;

 

-					t.selectionTimer = window.setTimeout(function() {

-						t.nodeChanged();

-					}, 50);

-				});

+				default:

+					dom.bind(root, nativeName, eventHandler);

 			}

+		});

 

-			// Bug fix for FireFox keeping styles from end of selection instead of start.

-			if (tinymce.isGecko) {

-				function getAttributeApplyFunction() {

-					var template = t.dom.getAttribs(t.selection.getStart().cloneNode(false));

-

-					return function() {

-						var target = t.selection.getStart();

+		// Set the editor as active when focused

+		dom.bind(settings.content_editable ? self.getBody() : (tinymce.isGecko ? self.getDoc() : self.getWin()), 'focus', function(e) {

+			self.focus(true);

+		});

 

-						if (target !== t.getBody()) {

-							t.dom.removeAllAttribs(target);

+		if (settings.content_editable && tinymce.isOpera) {

+			dom.bind(self.getBody(), 'click', doOperaFocus);

+			dom.bind(self.getBody(), 'keydown', doOperaFocus);

+		}

 

-							each(template, function(attr) {

-								target.setAttributeNode(attr.cloneNode(true));

-							});

-						}

-					};

-				}

+		// Add node change handler

+		self.onMouseUp.add(self.nodeChanged);

 

-				function isSelectionAcrossElements() {

-					var s = t.selection;

+		self.onKeyUp.add(function(ed, e) {

+			var keyCode = e.keyCode;

 

-					return !s.isCollapsed() && s.getStart() != s.getEnd();

-				}

+			if ((keyCode >= 33 && keyCode <= 36) || (keyCode >= 37 && keyCode <= 40) || keyCode == 13 || keyCode == 45 || keyCode == 46 || keyCode == 8 || (tinymce.isMac && (keyCode == 91 || keyCode == 93)) || e.ctrlKey)

+				self.nodeChanged();

+		});

 

-				t.onKeyPress.add(function(ed, e) {

-					var applyAttributes;

+		// Add reset handler

+		self.onReset.add(function() {

+			self.setContent(self.startContent, {format : 'raw'});

+		});

 

-					if ((e.keyCode == 8 || e.keyCode == 46) && isSelectionAcrossElements()) {

-						applyAttributes = getAttributeApplyFunction();

-						t.getDoc().execCommand('delete', false, null);

-						applyAttributes();

+		// Add shortcuts

+		function handleShortcut(e, execute) {

+			if (e.altKey || e.ctrlKey || e.metaKey) {

+				each(self.shortcuts, function(shortcut) {

+					var ctrlState = tinymce.isMac ? e.metaKey : e.ctrlKey;

 

-						return Event.cancel(e);

-					}

-				});

+					if (shortcut.ctrl != ctrlState || shortcut.alt != e.altKey || shortcut.shift != e.shiftKey)

+						return;

 

-				t.dom.bind(t.getDoc(), 'cut', function(e) {

-					var applyAttributes;

+					if (e.keyCode == shortcut.keyCode || (e.charCode && e.charCode == shortcut.charCode)) {

+						e.preventDefault();

 

-					if (isSelectionAcrossElements()) {

-						applyAttributes = getAttributeApplyFunction();

-						t.onKeyUp.addToTop(Event.cancel, Event);

+						if (execute) {

+							shortcut.func.call(shortcut.scope);

+						}

 

-						setTimeout(function() {

-							applyAttributes();

-							t.onKeyUp.remove(Event.cancel, Event);

-						}, 0);

+						return true;

 					}

 				});

 			}

-		},

-

-		_refreshContentEditable : function() {

-			var self = this, body, parent;

-

-			// Check if the editor was hidden and the re-initalize contentEditable mode by removing and adding the body again

-			if (self._isHidden()) {

-				body = self.getBody();

-				parent = body.parentNode;

-

-				parent.removeChild(body);

-				parent.appendChild(body);

+		};

 

-				body.focus();

-			}

-		},

+		self.onKeyUp.add(function(ed, e) {

+			handleShortcut(e);

+		});

 

-		_isHidden : function() {

-			var s;

+		self.onKeyPress.add(function(ed, e) {

+			handleShortcut(e);

+		});

 

-			if (!isGecko)

-				return 0;

+		self.onKeyDown.add(function(ed, e) {

+			handleShortcut(e, true);

+		});

 

-			// Weird, wheres that cursor selection?

-			s = this.selection.getSel();

-			return (!s || !s.rangeCount || s.rangeCount == 0);

+		if (tinymce.isOpera) {

+			self.onClick.add(function(ed, e) {

+				e.preventDefault();

+			});

 		}

-	});

+	};

 })(tinymce);

-

 (function(tinymce) {

 	// Added for compression purposes

-	var each = tinymce.each, undefined, TRUE = true, FALSE = false;

+	var each = tinymce.each, undef, TRUE = true, FALSE = false;

 

 	tinymce.EditorCommands = function(editor) {

 		var dom = editor.dom,

@@ -13127,10 +14381,10 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 		// Private methods

 

 		function execNativeCommand(command, ui, value) {

-			if (ui === undefined)

+			if (ui === undef)

 				ui = FALSE;

 

-			if (value === undefined)

+			if (value === undef)

 				value = null;

 

 			return editor.getDoc().execCommand(command, ui, value);

@@ -13141,7 +14395,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 		};

 

 		function toggleFormat(name, value) {

-			formatter.toggle(name, value ? {value : value} : undefined);

+			formatter.toggle(name, value ? {value : value} : undef);

 		};

 

 		function storeSelection(type) {

@@ -13307,6 +14561,8 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 				var parser, serializer, parentNode, rootNode, fragment, args,

 					marker, nodeRect, viewPortRect, rng, node, node2, bookmarkHtml, viewportBodyElement;

 

+				//selection.normalize();

+

 				// Setup parser and serializer

 				parser = editor.parser;

 				serializer = new tinymce.html.Serializer({}, editor.schema);

@@ -13451,6 +14707,11 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 				intentValue = parseInt(intentValue);

 

 				if (!queryCommandState('InsertUnorderedList') && !queryCommandState('InsertOrderedList')) {

+					// If forced_root_blocks is set to false we don't have a block to indent so lets create a div

+					if (!settings.forced_root_block && !dom.getParent(selection.getNode(), dom.isBlock)) {

+						formatter.apply('div');

+					}

+

 					each(selection.getSelectedBlocks(), function(element) {

 						if (command == 'outdent') {

 							value = Math.max(0, parseInt(element.style.paddingLeft || 0) - intentValue);

@@ -13533,7 +14794,12 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 		addCommands({

 			// Override justify commands

 			'JustifyLeft,JustifyCenter,JustifyRight,JustifyFull' : function(command) {

-				return isFormatMatch('align' + command.substring(7));

+				var name = 'align' + command.substring(7);

+				var nodes = selection.isCollapsed() ? [dom.getParent(selection.getNode(), dom.isBlock)] : selection.getSelectedBlocks();

+				var matches = tinymce.map(nodes, function(node) {

+					return !!formatter.matchNode(node, name);

+				});

+				return tinymce.inArray(matches, TRUE) !== -1;

 			},

 

 			'Bold,Italic,Underline,Strikethrough,Superscript,Subscript' : function(command) {

@@ -13580,17 +14846,15 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 		}, 'value');

 

 		// Add undo manager logic

-		if (settings.custom_undo_redo) {

-			addCommands({

-				Undo : function() {

-					editor.undoManager.undo();

-				},

+		addCommands({

+			Undo : function() {

+				editor.undoManager.undo();

+			},

 

-				Redo : function() {

-					editor.undoManager.redo();

-				}

-			});

-		}

+			Redo : function() {

+				editor.undoManager.redo();

+			}

+		});

 	};

 })(tinymce);

 

@@ -13598,20 +14862,116 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 	var Dispatcher = tinymce.util.Dispatcher;

 

 	tinymce.UndoManager = function(editor) {

-		var self, index = 0, data = [], beforeBookmark;

+		var self, index = 0, data = [], beforeBookmark, onAdd, onUndo, onRedo;

 

 		function getContent() {

-			return tinymce.trim(editor.getContent({format : 'raw', no_events : 1}));

+			// Remove whitespace before/after and remove pure bogus nodes

+			return tinymce.trim(editor.getContent({format : 'raw', no_events : 1}).replace(/<span[^>]+data-mce-bogus[^>]+>[\u200B\uFEFF]+<\/span>/g, ''));

 		};

 

-		return self = {

+		function addNonTypingUndoLevel() {

+			self.typing = false;

+			self.add();

+		};

+

+		// Create event instances

+		onAdd = new Dispatcher(self);

+		onUndo = new Dispatcher(self);

+		onRedo = new Dispatcher(self);

+

+		// Pass though onAdd event from UndoManager to Editor as onChange

+		onAdd.add(function(undoman, level) {

+			if (undoman.hasUndo())

+				return editor.onChange.dispatch(editor, level, undoman);

+		});

+

+		// Pass though onUndo event from UndoManager to Editor

+		onUndo.add(function(undoman, level) {

+			return editor.onUndo.dispatch(editor, level, undoman);

+		});

+

+		// Pass though onRedo event from UndoManager to Editor

+		onRedo.add(function(undoman, level) {

+			return editor.onRedo.dispatch(editor, level, undoman);

+		});

+

+		// Add initial undo level when the editor is initialized

+		editor.onInit.add(function() {

+			self.add();

+		});

+

+		// Get position before an execCommand is processed

+		editor.onBeforeExecCommand.add(function(ed, cmd, ui, val, args) {

+			if (cmd != 'Undo' && cmd != 'Redo' && cmd != 'mceRepaint' && (!args || !args.skip_undo)) {

+				self.beforeChange();

+			}

+		});

+

+		// Add undo level after an execCommand call was made

+		editor.onExecCommand.add(function(ed, cmd, ui, val, args) {

+			if (cmd != 'Undo' && cmd != 'Redo' && cmd != 'mceRepaint' && (!args || !args.skip_undo)) {

+				self.add();

+			}

+		});

+

+		// Add undo level on save contents, drag end and blur/focusout

+		editor.onSaveContent.add(addNonTypingUndoLevel);

+		editor.dom.bind(editor.dom.getRoot(), 'dragend', addNonTypingUndoLevel);

+		editor.dom.bind(editor.getDoc(), tinymce.isGecko ? 'blur' : 'focusout', function(e) {

+			if (!editor.removed && self.typing) {

+				addNonTypingUndoLevel();

+			}

+		});

+

+		editor.onKeyUp.add(function(editor, e) {

+			var keyCode = e.keyCode;

+

+			if ((keyCode >= 33 && keyCode <= 36) || (keyCode >= 37 && keyCode <= 40) || keyCode == 45 || keyCode == 13 || e.ctrlKey) {

+				addNonTypingUndoLevel();

+			}

+		});

+

+		editor.onKeyDown.add(function(editor, e) {

+			var keyCode = e.keyCode;

+

+			// Is caracter positon keys left,right,up,down,home,end,pgdown,pgup,enter

+			if ((keyCode >= 33 && keyCode <= 36) || (keyCode >= 37 && keyCode <= 40) || keyCode == 45) {

+				if (self.typing) {

+					addNonTypingUndoLevel();

+				}

+

+				return;

+			}

+

+			// If key isn't shift,ctrl,alt,capslock,metakey

+			if ((keyCode < 16 || keyCode > 20) && keyCode != 224 && keyCode != 91 && !self.typing) {

+				self.beforeChange();

+				self.typing = true;

+				self.add();

+			}

+		});

+

+		editor.onMouseDown.add(function(editor, e) {

+			if (self.typing) {

+				addNonTypingUndoLevel();

+			}

+		});

+

+		// Add keyboard shortcuts for undo/redo keys

+		editor.addShortcut('ctrl+z', 'undo_desc', 'Undo');

+		editor.addShortcut('ctrl+y', 'redo_desc', 'Redo');

+

+		self = {

+			// Explose for debugging reasons

+			data : data,

+

 			typing : false,

 

-			onAdd : new Dispatcher(self),

+			onAdd : onAdd,

 

-			onUndo : new Dispatcher(self),

+			onUndo : onUndo,

 

-			onRedo : new Dispatcher(self),

+			onRedo : onRedo,

 

 			beforeChange : function() {

 				beforeBookmark = editor.selection.getBookmark(2, true);

@@ -13708,631 +15068,105 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 				return index < data.length - 1 && !this.typing;

 			}

 		};

-	};

-})(tinymce);

-

-(function(tinymce) {

-	// Shorten names

-	var Event = tinymce.dom.Event,

-		isIE = tinymce.isIE,

-		isGecko = tinymce.isGecko,

-		isOpera = tinymce.isOpera,

-		each = tinymce.each,

-		extend = tinymce.extend,

-		TRUE = true,

-		FALSE = false;

-

-	function cloneFormats(node) {

-		var clone, temp, inner;

-

-		do {

-			if (/^(SPAN|STRONG|B|EM|I|FONT|STRIKE|U)$/.test(node.nodeName)) {

-				if (clone) {

-					temp = node.cloneNode(false);

-					temp.appendChild(clone);

-					clone = temp;

-				} else {

-					clone = inner = node.cloneNode(false);

-				}

-

-				clone.removeAttribute('id');

-			}

-		} while (node = node.parentNode);

 

-		if (clone)

-			return {wrapper : clone, inner : inner};

+		return self;

 	};

+})(tinymce);

 

-	// Checks if the selection/caret is at the end of the specified block element

-	function isAtEnd(rng, par) {

-		var rng2 = par.ownerDocument.createRange();

-

-		rng2.setStart(rng.endContainer, rng.endOffset);

-		rng2.setEndAfter(par);

+tinymce.ForceBlocks = function(editor) {

+	var settings = editor.settings, dom = editor.dom, selection = editor.selection, blockElements = editor.schema.getBlockElements();

 

-		// Get number of characters to the right of the cursor if it's zero then we are at the end and need to merge the next block element

-		return rng2.cloneContents().textContent.length == 0;

-	};

+	function addRootBlocks() {

+		var node = selection.getStart(), rootNode = editor.getBody(), rng, startContainer, startOffset, endContainer, endOffset, rootBlockNode, tempNode, offset = -0xFFFFFF, wrapped;

 

-	function splitList(selection, dom, li) {

-		var listBlock, block;

-

-		if (dom.isEmpty(li)) {

-			listBlock = dom.getParent(li, 'ul,ol');

+		if (!node || node.nodeType !== 1 || !settings.forced_root_block)

+			return;

 

-			if (!dom.getParent(listBlock.parentNode, 'ul,ol')) {

-				dom.split(listBlock, li);

-				block = dom.create('p', 0, '<br data-mce-bogus="1" />');

-				dom.replace(block, li);

-				selection.select(block, 1);

-			}

+		// Check if node is wrapped in block

+		while (node != rootNode) {

+			if (blockElements[node.nodeName])

+				return;

 

-			return FALSE;

+			node = node.parentNode;

 		}

 

-		return TRUE;

-	};

-

-	tinymce.create('tinymce.ForceBlocks', {

-		ForceBlocks : function(ed) {

-			var t = this, s = ed.settings, elm;

-

-			t.editor = ed;

-			t.dom = ed.dom;

-			elm = (s.forced_root_block || 'p').toLowerCase();

-			s.element = elm.toUpperCase();

-

-			ed.onPreInit.add(t.setup, t);

-		},

-

-		setup : function() {

-			var t = this, ed = t.editor, s = ed.settings, dom = ed.dom, selection = ed.selection, blockElements = ed.schema.getBlockElements();

-

-			// Force root blocks

-			if (s.forced_root_block) {

-				function addRootBlocks() {

-					var node = selection.getStart(), rootNode = ed.getBody(), rng, startContainer, startOffset, endContainer, endOffset, rootBlockNode, tempNode, offset = -0xFFFFFF;

-

-					if (!node || node.nodeType !== 1)

-						return;

-

-					// Check if node is wrapped in block

-					while (node != rootNode) {

-						if (blockElements[node.nodeName])

-							return;

-

-						node = node.parentNode;

-					}

-

-					// Get current selection

-					rng = selection.getRng();

-					if (rng.setStart) {

-						startContainer = rng.startContainer;

-						startOffset = rng.startOffset;

-						endContainer = rng.endContainer;

-						endOffset = rng.endOffset;

-					} else {

-						// Force control range into text range

-						if (rng.item) {

-							rng = ed.getDoc().body.createTextRange();

-							rng.moveToElementText(rng.item(0));

-						}

-

-						tmpRng = rng.duplicate();

-						tmpRng.collapse(true);

-						startOffset = tmpRng.move('character', offset) * -1;

-

-						if (!tmpRng.collapsed) {

-							tmpRng = rng.duplicate();

-							tmpRng.collapse(false);

-							endOffset = (tmpRng.move('character', offset) * -1) - startOffset;

-						}

-					}

-

-					// Wrap non block elements and text nodes

-					for (node = rootNode.firstChild; node; node) {

-						if (node.nodeType === 3 || (node.nodeType == 1 && !blockElements[node.nodeName])) {

-							if (!rootBlockNode) {

-								rootBlockNode = dom.create(s.forced_root_block);

-								node.parentNode.insertBefore(rootBlockNode, node);

-							}

-

-							tempNode = node;

-							node = node.nextSibling;

-							rootBlockNode.appendChild(tempNode);

-						} else {

-							rootBlockNode = null;

-							node = node.nextSibling;

-						}

-					}

-

-					if (rng.setStart) {

-						rng.setStart(startContainer, startOffset);

-						rng.setEnd(endContainer, endOffset);

-						selection.setRng(rng);

-					} else {

-						try {

-							rng = ed.getDoc().body.createTextRange();

-							rng.moveToElementText(rootNode);

-							rng.collapse(true);

-							rng.moveStart('character', startOffset);

-

-							if (endOffset > 0)

-								rng.moveEnd('character', endOffset);

-

-							rng.select();

-						} catch (ex) {

-							// Ignore

-						}

-					}

-

-					ed.nodeChanged();

-				};

-

-				ed.onKeyUp.add(addRootBlocks);

-				ed.onClick.add(addRootBlocks);

-			}

-

-			if (s.force_br_newlines) {

-				// Force IE to produce BRs on enter

-				if (isIE) {

-					ed.onKeyPress.add(function(ed, e) {

-						var n;

-

-						if (e.keyCode == 13 && selection.getNode().nodeName != 'LI') {

-							selection.setContent('<br id="__" /> ', {format : 'raw'});

-							n = dom.get('__');

-							n.removeAttribute('id');

-							selection.select(n);

-							selection.collapse();

-							return Event.cancel(e);

-						}

-					});

-				}

-			}

-

-			if (s.force_p_newlines) {

-				if (!isIE) {

-					ed.onKeyPress.add(function(ed, e) {

-						if (e.keyCode == 13 && !e.shiftKey && !t.insertPara(e))

-							Event.cancel(e);

-					});

-				} else {

-					// Ungly hack to for IE to preserve the formatting when you press

-					// enter at the end of a block element with formatted contents

-					// This logic overrides the browsers default logic with

-					// custom logic that enables us to control the output

-					tinymce.addUnload(function() {

-						t._previousFormats = 0; // Fix IE leak

-					});

-

-					ed.onKeyPress.add(function(ed, e) {

-						t._previousFormats = 0;

-

-						// Clone the current formats, this will later be applied to the new block contents

-						if (e.keyCode == 13 && !e.shiftKey && ed.selection.isCollapsed() && s.keep_styles)

-							t._previousFormats = cloneFormats(ed.selection.getStart());

-					});

-

-					ed.onKeyUp.add(function(ed, e) {

-						// Let IE break the element and the wrap the new caret location in the previous formats

-						if (e.keyCode == 13 && !e.shiftKey) {

-							var parent = ed.selection.getStart(), fmt = t._previousFormats;

-

-							// Parent is an empty block

-							if (!parent.hasChildNodes() && fmt) {

-								parent = dom.getParent(parent, dom.isBlock);

-

-								if (parent && parent.nodeName != 'LI') {

-									parent.innerHTML = '';

-

-									if (t._previousFormats) {

-										parent.appendChild(fmt.wrapper);

-										fmt.inner.innerHTML = '\uFEFF';

-									} else

-										parent.innerHTML = '\uFEFF';

-

-									selection.select(parent, 1);

-									selection.collapse(true);

-									ed.getDoc().execCommand('Delete', false, null);

-									t._previousFormats = 0;

-								}

-							}

-						}

-					});

-				}

-

-				if (isGecko) {

-					ed.onKeyDown.add(function(ed, e) {

-						if ((e.keyCode == 8 || e.keyCode == 46) && !e.shiftKey)

-							t.backspaceDelete(e, e.keyCode == 8);

-					});

-				}

-			}

-

-			// Workaround for missing shift+enter support, http://bugs.webkit.org/show_bug.cgi?id=16973

-			if (tinymce.isWebKit) {

-				function insertBr(ed) {

-					var rng = selection.getRng(), br, div = dom.create('div', null, ' '), divYPos, vpHeight = dom.getViewPort(ed.getWin()).h;

-

-					// Insert BR element

-					rng.insertNode(br = dom.create('br'));

-

-					// Place caret after BR

-					rng.setStartAfter(br);

-					rng.setEndAfter(br);

-					selection.setRng(rng);

-

-					// Could not place caret after BR then insert an nbsp entity and move the caret

-					if (selection.getSel().focusNode == br.previousSibling) {

-						selection.select(dom.insertAfter(dom.doc.createTextNode('\u00a0'), br));

-						selection.collapse(TRUE);

-					}

-

-					// Create a temporary DIV after the BR and get the position as it

-					// seems like getPos() returns 0 for text nodes and BR elements.

-					dom.insertAfter(div, br);

-					divYPos = dom.getPos(div).y;

-					dom.remove(div);

-

-					// Scroll to new position, scrollIntoView can't be used due to bug: http://bugs.webkit.org/show_bug.cgi?id=16117

-					if (divYPos > vpHeight) // It is not necessary to scroll if the DIV is inside the view port.

-						ed.getWin().scrollTo(0, divYPos);

-				};

-

-				ed.onKeyPress.add(function(ed, e) {

-					if (e.keyCode == 13 && (e.shiftKey || (s.force_br_newlines && !dom.getParent(selection.getNode(), 'h1,h2,h3,h4,h5,h6,ol,ul')))) {

-						insertBr(ed);

-						Event.cancel(e);

-					}

-				});

-			}

-

-			// IE specific fixes

-			if (isIE) {

-				// Replaces IE:s auto generated paragraphs with the specified element name

-				if (s.element != 'P') {

-					ed.onKeyPress.add(function(ed, e) {

-						t.lastElm = selection.getNode().nodeName;

-					});

-

-					ed.onKeyUp.add(function(ed, e) {

-						var bl, n = selection.getNode(), b = ed.getBody();

-

-						if (b.childNodes.length === 1 && n.nodeName == 'P') {

-							n = dom.rename(n, s.element);

-							selection.select(n);

-							selection.collapse();

-							ed.nodeChanged();

-						} else if (e.keyCode == 13 && !e.shiftKey && t.lastElm != 'P') {

-							bl = dom.getParent(n, 'p');

-

-							if (bl) {

-								dom.rename(bl, s.element);

-								ed.nodeChanged();

-							}

-						}

-					});

-				}

-			}

-		},

-

-		getParentBlock : function(n) {

-			var d = this.dom;

-

-			return d.getParent(n, d.isBlock);

-		},

-

-		insertPara : function(e) {

-			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, vp = dom.getViewPort(ed.getWin()), y, ch, car;

-

-			ed.undoManager.beforeChange();

-

-			// If root blocks are forced then use Operas default behavior since it's really good

-// Removed due to bug: #1853816

-//			if (se.forced_root_block && isOpera)

-//				return TRUE;

-

-			// Setup before range

-			rb = d.createRange();

-

-			// If is before the first block element and in body, then move it into first block element

-			rb.setStart(s.anchorNode, s.anchorOffset);

-			rb.collapse(TRUE);

-

-			// Setup after range

-			ra = d.createRange();

-

-			// If is before the first block element and in body, then move it into first block element

-			ra.setStart(s.focusNode, s.focusOffset);

-			ra.collapse(TRUE);

-

-			// Setup start/end points

-			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)) {

-				if (sn.firstChild.nodeName == 'BR')

-					dom.remove(sn.firstChild); // Remove BR

-

-				// Create two new block elements

-				if (sn.childNodes.length == 0) {

-					ed.dom.add(sn, se.element, null, '<br />');

-					aft = ed.dom.add(sn, se.element, null, '<br />');

-				} else {

-					n = sn.innerHTML;

-					sn.innerHTML = '';

-					ed.dom.add(sn, se.element, null, n);

-					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;

-				rb = d.createRange();

-				rb.setStart(sn, 0);

-				ra = d.createRange();

-				ra.setStart(en, 0);

-			}

-

-			// If the body is totally empty add a BR element this might happen on webkit

-			if (!d.body.hasChildNodes()) {

-				d.body.appendChild(dom.create('br'));

-			}

-

-			// Never use body as start or end node

-			sn = sn.nodeName == "HTML" ? d.body : sn; // Fix for Opera bug: https://bugs.opera.com/show_bug.cgi?id=273224&comments=yes

-			sn = sn.nodeName == "BODY" ? sn.firstChild : sn;

-			en = en.nodeName == "HTML" ? d.body : en; // Fix for Opera bug: https://bugs.opera.com/show_bug.cgi?id=273224&comments=yes

-			en = en.nodeName == "BODY" ? en.firstChild : en;

-

-			// Get start and end blocks

-			sb = t.getParentBlock(sn);

-			eb = t.getParentBlock(en);

-			bn = sb ? sb.nodeName : se.element; // Get block name to create

-

-			// Return inside list use default browser behavior

-			if (n = t.dom.getParent(sb, 'li,pre')) {

-				if (n.nodeName == 'LI')

-					return splitList(ed.selection, t.dom, n);

-

-				return TRUE;

-			}

-

-			// If caption or absolute layers then always generate new blocks within

-			if (sb && (sb.nodeName == 'CAPTION' || /absolute|relative|fixed/gi.test(dom.getStyle(sb, 'position', 1)))) {

-				bn = se.element;

-				sb = null;

-			}

-

-			// If caption or absolute layers then always generate new blocks within

-			if (eb && (eb.nodeName == 'CAPTION' || /absolute|relative|fixed/gi.test(dom.getStyle(sb, 'position', 1)))) {

-				bn = se.element;

-				eb = null;

-			}

-

-			// Use P instead

-			if (/(TD|TABLE|TH|CAPTION)/.test(bn) || (sb && bn == "DIV" && /left|right/gi.test(dom.getStyle(sb, 'float', 1)))) {

-				bn = se.element;

-				sb = eb = null;

-			}

-

-			// Setup new before and after blocks

-			bef = (sb && sb.nodeName == bn) ? sb.cloneNode(0) : ed.dom.create(bn);

-			aft = (eb && eb.nodeName == bn) ? eb.cloneNode(0) : ed.dom.create(bn);

-

-			// Remove id from after clone

-			aft.removeAttribute('id');

-

-			// Is header and cursor is at the end, then force paragraph under

-			if (/^(H[1-6])$/.test(bn) && isAtEnd(r, sb))

-				aft = ed.dom.create(se.element);

-

-			// Find start chop node

-			n = sc = sn;

-			do {

-				if (n == b || n.nodeType == 9 || t.dom.isBlock(n) || /(TD|TABLE|TH|CAPTION)/.test(n.nodeName))

-					break;

-

-				sc = n;

-			} while ((n = n.previousSibling ? n.previousSibling : n.parentNode));

-

-			// Find end chop node

-			n = ec = en;

-			do {

-				if (n == b || n.nodeType == 9 || t.dom.isBlock(n) || /(TD|TABLE|TH|CAPTION)/.test(n.nodeName))

-					break;

-

-				ec = n;

-			} while ((n = n.nextSibling ? n.nextSibling : n.parentNode));

-

-			// Place first chop part into before block element

-			if (sc.nodeName == bn)

-				rb.setStart(sc, 0);

-			else

-				rb.setStartBefore(sc);

-

-			rb.setEnd(sn, so);

-			bef.appendChild(rb.cloneContents() || d.createTextNode('')); // Empty text node needed for Safari

-

-			// Place secnd chop part within new block element

-			try {

-				ra.setEndAfter(ec);

-			} catch(ex) {

-				//console.debug(s.focusNode, s.focusOffset);

+		// Get current selection

+		rng = selection.getRng();

+		if (rng.setStart) {

+			startContainer = rng.startContainer;

+			startOffset = rng.startOffset;

+			endContainer = rng.endContainer;

+			endOffset = rng.endOffset;

+		} else {

+			// Force control range into text range

+			if (rng.item) {

+				node = rng.item(0);

+				rng = editor.getDoc().body.createTextRange();

+				rng.moveToElementText(node);

 			}

 

-			ra.setStart(en, eo);

-			aft.appendChild(ra.cloneContents() || d.createTextNode('')); // Empty text node needed for Safari

+			tmpRng = rng.duplicate();

+			tmpRng.collapse(true);

+			startOffset = tmpRng.move('character', offset) * -1;

 

-			// Create range around everything

-			r = d.createRange();

-			if (!sc.previousSibling && sc.parentNode.nodeName == bn) {

-				r.setStartBefore(sc.parentNode);

-			} else {

-				if (rb.startContainer.nodeName == bn && rb.startOffset == 0)

-					r.setStartBefore(rb.startContainer);

-				else

-					r.setStart(rb.startContainer, rb.startOffset);

+			if (!tmpRng.collapsed) {

+				tmpRng = rng.duplicate();

+				tmpRng.collapse(false);

+				endOffset = (tmpRng.move('character', offset) * -1) - startOffset;

 			}

+		}

 

-			if (!ec.nextSibling && ec.parentNode.nodeName == bn)

-				r.setEndAfter(ec.parentNode);

-			else

-				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)

-				aft.innerHTML = aft.firstChild.innerHTML;

-

-			function appendStyles(e, en) {

-				var nl = [], nn, n, i;

-

-				e.innerHTML = '';

-

-				// Make clones of style elements

-				if (se.keep_styles) {

-					n = en;

-					do {

-						// We only want style specific elements

-						if (/^(SPAN|STRONG|B|EM|I|FONT|STRIKE|U)$/.test(n.nodeName)) {

-							nn = n.cloneNode(FALSE);

-							dom.setAttrib(nn, 'id', ''); // Remove ID since it needs to be unique

-							nl.push(nn);

-						}

-					} while (n = n.parentNode);

+		// Wrap non block elements and text nodes

+		node = rootNode.firstChild;

+		while (node) {

+			if (node.nodeType === 3 || (node.nodeType == 1 && !blockElements[node.nodeName])) {

+				if (!rootBlockNode) {

+					rootBlockNode = dom.create(settings.forced_root_block);

+					node.parentNode.insertBefore(rootBlockNode, node);

+					wrapped = true;

 				}

 

-				// Append style elements to aft

-				if (nl.length > 0) {

-					for (i = nl.length - 1, nn = e; i >= 0; i--)

-						nn = nn.appendChild(nl[i]);

-

-					// Padd most inner style element

-					nl[0].innerHTML = isOpera ? '\u00a0' : '<br />'; // Extra space for Opera so that the caret can move there

-					return nl[0]; // Move caret to most inner element

-				} else

-					e.innerHTML = isOpera ? '\u00a0' : '<br />'; // Extra space for Opera so that the caret can move there

-			};

-				

-			// Padd empty blocks

-			if (dom.isEmpty(bef))

-				appendStyles(bef, sn);

-

-			// Fill empty afterblook with current style

-			if (dom.isEmpty(aft))

-				car = appendStyles(aft, en);

-

-			// Opera needs this one backwards for older versions

-			if (isOpera && parseFloat(opera.version()) < 9.5) {

-				r.insertNode(bef);

-				r.insertNode(aft);

+				tempNode = node;

+				node = node.nextSibling;

+				rootBlockNode.appendChild(tempNode);

 			} else {

-				r.insertNode(aft);

-				r.insertNode(bef);

+				rootBlockNode = null;

+				node = node.nextSibling;

 			}

+		}

 

-			// Normalize

-			aft.normalize();

-			bef.normalize();

-

-			// Move cursor and scroll into view

-			ed.selection.select(aft, true);

-			ed.selection.collapse(true);

-

-			// 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

-			y = ed.dom.getPos(aft).y;

-			//ch = aft.clientHeight;

-

-			// Is element within viewport

-			if (y < vp.y || y + 25 > vp.y + vp.h) {

-				ed.getWin().scrollTo(0, y < vp.y ? y : y - vp.h + 25); // Needs to be hardcoded to roughly one line of text if a huge text block is broken into two blocks

-

-				/*console.debug(

-					'Element: y=' + y + ', h=' + ch + ', ' +

-					'Viewport: y=' + vp.y + ", h=" + vp.h + ', bottom=' + (vp.y + vp.h)

-				);*/

-			}

-

-			ed.undoManager.add();

-

-			return FALSE;

-		},

-

-		backspaceDelete : function(e, bs) {

-			var t = this, ed = t.editor, b = ed.getBody(), dom = ed.dom, n, se = ed.selection, r = se.getRng(), sc = r.startContainer, n, w, tn, walker;

+		if (rng.setStart) {

+			rng.setStart(startContainer, startOffset);

+			rng.setEnd(endContainer, endOffset);

+			selection.setRng(rng);

+		} else {

+			try {

+				rng = editor.getDoc().body.createTextRange();

+				rng.moveToElementText(rootNode);

+				rng.collapse(true);

+				rng.moveStart('character', startOffset);

 

-			// Delete when caret is behind a element doesn't work correctly on Gecko see #3011651

-			if (!bs && r.collapsed && sc.nodeType == 1 && r.startOffset == sc.childNodes.length) {

-				walker = new tinymce.dom.TreeWalker(sc.lastChild, sc);

+				if (endOffset > 0)

+					rng.moveEnd('character', endOffset);

 

-				// Walk the dom backwards until we find a text node

-				for (n = sc.lastChild; n; n = walker.prev()) {

-					if (n.nodeType == 3) {

-						r.setStart(n, n.nodeValue.length);

-						r.collapse(true);

-						se.setRng(r);

-						return;

-					}

-				}

+				rng.select();

+			} catch (ex) {

+				// Ignore

 			}

+		}

 

-			// 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) && !/^(TD|TH)$/.test(sc.nodeName) && bs) {

-				if (sc.childNodes.length == 0 || (sc.childNodes.length == 1 && sc.firstChild.nodeName == 'BR')) {

-					// Find previous block element

-					n = sc;

-					while ((n = n.previousSibling) && !ed.dom.isBlock(n)) ;

-

-					if (n) {

-						if (sc != b.firstChild) {

-							// Find last text node

-							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);

-					}

-				}

-			}

+		// Only trigger nodeChange when we wrapped nodes to prevent a forever loop

+		if (wrapped) {

+			editor.nodeChanged();

 		}

-	});

-})(tinymce);

+	};

+

+	// Force root blocks

+	if (settings.forced_root_block) {

+		editor.onKeyUp.add(addRootBlocks);

+		editor.onNodeChange.add(addRootBlocks);

+	}

+};

 

 (function(tinymce) {

 	// Shorten names

@@ -14426,6 +15260,8 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 			if (v = ed.getParam('skin_variant'))

 				s['class'] += ' ' + ed.getParam('skin') + 'Skin' + v.substring(0, 1).toUpperCase() + v.substring(1);

 

+			s['class'] += ed.settings.directionality == "rtl" ? ' mceRtl' : '';

+

 			id = t.prefix + id;

 			cls = cc || t._cls.dropmenu || tinymce.ui.DropMenu;

 			c = t.controls[id] = new cls(id, s);

@@ -14840,12 +15676,12 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 			isBlock = dom.isBlock,

 			forcedRootBlock = ed.settings.forced_root_block,

 			nodeIndex = dom.nodeIndex,

-			INVISIBLE_CHAR = '\uFEFF',

+			INVISIBLE_CHAR = tinymce.isGecko ? '\u200B' : '\uFEFF',

 			MCE_ATTR_RE = /^(src|href|style)$/,

 			FALSE = false,

 			TRUE = true,

-			undefined,

-			pendingFormats = {apply : [], remove : []};

+			undef,

+			getContentEditable = dom.getContentEditable;

 

 		function isArray(obj) {

 			return obj instanceof Array;

@@ -14856,7 +15692,104 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 		};

 

 		function isCaretNode(node) {

-			return node.nodeType === 1 && (node.face === 'mceinline' || node.style.fontFamily === 'mceinline');

+			return node.nodeType === 1 && node.id === '_mce_caret';

+		};

+

+		function defaultFormats() {

+			register({

+				alignleft : [

+					{selector : 'figure,p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li', styles : {textAlign : 'left'}, defaultBlock: 'div'},

+					{selector : 'img,table', collapsed : false, styles : {'float' : 'left'}}

+				],

+

+				aligncenter : [

+					{selector : 'figure,p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li', styles : {textAlign : 'center'}, defaultBlock: 'div'},

+					{selector : 'img', collapsed : false, styles : {display : 'block', marginLeft : 'auto', marginRight : 'auto'}},

+					{selector : 'table', collapsed : false, styles : {marginLeft : 'auto', marginRight : 'auto'}}

+				],

+

+				alignright : [

+					{selector : 'figure,p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li', styles : {textAlign : 'right'}, defaultBlock: 'div'},

+					{selector : 'img,table', collapsed : false, styles : {'float' : 'right'}}

+				],

+

+				alignfull : [

+					{selector : 'figure,p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li', styles : {textAlign : 'justify'}, defaultBlock: 'div'}

+				],

+

+				bold : [

+					{inline : 'strong', remove : 'all'},

+					{inline : 'span', styles : {fontWeight : 'bold'}},

+					{inline : 'b', remove : 'all'}

+				],

+

+				italic : [

+					{inline : 'em', remove : 'all'},

+					{inline : 'span', styles : {fontStyle : 'italic'}},

+					{inline : 'i', remove : 'all'}

+				],

+

+				underline : [

+					{inline : 'span', styles : {textDecoration : 'underline'}, exact : true},

+					{inline : 'u', remove : 'all'}

+				],

+

+				strikethrough : [

+					{inline : 'span', styles : {textDecoration : 'line-through'}, exact : true},

+					{inline : 'strike', remove : 'all'}

+				],

+

+				forecolor : {inline : 'span', styles : {color : '%value'}, wrap_links : false},

+				hilitecolor : {inline : 'span', styles : {backgroundColor : '%value'}, wrap_links : false},

+				fontname : {inline : 'span', styles : {fontFamily : '%value'}},

+				fontsize : {inline : 'span', styles : {fontSize : '%value'}},

+				fontsize_class : {inline : 'span', attributes : {'class' : '%value'}},

+				blockquote : {block : 'blockquote', wrapper : 1, remove : 'all'},

+				subscript : {inline : 'sub'},

+				superscript : {inline : 'sup'},

+

+				link : {inline : 'a', selector : 'a', remove : 'all', split : true, deep : true,

+					onmatch : function(node) {

+						return true;

+					},

+

+					onformat : function(elm, fmt, vars) {

+						each(vars, function(value, key) {

+							dom.setAttrib(elm, key, value);

+						});

+					}

+				},

+

+				removeformat : [

+					{selector : 'b,strong,em,i,font,u,strike', remove : 'all', split : true, expand : false, block_expand : true, deep : true},

+					{selector : 'span', attributes : ['style', 'class'], remove : 'empty', split : true, expand : false, deep : true},

+					{selector : '*', attributes : ['style', 'class'], split : false, expand : false, deep : true}

+				]

+			});

+

+			// Register default block formats

+			each('p h1 h2 h3 h4 h5 h6 div address pre div code dt dd samp'.split(/\s/), function(name) {

+				register(name, {block : name, remove : 'all'});

+			});

+

+			// Register user defined formats

+			register(ed.settings.formats);

+		};

+

+		function addKeyboardShortcuts() {

+			// Add some inline shortcuts

+			ed.addShortcut('ctrl+b', 'bold_desc', 'Bold');

+			ed.addShortcut('ctrl+i', 'italic_desc', 'Italic');

+			ed.addShortcut('ctrl+u', 'underline_desc', 'Underline');

+

+			// BlockFormat shortcuts keys

+			for (var i = 1; i <= 6; i++) {

+				ed.addShortcut('ctrl+' + i, '', ['FormatBlock', false, 'h' + i]);

+			}

+

+			ed.addShortcut('ctrl+7', '', ['FormatBlock', false, 'p']);

+			ed.addShortcut('ctrl+8', '', ['FormatBlock', false, 'div']);

+			ed.addShortcut('ctrl+9', '', ['FormatBlock', false, 'address']);

 		};

 

 		// Public functions

@@ -14878,15 +15811,15 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 					each(format, function(format) {

 						// Set deep to false by default on selector formats this to avoid removing

 						// alignment on images inside paragraphs when alignment is changed on paragraphs

-						if (format.deep === undefined)

+						if (format.deep === undef)

 							format.deep = !format.selector;

 

 						// Default to true

-						if (format.split === undefined)

+						if (format.split === undef)

 							format.split = !format.selector || format.inline;

 

 						// Default to true

-						if (format.remove === undefined && format.selector && !format.inline)

+						if (format.remove === undef && format.selector && !format.inline)

 							format.remove = 'none';

 

 						// Mark format as a mixed format inline + block level

@@ -14931,30 +15864,6 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 		function apply(name, vars, node) {

 			var formatList = get(name), format = formatList[0], bookmark, rng, i, isCollapsed = selection.isCollapsed();

 

-			function moveStart(rng) {

-				var container = rng.startContainer,

-					offset = rng.startOffset,

-					walker, node;

-

-				// Move startContainer/startOffset in to a suitable node

-				if (container.nodeType == 1 || container.nodeValue === "") {

-					container = container.nodeType == 1 ? container.childNodes[offset] : container;

-

-					// Might fail if the offset is behind the last element in it's container

-					if (container) {

-						walker = new TreeWalker(container, container.parentNode);

-						for (node = walker.current(); node; node = walker.next()) {

-							if (node.nodeType == 3 && !isWhiteSpaceNode(node)) {

-								rng.setStart(node, 0);

-								break;

-							}

-						}

-					}

-				}

-

-				return rng;

-			};

-

 			function setElementFormat(elm, fmt) {

 				fmt = fmt || format;

 

@@ -14983,7 +15892,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 				function findSelectionEnd(start, end) {

 					var walker = new TreeWalker(end);

 					for (node = walker.current(); node; node = walker.prev()) {

-						if (node.childNodes.length > 1 || node == start) {

+						if (node.childNodes.length > 1 || node == start || node.tagName == 'BR') {

 							return node;

 						}

 					}

@@ -14995,7 +15904,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 				var start = rng.startContainer;

 				var end = rng.endContainer;

 

-				if (start != end && rng.endOffset == 0) {

+				if (start != end && rng.endOffset === 0) {

 					var newEnd = findSelectionEnd(start, end);

 					var endOffset = newEnd.nodeType == 3 ? newEnd.length : newEnd.childNodes.length;

 

@@ -15033,8 +15942,8 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 					each(tinymce.grep(node.childNodes), process);

 					return 0;

 				} else {

-					currentWrapElm = wrapElm.cloneNode(FALSE);

-					

+					currentWrapElm = dom.clone(wrapElm, FALSE);

+

 					// create a list of the nodes on the same side of the list as the selection

 					each(tinymce.grep(node.childNodes), function(n, index) {

 						if ((startIndex < listIndex && index < listIndex) || (startIndex > listIndex && index > listIndex)) {

@@ -15042,7 +15951,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 							n.parentNode.removeChild(n);

 						}

 					});

-					

+

 					// insert the wrapping element either before or after the list.

 					if (startIndex < listIndex) {

 						node.insertBefore(currentWrapElm, list);

@@ -15060,9 +15969,9 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 					return currentWrapElm;

 				}

 			};

-			

-			function applyRngStyle(rng, bookmark) {

-				var newWrappers = [], wrapName, wrapElm;

+

+			function applyRngStyle(rng, bookmark, node_specific) {

+				var newWrappers = [], wrapName, wrapElm, contentEditable = true;

 

 				// Setup wrapper element

 				wrapName = format.inline || format.block;

@@ -15073,7 +15982,18 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 					var currentWrapElm;

 

 					function process(node) {

-						var nodeName = node.nodeName.toLowerCase(), parentName = node.parentNode.nodeName.toLowerCase(), found;

+						var nodeName, parentName, found, hasContentEditableState, lastContentEditable;

+

+						lastContentEditable = contentEditable;

+						nodeName = node.nodeName.toLowerCase();

+						parentName = node.parentNode.nodeName.toLowerCase();

+

+						// Node has a contentEditable value

+						if (node.nodeType === 1 && getContentEditable(node)) {

+							lastContentEditable = contentEditable;

+							contentEditable = getContentEditable(node) === "true";

+							hasContentEditableState = true; // We don't want to wrap the container only it's children

+						}

 

 						// Stop wrapping on br elements

 						if (isEq(nodeName, 'br')) {

@@ -15093,7 +16013,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 						}

 

 						// Can we rename the block

-						if (format.block && !format.wrapper && isTextBlock(nodeName)) {

+						if (contentEditable && !hasContentEditableState && format.block && !format.wrapper && isTextBlock(nodeName)) {

 							node = dom.rename(node, wrapName);

 							setElementFormat(node);

 							newWrappers.push(node);

@@ -15124,12 +16044,12 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 						}

 

 						// Is it valid to wrap this item

-						if (isValid(wrapName, nodeName) && isValid(parentName, wrapName) &&

-								!(node.nodeType === 3 && node.nodeValue.length === 1 && node.nodeValue.charCodeAt(0) === 65279)) {

+						if (contentEditable && !hasContentEditableState && isValid(wrapName, nodeName) && isValid(parentName, wrapName) &&

+								!(!node_specific && node.nodeType === 3 && node.nodeValue.length === 1 && node.nodeValue.charCodeAt(0) === 65279) && !isCaretNode(node)) {

 							// Start wrapping

 							if (!currentWrapElm) {

 								// Wrap the node

-								currentWrapElm = wrapElm.cloneNode(FALSE);

+								currentWrapElm = dom.clone(wrapElm, FALSE);

 								node.parentNode.insertBefore(currentWrapElm, node);

 								newWrappers.push(currentWrapElm);

 							}

@@ -15141,9 +16061,13 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 						} else {

 							// Start a new wrapper for possible children

 							currentWrapElm = 0;

-

+							

 							each(tinymce.grep(node.childNodes), process);

 

+							if (hasContentEditableState) {

+								contentEditable = lastContentEditable; // Restore last contentEditable state from stack

+							}

+

 							// End the last wrapper

 							currentWrapElm = 0;

 						}

@@ -15160,7 +16084,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 							var i, currentWrapElm, children;

 

 							if (node.nodeName === 'A') {

-								currentWrapElm = wrapElm.cloneNode(FALSE);

+								currentWrapElm = dom.clone(wrapElm, FALSE);

 								newWrappers.push(currentWrapElm);

 

 								children = tinymce.grep(node.childNodes);

@@ -15178,6 +16102,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 				}

 

 				// Cleanup

+				

 				each(newWrappers, function(node) {

 					var childCount;

 

@@ -15204,7 +16129,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 

 						// If child was found and of the same type as the current node

 						if (child && matchName(child, format)) {

-							clone = child.cloneNode(FALSE);

+							clone = dom.clone(child, FALSE);

 							setElementFormat(clone);

 

 							dom.replace(clone, node, TRUE);

@@ -15280,17 +16205,25 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 

 			if (format) {

 				if (node) {

-					rng = dom.createRng();

-

-					rng.setStartBefore(node);

-					rng.setEndAfter(node);

-

-					applyRngStyle(expandRng(rng, formatList));

+					if (node.nodeType) {

+						rng = dom.createRng();

+						rng.setStartBefore(node);

+						rng.setEndAfter(node);

+						applyRngStyle(expandRng(rng, formatList), null, true);

+					} else {

+						applyRngStyle(node, null, true);

+					}

 				} else {

 					if (!isCollapsed || !format.inline || dom.select('td.mceSelected,th.mceSelected').length) {

 						// Obtain selection node before selection is unselected by applyRngStyle()

 						var curSelNode = ed.selection.getNode();

 

+						// If the formats have a default block and we can't find a parent block then start wrapping it with a DIV this is for forced_root_blocks: false

+						// It's kind of a hack but people should be using the default block type P since all desktop editors work that way

+						if (!forcedRootBlock && formatList[0].defaultBlock && !dom.getParent(curSelNode, dom.isBlock)) {

+							apply(formatList[0].defaultBlock);

+						}

+

 						// Apply formatting to selection

 						ed.selection.setRng(adjustSelectionToVisibleSelection());

 						bookmark = selection.getBookmark();

@@ -15303,7 +16236,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 						}

 

 						selection.moveToBookmark(bookmark);

-						selection.setRng(moveStart(selection.getRng(TRUE)));

+						moveStart(selection.getRng(TRUE));

 						ed.nodeChanged();

 					} else

 						performCaretAction('apply', name, vars);

@@ -15312,63 +16245,40 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 		};

 

 		function remove(name, vars, node) {

-			var formatList = get(name), format = formatList[0], bookmark, i, rng;

-			function moveStart(rng) {

-				var container = rng.startContainer,

-					offset = rng.startOffset,

-					walker, node, nodes, tmpNode;

-

-				// Convert text node into index if possible

-				if (container.nodeType == 3 && offset >= container.nodeValue.length - 1) {

-					container = container.parentNode;

-					offset = nodeIndex(container) + 1;

-				}

-

-				// Move startContainer/startOffset in to a suitable node

-				if (container.nodeType == 1) {

-					nodes = container.childNodes;

-					container = nodes[Math.min(offset, nodes.length - 1)];

-					walker = new TreeWalker(container);

-

-					// If offset is at end of the parent node walk to the next one

-					if (offset > nodes.length - 1)

-						walker.next();

-

-					for (node = walker.current(); node; node = walker.next()) {

-						if (node.nodeType == 3 && !isWhiteSpaceNode(node)) {

-							// IE has a "neat" feature where it moves the start node into the closest element

-							// we can avoid this by inserting an element before it and then remove it after we set the selection

-							tmpNode = dom.create('a', null, INVISIBLE_CHAR);

-							node.parentNode.insertBefore(tmpNode, node);

-

-							// Set selection and remove tmpNode

-							rng.setStart(node, 0);

-							selection.setRng(rng);

-							dom.remove(tmpNode);

-

-							return;

-						}

-					}

-				}

-			};

+			var formatList = get(name), format = formatList[0], bookmark, i, rng, contentEditable = true;

 

 			// Merges the styles for each node

 			function process(node) {

-				var children, i, l;

+				var children, i, l, localContentEditable, lastContentEditable, hasContentEditableState;

+

+				// Node has a contentEditable value

+				if (node.nodeType === 1 && getContentEditable(node)) {

+					lastContentEditable = contentEditable;

+					contentEditable = getContentEditable(node) === "true";

+					hasContentEditableState = true; // We don't want to wrap the container only it's children

+				}

 

 				// Grab the children first since the nodelist might be changed

 				children = tinymce.grep(node.childNodes);

 

 				// Process current node

-				for (i = 0, l = formatList.length; i < l; i++) {

-					if (removeFormat(formatList[i], vars, node, node))

-						break;

+				if (contentEditable && !hasContentEditableState) {

+					for (i = 0, l = formatList.length; i < l; i++) {

+						if (removeFormat(formatList[i], vars, node, node))

+							break;

+					}

 				}

 

 				// Process the children

 				if (format.deep) {

-					for (i = 0, l = children.length; i < l; i++)

-						process(children[i]);

+					if (children.length) {					

+						for (i = 0, l = children.length; i < l; i++)

+							process(children[i]);

+

+						if (hasContentEditableState) {

+							contentEditable = lastContentEditable; // Restore last contentEditable state from stack

+						}

+					}

 				}

 			};

 

@@ -15399,7 +16309,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 					formatRootParent = format_root.parentNode;

 

 					for (parent = container.parentNode; parent && parent != formatRootParent; parent = parent.parentNode) {

-						clone = parent.cloneNode(FALSE);

+						clone = dom.clone(parent, FALSE);

 

 						for (i = 0; i < formatList.length; i++) {

 							if (removeFormat(formatList[i], vars, clone, clone)) {

@@ -15454,7 +16364,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 			};

 

 			function removeRngStyle(rng) {

-				var startContainer, endContainer;

+				var startContainer, endContainer, node;

 

 				rng = expandRng(rng, formatList, TRUE);

 

@@ -15463,6 +16373,12 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 					endContainer = getContainer(rng);

 

 					if (startContainer != endContainer) {

+						// WebKit will render the table incorrectly if we wrap a TD in a SPAN so lets see if the can use the first child instead

+						// This will happen if you tripple click a table cell and use remove formatting

+						if (/^(TR|TD)$/.test(startContainer.nodeName) && startContainer.firstChild) {

+							startContainer = (startContainer.nodeName == "TD" ? startContainer.firstChild : startContainer.firstChild.firstChild) || startContainer;

+						}

+

 						// Wrap start/end nodes in span element since these might be cloned/moved

 						startContainer = wrap(startContainer, 'span', {id : '_start', 'data-mce-type' : 'bookmark'});

 						endContainer = wrap(endContainer, 'span', {id : '_end', 'data-mce-type' : 'bookmark'});

@@ -15499,10 +16415,15 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 

 			// Handle node

 			if (node) {

-				rng = dom.createRng();

-				rng.setStartBefore(node);

-				rng.setEndAfter(node);

-				removeRngStyle(rng);

+				if (node.nodeType) {

+					rng = dom.createRng();

+					rng.setStartBefore(node);

+					rng.setEndAfter(node);

+					removeRngStyle(rng);

+				} else {

+					removeRngStyle(node);

+				}

+

 				return;

 			}

 

@@ -15524,7 +16445,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 		function toggle(name, vars, node) {

 			var fmt = get(name);

 

-			if (match(name, vars, node) && (!('toggle' in fmt[0]) || fmt[0]['toggle']))

+			if (match(name, vars, node) && (!('toggle' in fmt[0]) || fmt[0].toggle))

 				remove(name, vars, node);

 			else

 				apply(name, vars, node);

@@ -15544,7 +16465,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 				// Check all items

 				if (items) {

 					// Non indexed object

-					if (items.length === undefined) {

+					if (items.length === undef) {

 						for (key in items) {

 							if (items.hasOwnProperty(key)) {

 								if (item_name === 'attributes')

@@ -15593,7 +16514,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 		};

 

 		function match(name, vars, node) {

-			var startNode, i;

+			var startNode;

 

 			function matchParents(node) {

 				// Find first node with similar format settings

@@ -15609,21 +16530,6 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 			if (node)

 				return matchParents(node);

 

-			// Check pending formats

-			if (selection.isCollapsed()) {

-				for (i = pendingFormats.apply.length - 1; i >= 0; i--) {

-					if (pendingFormats.apply[i].name == name)

-						return true;

-				}

-

-				for (i = pendingFormats.remove.length - 1; i >= 0; i--) {

-					if (pendingFormats.remove[i].name == name)

-						return false;

-				}

-

-				return matchParents(selection.getNode());

-			}

-

 			// Check selected node

 			node = selection.getNode();

 			if (matchParents(node))

@@ -15642,33 +16548,6 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 		function matchAll(names, vars) {

 			var startElement, matchedFormatNames = [], checkedMap = {}, i, ni, name;

 

-			// If the selection is collapsed then check pending formats

-			if (selection.isCollapsed()) {

-				for (ni = 0; ni < names.length; ni++) {

-					// If the name is to be removed, then stop it from being added

-					for (i = pendingFormats.remove.length - 1; i >= 0; i--) {

-						name = names[ni];

-

-						if (pendingFormats.remove[i].name == name) {

-							checkedMap[name] = true;

-							break;

-						}

-					}

-				}

-

-				// If the format is to be applied

-				for (i = pendingFormats.apply.length - 1; i >= 0; i--) {

-					for (ni = 0; ni < names.length; ni++) {

-						name = names[ni];

-

-						if (!checkedMap[name] && pendingFormats.apply[i].name == name) {

-							checkedMap[name] = true;

-							matchedFormatNames.push(name);

-						}

-					}

-				}

-			}

-

 			// Check start of selection for formats

 			startElement = selection.getStart();

 			dom.getParent(startElement, function(node) {

@@ -15724,6 +16603,10 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 			canApply : canApply

 		});

 

+		// Initialize

+		defaultFormats();

+		addKeyboardShortcuts();

+

 		// Private functions

 

 		function matchName(node, format) {

@@ -15777,7 +16660,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 		};

 

 		function isWhiteSpaceNode(node) {

-			return node && node.nodeType === 3 && /^([\s\r\n]+|)$/.test(node.nodeValue);

+			return node && node.nodeType === 3 && /^([\t \r\n]+|)$/.test(node.nodeValue);

 		};

 

 		function wrap(node, name, attrs) {

@@ -15790,34 +16673,46 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 		};

 

 		function expandRng(rng, format, remove) {

-			var startContainer = rng.startContainer,

+			var sibling, lastIdx, leaf, endPoint,

+				startContainer = rng.startContainer,

 				startOffset = rng.startOffset,

 				endContainer = rng.endContainer,

-				endOffset = rng.endOffset, sibling, lastIdx, leaf;

+				endOffset = rng.endOffset;

 

 			// This function walks up the tree if there is no siblings before/after the node

-			function findParentContainer(container, child_name, sibling_name, root) {

-				var parent, child;

+			function findParentContainer(start) {

+				var container, parent, child, sibling, siblingName, root;

 

-				root = root || dom.getRoot();

+				container = parent = start ? startContainer : endContainer;

+				siblingName = start ? 'previousSibling' : 'nextSibling';

+				root = dom.getRoot();

 

-				for (;;) {

-					// Check if we can move up are we at root level or body level

-					parent = container.parentNode;

-

-					// Stop expanding on block elements or root depending on format

-					if (parent == root || (!format[0].block_expand && isBlock(parent)))

+				// If it's a text node and the offset is inside the text

+				if (container.nodeType == 3 && !isWhiteSpaceNode(container)) {

+					if (start ? startOffset > 0 : endOffset < container.nodeValue.length) {

 						return container;

+					}

+				}

 

-					for (sibling = parent[child_name]; sibling && sibling != container; sibling = sibling[sibling_name]) {

-						if (sibling.nodeType == 1 && !isBookmarkNode(sibling))

-							return container;

+				for (;;) {

+					// Stop expanding on block elements

+					if (!format[0].block_expand && isBlock(parent))

+						return parent;

+

+					// Walk left/right

+					for (sibling = parent[siblingName]; sibling; sibling = sibling[siblingName]) {

+						if (!isBookmarkNode(sibling) && !isWhiteSpaceNode(sibling)) {

+							return parent;

+						}

+					}

 

-						if (sibling.nodeType == 3 && !isWhiteSpaceNode(sibling))

-							return container;

+					// Check if we can move up are we at root level or body level

+					if (parent.parentNode == root) {

+						container = parent;

+						break;

 					}

 

-					container = container.parentNode;

+					parent = parent.parentNode;

 				}

 

 				return container;

@@ -15826,7 +16721,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 			// This function walks down the tree to find the leaf at the selection.

 			// The offset is also returned as if node initially a leaf, the offset may be in the middle of the text node.

 			function findLeaf(node, offset) {

-				if (offset === undefined)

+				if (offset === undef)

 					offset = node.nodeType === 3 ? node.length : node.childNodes.length;

 				while (node && node.hasChildNodes()) {

 					node = node.childNodes[offset];

@@ -15854,24 +16749,178 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 					endOffset = endContainer.nodeValue.length;

 			}

 

-			// Exclude bookmark nodes if possible

-			if (isBookmarkNode(startContainer.parentNode))

-				startContainer = startContainer.parentNode;

+			// Expands the node to the closes contentEditable false element if it exists

+			function findParentContentEditable(node) {

+				var parent = node;

+

+				while (parent) {

+					if (parent.nodeType === 1 && getContentEditable(parent)) {

+						return getContentEditable(parent) === "false" ? parent : node;

+					}

+

+					parent = parent.parentNode;

+				}

+

+				return node;

+			};

+

+			function findWordEndPoint(container, offset, start) {

+				var walker, node, pos, lastTextNode;

+

+				function findSpace(node, offset) {

+					var pos, pos2, str = node.nodeValue;

+

+					if (typeof(offset) == "undefined") {

+						offset = start ? str.length : 0;

+					}

+

+					if (start) {

+						pos = str.lastIndexOf(' ', offset);

+						pos2 = str.lastIndexOf('\u00a0', offset);

+						pos = pos > pos2 ? pos : pos2;

 

-			if (isBookmarkNode(startContainer))

+						// Include the space on remove to avoid tag soup

+						if (pos !== -1 && !remove) {

+							pos++;

+						}

+					} else {

+						pos = str.indexOf(' ', offset);

+						pos2 = str.indexOf('\u00a0', offset);

+						pos = pos !== -1 && (pos2 === -1 || pos < pos2) ? pos : pos2;

+					}

+

+					return pos;

+				};

+

+				if (container.nodeType === 3) {

+					pos = findSpace(container, offset);

+

+					if (pos !== -1) {

+						return {container : container, offset : pos};

+					}

+

+					lastTextNode = container;

+				}

+

+				// Walk the nodes inside the block

+				walker = new TreeWalker(container, dom.getParent(container, isBlock) || ed.getBody());

+				while (node = walker[start ? 'prev' : 'next']()) {

+					if (node.nodeType === 3) {

+						lastTextNode = node;

+						pos = findSpace(node);

+

+						if (pos !== -1) {

+							return {container : node, offset : pos};

+						}

+					} else if (isBlock(node)) {

+						break;

+					}

+				}

+

+				if (lastTextNode) {

+					if (start) {

+						offset = 0;

+					} else {

+						offset = lastTextNode.length;

+					}

+

+					return {container: lastTextNode, offset: offset};

+				}

+			};

+

+			function findSelectorEndPoint(container, sibling_name) {

+				var parents, i, y, curFormat;

+

+				if (container.nodeType == 3 && container.nodeValue.length === 0 && container[sibling_name])

+					container = container[sibling_name];

+

+				parents = getParents(container);

+				for (i = 0; i < parents.length; i++) {

+					for (y = 0; y < format.length; y++) {

+						curFormat = format[y];

+

+						// If collapsed state is set then skip formats that doesn't match that

+						if ("collapsed" in curFormat && curFormat.collapsed !== rng.collapsed)

+							continue;

+

+						if (dom.is(parents[i], curFormat.selector))

+							return parents[i];

+					}

+				}

+

+				return container;

+			};

+

+			function findBlockEndPoint(container, sibling_name, sibling_name2) {

+				var node;

+

+				// Expand to block of similar type

+				if (!format[0].wrapper)

+					node = dom.getParent(container, format[0].block);

+

+				// Expand to first wrappable block element or any block element

+				if (!node)

+					node = dom.getParent(container.nodeType == 3 ? container.parentNode : container, isBlock);

+

+				// Exclude inner lists from wrapping

+				if (node && format[0].wrapper)

+					node = getParents(node, 'ul,ol').reverse()[0] || node;

+

+				// Didn't find a block element look for first/last wrappable element

+				if (!node) {

+					node = container;

+

+					while (node[sibling_name] && !isBlock(node[sibling_name])) {

+						node = node[sibling_name];

+

+						// Break on BR but include it will be removed later on

+						// we can't remove it now since we need to check if it can be wrapped

+						if (isEq(node, 'br'))

+							break;

+					}

+				}

+

+				return node || container;

+			};

+

+			// Expand to closest contentEditable element

+			startContainer = findParentContentEditable(startContainer);

+			endContainer = findParentContentEditable(endContainer);

+

+			// Exclude bookmark nodes if possible

+			if (isBookmarkNode(startContainer.parentNode) || isBookmarkNode(startContainer)) {

+				startContainer = isBookmarkNode(startContainer) ? startContainer : startContainer.parentNode;

 				startContainer = startContainer.nextSibling || startContainer;

 

-			if (isBookmarkNode(endContainer.parentNode)) {

-				endOffset = dom.nodeIndex(endContainer);

-				endContainer = endContainer.parentNode;

+				if (startContainer.nodeType == 3)

+					startOffset = 0;

 			}

 

-			if (isBookmarkNode(endContainer) && endContainer.previousSibling) {

-				endContainer = endContainer.previousSibling;

-				endOffset = endContainer.length;

+			if (isBookmarkNode(endContainer.parentNode) || isBookmarkNode(endContainer)) {

+				endContainer = isBookmarkNode(endContainer) ? endContainer : endContainer.parentNode;

+				endContainer = endContainer.previousSibling || endContainer;

+

+				if (endContainer.nodeType == 3)

+					endOffset = endContainer.length;

 			}

 

 			if (format[0].inline) {

+				if (rng.collapsed) {

+					// Expand left to closest word boundery

+					endPoint = findWordEndPoint(startContainer, startOffset, true);

+					if (endPoint) {

+						startContainer = endPoint.container;

+						startOffset = endPoint.offset;

+					}

+

+					// Expand right to closest word boundery

+					endPoint = findWordEndPoint(endContainer, endOffset);

+					if (endPoint) {

+						endContainer = endPoint.container;

+						endOffset = endPoint.offset;

+					}

+				}

+

 				// Avoid applying formatting to a trailing space.

 				leaf = findLeaf(endContainer, endOffset);

 				if (leaf.node) {

@@ -15884,47 +16933,27 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 						if (leaf.offset > 1) {

 							endContainer = leaf.node;

 							endContainer.splitText(leaf.offset - 1);

-						} else if (leaf.node.previousSibling) {

-							endContainer = leaf.node.previousSibling;

 						}

 					}

 				}

 			}

-			

+

 			// Move start/end point up the tree if the leaves are sharp and if we are in different containers

 			// Example * becomes !: !<p><b><i>*text</i><i>text*</i></b></p>!

 			// This will reduce the number of wrapper elements that needs to be created

 			// Move start point up the tree

 			if (format[0].inline || format[0].block_expand) {

-				startContainer = findParentContainer(startContainer, 'firstChild', 'nextSibling');

-				endContainer = findParentContainer(endContainer, 'lastChild', 'previousSibling');

+				if (!format[0].inline || (startContainer.nodeType != 3 || startOffset === 0)) {

+					startContainer = findParentContainer(true);

+				}

+

+				if (!format[0].inline || (endContainer.nodeType != 3 || endOffset === endContainer.nodeValue.length)) {

+					endContainer = findParentContainer();

+				}

 			}

 

 			// Expand start/end container to matching selector

 			if (format[0].selector && format[0].expand !== FALSE && !format[0].inline) {

-				function findSelectorEndPoint(container, sibling_name) {

-					var parents, i, y, curFormat;

-

-					if (container.nodeType == 3 && container.nodeValue.length == 0 && container[sibling_name])

-						container = container[sibling_name];

-

-					parents = getParents(container);

-					for (i = 0; i < parents.length; i++) {

-						for (y = 0; y < format.length; y++) {

-							curFormat = format[y];

-

-							// If collapsed state is set then skip formats that doesn't match that

-							if ("collapsed" in curFormat && curFormat.collapsed !== rng.collapsed)

-								continue;

-

-							if (dom.is(parents[i], curFormat.selector))

-								return parents[i];

-						}

-					}

-

-					return container;

-				};

-

 				// Find new startContainer/endContainer if there is better one

 				startContainer = findSelectorEndPoint(startContainer, 'previousSibling');

 				endContainer = findSelectorEndPoint(endContainer, 'nextSibling');

@@ -15932,38 +16961,6 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 

 			// Expand start/end container to matching block element or text node

 			if (format[0].block || format[0].selector) {

-				function findBlockEndPoint(container, sibling_name, sibling_name2) {

-					var node;

-

-					// Expand to block of similar type

-					if (!format[0].wrapper)

-						node = dom.getParent(container, format[0].block);

-

-					// Expand to first wrappable block element or any block element

-					if (!node)

-						node = dom.getParent(container.nodeType == 3 ? container.parentNode : container, isBlock);

-

-					// Exclude inner lists from wrapping

-					if (node && format[0].wrapper)

-						node = getParents(node, 'ul,ol').reverse()[0] || node;

-

-					// Didn't find a block element look for first/last wrappable element

-					if (!node) {

-						node = container;

-

-						while (node[sibling_name] && !isBlock(node[sibling_name])) {

-							node = node[sibling_name];

-

-							// Break on BR but include it will be removed later on

-							// we can't remove it now since we need to check if it can be wrapped

-							if (isEq(node, 'br'))

-								break;

-						}

-					}

-

-					return node || container;

-				};

-

 				// Find new startContainer/endContainer if there is better one

 				startContainer = findBlockEndPoint(startContainer, 'previousSibling');

 				endContainer = findBlockEndPoint(endContainer, 'nextSibling');

@@ -15971,10 +16968,10 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 				// Non block element then try to expand up the leaf

 				if (format[0].block) {

 					if (!isBlock(startContainer))

-						startContainer = findParentContainer(startContainer, 'firstChild', 'nextSibling');

+						startContainer = findParentContainer(true);

 

 					if (!isBlock(endContainer))

-						endContainer = findParentContainer(endContainer, 'lastChild', 'previousSibling');

+						endContainer = findParentContainer();

 				}

 			}

 

@@ -16100,14 +17097,14 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 		function removeNode(node, format) {

 			var parentNode = node.parentNode, rootBlockElm;

 

-			if (format.block) {

-				if (!forcedRootBlock) {

-					function find(node, next, inc) {

-						node = getNonWhiteSpaceSibling(node, next, inc);

+			function find(node, next, inc) {

+				node = getNonWhiteSpaceSibling(node, next, inc);

 

-						return !node || (node.nodeName == 'BR' || isBlock(node));

-					};

+				return !node || (node.nodeName == 'BR' || isBlock(node));

+			};

 

+			if (format.block) {

+				if (!forcedRootBlock) {

 					// Append BR elements if needed before we remove the block

 					if (isBlock(node) && !isBlock(parentNode)) {

 						if (!find(node, FALSE) && !find(node.firstChild, TRUE, 1))

@@ -16187,7 +17184,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 							value = obj2[name];

 

 							// Obj2 doesn't have obj1 item

-							if (value === undefined)

+							if (value === undef)

 								return FALSE;

 

 							// Obj2 item has a different value

@@ -16220,20 +17217,20 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 				return TRUE;

 			};

 

-			// Check if next/prev exists and that they are elements

-			if (prev && next) {

-				function findElementSibling(node, sibling_name) {

-					for (sibling = node; sibling; sibling = sibling[sibling_name]) {

-						if (sibling.nodeType == 3 && sibling.nodeValue.length !== 0)

-							return node;

+			function findElementSibling(node, sibling_name) {

+				for (sibling = node; sibling; sibling = sibling[sibling_name]) {

+					if (sibling.nodeType == 3 && sibling.nodeValue.length !== 0)

+						return node;

 

-						if (sibling.nodeType == 1 && !isBookmarkNode(sibling))

-							return sibling;

-					}

+					if (sibling.nodeType == 1 && !isBookmarkNode(sibling))

+						return sibling;

+				}

 

-					return node;

-				};

+				return node;

+			};

 

+			// Check if next/prev exists and that they are elements

+			if (prev && next) {

 				// If previous sibling is empty then jump over it

 				prev = findElementSibling(prev, 'previousSibling');

 				next = findElementSibling(next, 'nextSibling');

@@ -16267,7 +17264,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 		};

 

 		function getContainer(rng, start) {

-			var container, offset, lastIdx;

+			var container, offset, lastIdx, walker;

 

 			container = rng[start ? 'startContainer' : 'endContainer'];

 			offset = rng[start ? 'startOffset' : 'endOffset'];

@@ -16281,139 +17278,322 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 				container = container.childNodes[offset > lastIdx ? lastIdx : offset];

 			}

 

+			// If start text node is excluded then walk to the next node

+			if (container.nodeType === 3 && start && offset >= container.nodeValue.length) {

+				container = new TreeWalker(container, ed.getBody()).next() || container;

+			}

+

+			// If end text node is excluded then walk to the previous node

+			if (container.nodeType === 3 && !start && offset === 0) {

+				container = new TreeWalker(container, ed.getBody()).prev() || container;

+			}

+

 			return container;

 		};

 

 		function performCaretAction(type, name, vars) {

-			var i, currentPendingFormats = pendingFormats[type],

-				otherPendingFormats = pendingFormats[type == 'apply' ? 'remove' : 'apply'];

+			var caretContainerId = '_mce_caret', debug = ed.settings.caret_debug;

+

+			// Creates a caret container bogus element

+			function createCaretContainer(fill) {

+				var caretContainer = dom.create('span', {id: caretContainerId, 'data-mce-bogus': true, style: debug ? 'color:red' : ''});

 

-			function hasPending() {

-				return pendingFormats.apply.length || pendingFormats.remove.length;

+				if (fill) {

+					caretContainer.appendChild(ed.getDoc().createTextNode(INVISIBLE_CHAR));

+				}

+

+				return caretContainer;

 			};

 

-			function resetPending() {

-				pendingFormats.apply = [];

-				pendingFormats.remove = [];

+			function isCaretContainerEmpty(node, nodes) {

+				while (node) {

+					if ((node.nodeType === 3 && node.nodeValue !== INVISIBLE_CHAR) || node.childNodes.length > 1) {

+						return false;

+					}

+

+					// Collect nodes

+					if (nodes && node.nodeType === 1) {

+						nodes.push(node);

+					}

+

+					node = node.firstChild;

+				}

+

+				return true;

 			};

+			

+			// Returns any parent caret container element

+			function getParentCaretContainer(node) {

+				while (node) {

+					if (node.id === caretContainerId) {

+						return node;

+					}

 

-			function perform(caret_node) {

-				// Apply pending formats

-				each(pendingFormats.apply.reverse(), function(item) {

-					apply(item.name, item.vars, caret_node);

+					node = node.parentNode;

+				}

+			};

 

-					// Colored nodes should be underlined so that the color of the underline matches the text color.

-					if (item.name === 'forecolor' && item.vars.value)

-						processUnderlineAndColor(caret_node.parentNode);

-				});

+			// Finds the first text node in the specified node

+			function findFirstTextNode(node) {

+				var walker;

 

-				// Remove pending formats

-				each(pendingFormats.remove.reverse(), function(item) {

-					remove(item.name, item.vars, caret_node);

-				});

+				if (node) {

+					walker = new TreeWalker(node, node);

 

-				dom.remove(caret_node, 1);

-				resetPending();

+					for (node = walker.current(); node; node = walker.next()) {

+						if (node.nodeType === 3) {

+							return node;

+						}

+					}

+				}

+			};

+

+			// Removes the caret container for the specified node or all on the current document

+			function removeCaretContainer(node, move_caret) {

+				var child, rng;

+

+				if (!node) {

+					node = getParentCaretContainer(selection.getStart());

+

+					if (!node) {

+						while (node = dom.get(caretContainerId)) {

+							removeCaretContainer(node, false);

+						}

+					}

+				} else {

+					rng = selection.getRng(true);

+

+					if (isCaretContainerEmpty(node)) {

+						if (move_caret !== false) {

+							rng.setStartBefore(node);

+							rng.setEndBefore(node);

+						}

+

+						dom.remove(node);

+					} else {

+						child = findFirstTextNode(node);

+

+						if (child.nodeValue.charAt(0) === INVISIBLE_CHAR) {

+							child = child.deleteData(0, 1);

+						}

+

+						dom.remove(node, 1);

+					}

+

+					selection.setRng(rng);

+				}

+			};

+			

+			// Applies formatting to the caret postion

+			function applyCaretFormat() {

+				var rng, caretContainer, textNode, offset, bookmark, container, text;

+

+				rng = selection.getRng(true);

+				offset = rng.startOffset;

+				container = rng.startContainer;

+				text = container.nodeValue;

+

+				caretContainer = getParentCaretContainer(selection.getStart());

+				if (caretContainer) {

+					textNode = findFirstTextNode(caretContainer);

+				}

+

+				// Expand to word is caret is in the middle of a text node and the char before/after is a alpha numeric character

+				if (text && offset > 0 && offset < text.length && /\w/.test(text.charAt(offset)) && /\w/.test(text.charAt(offset - 1))) {

+					// Get bookmark of caret position

+					bookmark = selection.getBookmark();

+

+					// Collapse bookmark range (WebKit)

+					rng.collapse(true);

+

+					// Expand the range to the closest word and split it at those points

+					rng = expandRng(rng, get(name));

+					rng = rangeUtils.split(rng);

+

+					// Apply the format to the range

+					apply(name, vars, rng);

+

+					// Move selection back to caret position

+					selection.moveToBookmark(bookmark);

+				} else {

+					if (!caretContainer || textNode.nodeValue !== INVISIBLE_CHAR) {

+						caretContainer = createCaretContainer(true);

+						textNode = caretContainer.firstChild;

+

+						rng.insertNode(caretContainer);

+						offset = 1;

+

+						apply(name, vars, caretContainer);

+					} else {

+						apply(name, vars, caretContainer);

+					}

+

+					// Move selection to text node

+					selection.setCursorLocation(textNode, offset);

+				}

 			};

 

-			// Check if it already exists then ignore it

-			for (i = currentPendingFormats.length - 1; i >= 0; i--) {

-				if (currentPendingFormats[i].name == name)

+			function removeCaretFormat() {

+				var rng = selection.getRng(true), container, offset, bookmark,

+					hasContentAfter, node, formatNode, parents = [], i, caretContainer;

+

+				container = rng.startContainer;

+				offset = rng.startOffset;

+				node = container;

+

+				if (container.nodeType == 3) {

+					if (offset != container.nodeValue.length || container.nodeValue === INVISIBLE_CHAR) {

+						hasContentAfter = true;

+					}

+

+					node = node.parentNode;

+				}

+

+				while (node) {

+					if (matchNode(node, name, vars)) {

+						formatNode = node;

+						break;

+					}

+

+					if (node.nextSibling) {

+						hasContentAfter = true;

+					}

+

+					parents.push(node);

+					node = node.parentNode;

+				}

+

+				// Node doesn't have the specified format

+				if (!formatNode) {

 					return;

-			}

+				}

 

-			currentPendingFormats.push({name : name, vars : vars});

+				// Is there contents after the caret then remove the format on the element

+				if (hasContentAfter) {

+					// Get bookmark of caret position

+					bookmark = selection.getBookmark();

 

-			// Check if it's in the other type, then remove it

-			for (i = otherPendingFormats.length - 1; i >= 0; i--) {

-				if (otherPendingFormats[i].name == name)

-					otherPendingFormats.splice(i, 1);

-			}

+					// Collapse bookmark range (WebKit)

+					rng.collapse(true);

 

-			// Pending apply or remove formats

-			if (hasPending()) {

-				ed.getDoc().execCommand('FontName', false, 'mceinline');

-				pendingFormats.lastRng = selection.getRng();

+					// Expand the range to the closest word and split it at those points

+					rng = expandRng(rng, get(name), true);

+					rng = rangeUtils.split(rng);

 

-				// IE will convert the current word

-				each(dom.select('font,span'), function(node) {

-					var bookmark;

+					// Remove the format from the range

+					remove(name, vars, rng);

 

-					if (isCaretNode(node)) {

-						bookmark = selection.getBookmark();

-						perform(node);

-						selection.moveToBookmark(bookmark);

-						ed.nodeChanged();

+					// Move selection back to caret position

+					selection.moveToBookmark(bookmark);

+				} else {

+					caretContainer = createCaretContainer();

+

+					node = caretContainer;

+					for (i = parents.length - 1; i >= 0; i--) {

+						node.appendChild(dom.clone(parents[i], false));

+						node = node.firstChild;

 					}

-				});

 

-				// Only register listeners once if we need to

-				if (!pendingFormats.isListening && hasPending()) {

-					pendingFormats.isListening = true;

-					function performPendingFormat(node, textNode) {

-						var rng = dom.createRng();

-						perform(node);

+					// Insert invisible character into inner most format element

+					node.appendChild(dom.doc.createTextNode(INVISIBLE_CHAR));

+					node = node.firstChild;

 

-						rng.setStart(textNode, textNode.nodeValue.length);

-						rng.setEnd(textNode, textNode.nodeValue.length);

-						selection.setRng(rng);

-						ed.nodeChanged();

+					// Insert caret container after the formated node

+					dom.insertAfter(caretContainer, formatNode);

+

+					// Move selection to text node

+					selection.setCursorLocation(node, 1);

+				}

+			};

+

+			// Only bind the caret events once

+			if (!self._hasCaretEvents) {

+				// Mark current caret container elements as bogus when getting the contents so we don't end up with empty elements

+				ed.onBeforeGetContent.addToTop(function() {

+					var nodes = [], i;

+

+					if (isCaretContainerEmpty(getParentCaretContainer(selection.getStart()), nodes)) {

+						// Mark children

+						i = nodes.length;

+						while (i--) {

+							dom.setAttrib(nodes[i], 'data-mce-bogus', '1');

+						}

 					}

-					var enterKeyPressed = false;

+				});

 

-					each('onKeyDown,onKeyUp,onKeyPress,onMouseUp'.split(','), function(event) {

-						ed[event].addToTop(function(ed, e) {

-							if (e.keyCode==13 && !e.shiftKey) {

-								enterKeyPressed = true;

-								return;

-							}

-							// Do we have pending formats and is the selection moved has moved

-							if (hasPending() && !tinymce.dom.RangeUtils.compareRanges(pendingFormats.lastRng, selection.getRng())) {

-								var foundCaret = false;

-								each(dom.select('font,span'), function(node) {

-									var textNode, rng;

-

-									// Look for marker

-									if (isCaretNode(node)) {

-										foundCaret = true;

-										textNode = node.firstChild;

-

-										// Find the first text node within node

-										while (textNode && textNode.nodeType != 3)

-											textNode = textNode.firstChild;

-

-										if (textNode) 

-											performPendingFormat(node, textNode);

-										else

-											dom.remove(node);

-									}

-								});

-								

-								// no caret - so we are 

-								if (enterKeyPressed && !foundCaret) {

-									var node = selection.getNode();

-									var textNode = node;

-

-									// Find the first text node within node

-									while (textNode && textNode.nodeType != 3)

-										textNode = textNode.firstChild;

-									if (textNode) {

-										node=textNode.parentNode;

-										while (!isBlock(node)){

-											node=node.parentNode;

-										}

-										performPendingFormat(node, textNode);

-									}

-								}

+				// Remove caret container on mouse up and on key up

+				tinymce.each('onMouseUp onKeyUp'.split(' '), function(name) {

+					ed[name].addToTop(function() {

+						removeCaretContainer();

+					});

+				});

 

-								// Always unbind and clear pending styles on keyup

-								if (e.type == 'keyup' || e.type == 'mouseup') {

-									resetPending();

-									enterKeyPressed=false;

-								}

-							}

-						});

+				// Remove caret container on keydown and it's a backspace, enter or left/right arrow keys

+				ed.onKeyDown.addToTop(function(ed, e) {

+					var keyCode = e.keyCode;

+

+					if (keyCode == 8 || keyCode == 37 || keyCode == 39) {

+						removeCaretContainer(getParentCaretContainer(selection.getStart()));

+					}

+				});

+

+				// Remove bogus state if they got filled by contents using editor.selection.setContent

+				selection.onSetContent.add(function() {

+					dom.getParent(selection.getStart(), function(node) {

+						if (node.id !== caretContainerId && dom.getAttrib(node, 'data-mce-bogus') && !dom.isEmpty(node)) {

+							dom.setAttrib(node, 'data-mce-bogus', null);

+						}

 					});

+				});

+

+				self._hasCaretEvents = true;

+			}

+

+			// Do apply or remove caret format

+			if (type == "apply") {

+				applyCaretFormat();

+			} else {

+				removeCaretFormat();

+			}

+		};

+

+		function moveStart(rng) {

+			var container = rng.startContainer,

+					offset = rng.startOffset, isAtEndOfText,

+					walker, node, nodes, tmpNode;

+

+			// Convert text node into index if possible

+			if (container.nodeType == 3 && offset >= container.nodeValue.length) {

+				// Get the parent container location and walk from there

+				offset = nodeIndex(container);

+				container = container.parentNode;

+				isAtEndOfText = true;

+			}

+

+			// Move startContainer/startOffset in to a suitable node

+			if (container.nodeType == 1) {

+				nodes = container.childNodes;

+				container = nodes[Math.min(offset, nodes.length - 1)];

+				walker = new TreeWalker(container, dom.getParent(container, dom.isBlock));

+

+				// If offset is at end of the parent node walk to the next one

+				if (offset > nodes.length - 1 || isAtEndOfText)

+					walker.next();

+

+				for (node = walker.current(); node; node = walker.next()) {

+					if (node.nodeType == 3 && !isWhiteSpaceNode(node)) {

+						// IE has a "neat" feature where it moves the start node into the closest element

+						// we can avoid this by inserting an element before it and then remove it after we set the selection

+						tmpNode = dom.create('a', null, INVISIBLE_CHAR);

+						node.parentNode.insertBefore(tmpNode, node);

+

+						// Set selection and remove tmpNode

+						rng.setStart(node, 0);

+						selection.setRng(rng);

+						dom.remove(tmpNode);

+

+						return;

+					}

 				}

 			}

 		};

@@ -16423,17 +17603,27 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 tinymce.onAddEditor.add(function(tinymce, ed) {

 	var filters, fontSizes, dom, settings = ed.settings;

 

-	if (settings.inline_styles) {

-		fontSizes = tinymce.explode(settings.font_size_style_values);

+	function replaceWithSpan(node, styles) {

+		tinymce.each(styles, function(value, name) {

+			if (value)

+				dom.setStyle(node, name, value);

+		});

 

-		function replaceWithSpan(node, styles) {

-			tinymce.each(styles, function(value, name) {

-				if (value)

-					dom.setStyle(node, name, value);

+		dom.rename(node, 'span');

+	};

+

+	function convert(editor, params) {

+		dom = editor.dom;

+

+		if (settings.convert_fonts_to_spans) {

+			tinymce.each(dom.select('font,u,strike', params.node), function(node) {

+				filters[node.nodeName.toLowerCase()](ed.dom, node);

 			});

+		}

+	};

 

-			dom.rename(node, 'span');

-		};

+	if (settings.inline_styles) {

+		fontSizes = tinymce.explode(settings.font_size_legacy_values);

 

 		filters = {

 			font : function(dom, node) {

@@ -16441,7 +17631,7 @@ tinymce.onAddEditor.add(function(tinymce, ed) {
 					backgroundColor : node.style.backgroundColor,

 					color : node.color,

 					fontFamily : node.face,

-					fontSize : fontSizes[parseInt(node.size) - 1]

+					fontSize : fontSizes[parseInt(node.size, 10) - 1]

 				});

 			},

 

@@ -16458,16 +17648,6 @@ tinymce.onAddEditor.add(function(tinymce, ed) {
 			}

 		};

 

-		function convert(editor, params) {

-			dom = editor.dom;

-

-			if (settings.convert_fonts_to_spans) {

-				tinymce.each(dom.select('font,u,strike', params.node), function(node) {

-					filters[node.nodeName.toLowerCase()](ed.dom, node);

-				});

-			}

-		};

-

 		ed.onPreProcess.add(convert);

 		ed.onSetContent.add(convert);

 

@@ -16477,3 +17657,462 @@ tinymce.onAddEditor.add(function(tinymce, ed) {
 	}

 });

 

+(function(tinymce) {

+	var TreeWalker = tinymce.dom.TreeWalker;

+

+	tinymce.EnterKey = function(editor) {

+		var dom = editor.dom, selection = editor.selection, settings = editor.settings, undoManager = editor.undoManager;

+

+		function handleEnterKey(evt) {

+			var rng = selection.getRng(true), tmpRng, editableRoot, container, offset, parentBlock, documentMode,

+				newBlock, fragment, containerBlock, parentBlockName, containerBlockName, newBlockName, isAfterLastNodeInContainer;

+

+			// Returns true if the block can be split into two blocks or not

+			function canSplitBlock(node) {

+				return node &&

+					dom.isBlock(node) &&

+					!/^(TD|TH|CAPTION)$/.test(node.nodeName) &&

+					!/^(fixed|absolute)/i.test(node.style.position) && 

+					dom.getContentEditable(node) !== "true";

+			};

+

+			// Moves the caret to a suitable position within the root for example in the first non pure whitespace text node or before an image

+			function moveToCaretPosition(root) {

+				var walker, node, rng, y, viewPort, lastNode = root, tempElm;

+

+				rng = dom.createRng();

+

+				if (root.hasChildNodes()) {

+					walker = new TreeWalker(root, root);

+

+					while (node = walker.current()) {

+						if (node.nodeType == 3) {

+							rng.setStart(node, 0);

+							rng.setEnd(node, 0);

+							break;

+						}

+

+						if (/^(BR|IMG)$/.test(node.nodeName)) {

+							rng.setStartBefore(node);

+							rng.setEndBefore(node);

+							break;

+						}

+

+						lastNode = node;

+						node = walker.next();

+					}

+

+					if (!node) {

+						rng.setStart(lastNode, 0);

+						rng.setEnd(lastNode, 0);

+					}

+				} else {

+					if (root.nodeName == 'BR') {

+						if (root.nextSibling && dom.isBlock(root.nextSibling)) {

+							// Trick on older IE versions to render the caret before the BR between two lists

+							if (!documentMode || documentMode < 9) {

+								tempElm = dom.create('br');

+								root.parentNode.insertBefore(tempElm, root);

+							}

+

+							rng.setStartBefore(root);

+							rng.setEndBefore(root);

+						} else {

+							rng.setStartAfter(root);

+							rng.setEndAfter(root);

+						}

+					} else {

+						rng.setStart(root, 0);

+						rng.setEnd(root, 0);

+					}

+				}

+

+				selection.setRng(rng);

+

+				// Remove tempElm created for old IE:s

+				dom.remove(tempElm);

+

+				viewPort = dom.getViewPort(editor.getWin());

+

+				// 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

+				y = dom.getPos(root).y;

+				if (y < viewPort.y || y + 25 > viewPort.y + viewPort.h) {

+					editor.getWin().scrollTo(0, y < viewPort.y ? y : y - viewPort.h + 25); // Needs to be hardcoded to roughly one line of text if a huge text block is broken into two blocks

+				}

+			};

+

+			// Creates a new block element by cloning the current one or creating a new one if the name is specified

+			// This function will also copy any text formatting from the parent block and add it to the new one

+			function createNewBlock(name) {

+				var node = container, block, clonedNode, caretNode;

+

+				block = name || parentBlockName == "TABLE" ? dom.create(name || newBlockName) : parentBlock.cloneNode(false);

+				caretNode = block;

+

+				// Clone any parent styles

+				if (settings.keep_styles !== false) {

+					do {

+						if (/^(SPAN|STRONG|B|EM|I|FONT|STRIKE|U)$/.test(node.nodeName)) {

+							clonedNode = node.cloneNode(false);

+							dom.setAttrib(clonedNode, 'id', ''); // Remove ID since it needs to be document unique

+

+							if (block.hasChildNodes()) {

+								clonedNode.appendChild(block.firstChild);

+								block.appendChild(clonedNode);

+							} else {

+								caretNode = clonedNode;

+								block.appendChild(clonedNode);

+							}

+						}

+					} while (node = node.parentNode);

+				}

+

+				// BR is needed in empty blocks on non IE browsers

+				if (!tinymce.isIE) {

+					caretNode.innerHTML = '<br>';

+				}

+

+				return block;

+			};

+

+			// Returns true/false if the caret is at the start/end of the parent block element

+			function isCaretAtStartOrEndOfBlock(start) {

+				var walker, node, name;

+

+				// Caret is in the middle of a text node like "a|b"

+				if (container.nodeType == 3 && (start ? offset > 0 : offset < container.nodeValue.length)) {

+					return false;

+				}

+

+				// If after the last element in block node edge case for #5091

+				if (container.parentNode == parentBlock && isAfterLastNodeInContainer && !start) {

+					return true;

+				}

+

+				// Caret can be before/after a table

+				if (container.nodeName === "TABLE" || (container.previousSibling && container.previousSibling.nodeName == "TABLE")) {

+					return (isAfterLastNodeInContainer && !start) || (!isAfterLastNodeInContainer && start);

+				}

+

+				// Walk the DOM and look for text nodes or non empty elements

+				walker = new TreeWalker(container, parentBlock);

+				while (node = (start ? walker.prev() : walker.next())) {

+					if (node.nodeType === 1) {

+						// Ignore bogus elements

+						if (node.getAttribute('data-mce-bogus')) {

+							continue;

+						}

+

+						// Keep empty elements like <img />

+						name = node.nodeName.toLowerCase();

+						if (name === 'IMG') {

+							return false;

+						}

+					} else if (node.nodeType === 3 && !/^[ \t\r\n]*$/.test(node.nodeValue)) {

+						return false;

+					}

+				}

+

+				return true;

+			};

+

+			// Wraps any text nodes or inline elements in the specified forced root block name

+			function wrapSelfAndSiblingsInDefaultBlock(container, offset) {

+				var newBlock, parentBlock, startNode, node, next, blockName = newBlockName || 'P';

+

+				// Not in a block element or in a table cell or caption

+				parentBlock = dom.getParent(container, dom.isBlock);

+				if (!parentBlock || !canSplitBlock(parentBlock)) {

+					parentBlock = parentBlock || editableRoot;

+

+					if (!parentBlock.hasChildNodes()) {

+						newBlock = dom.create(blockName);

+						parentBlock.appendChild(newBlock);

+						rng.setStart(newBlock, 0);

+						rng.setEnd(newBlock, 0);

+						return newBlock;

+					}

+

+					// Find parent that is the first child of parentBlock

+					node = container;

+					while (node.parentNode != parentBlock) {

+						node = node.parentNode;

+					}

+

+					// Loop left to find start node start wrapping at

+					while (node && !dom.isBlock(node)) {

+						startNode = node;

+						node = node.previousSibling;

+					}

+

+					if (startNode) {

+						newBlock = dom.create(blockName);

+						startNode.parentNode.insertBefore(newBlock, startNode);

+

+						// Start wrapping until we hit a block

+						node = startNode;

+						while (node && !dom.isBlock(node)) {

+							next = node.nextSibling;

+							newBlock.appendChild(node);

+							node = next;

+						}

+

+						// Restore range to it's past location

+						rng.setStart(container, offset);

+						rng.setEnd(container, offset);

+					}

+				}

+

+				return container;

+			};

+

+			// Inserts a block or br before/after or in the middle of a split list of the LI is empty

+			function handleEmptyListItem() {

+				function isFirstOrLastLi(first) {

+					var node = containerBlock[first ? 'firstChild' : 'lastChild'];

+

+					// Find first/last element since there might be whitespace there

+					while (node) {

+						if (node.nodeType == 1) {

+							break;

+						}

+

+						node = node[first ? 'nextSibling' : 'previousSibling'];

+					}

+

+					return node === parentBlock;

+				};

+

+				newBlock = newBlockName ? createNewBlock(newBlockName) : dom.create('BR');

+

+				if (isFirstOrLastLi(true) && isFirstOrLastLi()) {

+					// Is first and last list item then replace the OL/UL with a text block

+					dom.replace(newBlock, containerBlock);

+				} else if (isFirstOrLastLi(true)) {

+					// First LI in list then remove LI and add text block before list

+					containerBlock.parentNode.insertBefore(newBlock, containerBlock);

+				} else if (isFirstOrLastLi()) {

+					// Last LI in list then temove LI and add text block after list

+					dom.insertAfter(newBlock, containerBlock);

+				} else {

+					// Middle LI in list the split the list and insert a text block in the middle

+					// Extract after fragment and insert it after the current block

+					tmpRng = rng.cloneRange();

+					tmpRng.setStartAfter(parentBlock);

+					tmpRng.setEndAfter(containerBlock);

+					fragment = tmpRng.extractContents();

+					dom.insertAfter(fragment, containerBlock);

+					dom.insertAfter(newBlock, containerBlock);

+				}

+

+				dom.remove(parentBlock);

+				moveToCaretPosition(newBlock);

+				undoManager.add();

+			};

+

+			// Walks the parent block to the right and look for BR elements

+			function hasRightSideBr() {

+				var walker = new TreeWalker(container, parentBlock), node;

+

+				while (node = walker.current()) {

+					if (node.nodeName == 'BR') {

+						return true;

+					}

+

+					node = walker.next();

+				}

+			}

+			

+			// Inserts a BR element if the forced_root_block option is set to false or empty string

+			function insertBr() {

+				var brElm, extraBr;

+

+				if (container && container.nodeType == 3 && offset >= container.nodeValue.length) {

+					// Insert extra BR element at the end block elements

+					if (!tinymce.isIE && !hasRightSideBr()) {

+						brElm = dom.create('br')

+						rng.insertNode(brElm);

+						rng.setStartAfter(brElm);

+						rng.setEndAfter(brElm);

+						extraBr = true;

+					}

+				}

+

+				brElm = dom.create('br');

+				rng.insertNode(brElm);

+

+				// Rendering modes below IE8 doesn't display BR elements in PRE unless we have a \n before it

+				if (tinymce.isIE && parentBlockName == 'PRE' && (!documentMode || documentMode < 8)) {

+					brElm.parentNode.insertBefore(dom.doc.createTextNode('\r'), brElm);

+				}

+

+				if (!extraBr) {

+					rng.setStartAfter(brElm);

+					rng.setEndAfter(brElm);

+				} else {

+					rng.setStartBefore(brElm);

+					rng.setEndBefore(brElm);

+				}

+

+				selection.setRng(rng);

+				undoManager.add();

+			};

+

+			// Trims any linebreaks at the beginning of node user for example when pressing enter in a PRE element

+			function trimLeadingLineBreaks(node) {

+				do {

+					if (node.nodeType === 3) {

+						node.nodeValue = node.nodeValue.replace(/^[\r\n]+/, '');

+					}

+

+					node = node.firstChild;

+				} while (node);

+			};

+

+			function getEditableRoot(node) {

+				var root = dom.getRoot(), parent, editableRoot;

+

+				// Get all parents until we hit a non editable parent or the root

+				parent = node;

+				while (parent !== root && dom.getContentEditable(parent) !== "false") {

+					if (dom.getContentEditable(parent) === "true") {

+						editableRoot = parent;

+					}

+

+					parent = parent.parentNode;

+				}

+				

+				return parent !== root ? editableRoot : root;

+			};

+

+			// Delete any selected contents

+			if (!rng.collapsed) {

+				editor.execCommand('Delete');

+				return;

+			}

+

+			// Event is blocked by some other handler for example the lists plugin

+			if (evt.isDefaultPrevented()) {

+				return;

+			}

+

+			// Setup range items and newBlockName

+			container = rng.startContainer;

+			offset = rng.startOffset;

+			newBlockName = settings.forced_root_block;

+			newBlockName = newBlockName ? newBlockName.toUpperCase() : '';

+			documentMode = dom.doc.documentMode;

+

+			// Resolve node index

+			if (container.nodeType == 1 && container.hasChildNodes()) {

+				isAfterLastNodeInContainer = offset > container.childNodes.length - 1;

+				container = container.childNodes[Math.min(offset, container.childNodes.length - 1)] || container;

+				offset = 0;

+			}

+

+			// Get editable root node normaly the body element but sometimes a div or span

+			editableRoot = getEditableRoot(container);

+

+			// If there is no editable root then enter is done inside a contentEditable false element

+			if (!editableRoot) {

+				return;

+			}

+

+			undoManager.beforeChange();

+

+			// If editable root isn't block nor the root of the editor

+			if (!dom.isBlock(editableRoot) && editableRoot != dom.getRoot()) {

+				if (!newBlockName || evt.shiftKey) {

+					insertBr();

+				}

+

+				return;

+			}

+

+			// Wrap the current node and it's sibling in a default block if it's needed.

+			// for example this <td>text|<b>text2</b></td> will become this <td><p>text|<b>text2</p></b></td>

+			// This won't happen if root blocks are disabled or the shiftKey is pressed

+			if ((newBlockName && !evt.shiftKey) || (!newBlockName && evt.shiftKey)) {

+				container = wrapSelfAndSiblingsInDefaultBlock(container, offset);

+			}

+

+			// Find parent block and setup empty block paddings

+			parentBlock = dom.getParent(container, dom.isBlock);

+			containerBlock = parentBlock ? dom.getParent(parentBlock.parentNode, dom.isBlock) : null;

+

+			// Setup block names

+			parentBlockName = parentBlock ? parentBlock.nodeName.toUpperCase() : ''; // IE < 9 & HTML5

+			containerBlockName = containerBlock ? containerBlock.nodeName.toUpperCase() : ''; // IE < 9 & HTML5

+

+			// Handle enter inside an empty list item

+			if (parentBlockName == 'LI' && dom.isEmpty(parentBlock)) {

+				// Let the list plugin or browser handle nested lists for now

+				if (/^(UL|OL|LI)$/.test(containerBlock.parentNode.nodeName)) {

+					return false;

+				}

+

+				handleEmptyListItem();

+				return;

+			}

+

+			// Don't split PRE tags but insert a BR instead easier when writing code samples etc

+			if (parentBlockName == 'PRE' && settings.br_in_pre !== false) {

+				if (!evt.shiftKey) {

+					insertBr();

+					return;

+				}

+			} else {

+				// If no root block is configured then insert a BR by default or if the shiftKey is pressed

+				if ((!newBlockName && !evt.shiftKey && parentBlockName != 'LI') || (newBlockName && evt.shiftKey)) {

+					insertBr();

+					return;

+				}

+			}

+

+			// Default block name if it's not configured

+			newBlockName = newBlockName || 'P';

+

+			// Insert new block before/after the parent block depending on caret location

+			if (isCaretAtStartOrEndOfBlock()) {

+				// If the caret is at the end of a header we produce a P tag after it similar to Word unless we are in a hgroup

+				if (/^(H[1-6]|PRE)$/.test(parentBlockName) && containerBlockName != 'HGROUP') {

+					newBlock = createNewBlock(newBlockName);

+				} else {

+					newBlock = createNewBlock();

+				}

+

+				// Split the current container block element if enter is pressed inside an empty inner block element

+				if (settings.end_container_on_empty_block && canSplitBlock(containerBlock) && dom.isEmpty(parentBlock)) {

+					// Split container block for example a BLOCKQUOTE at the current blockParent location for example a P

+					newBlock = dom.split(containerBlock, parentBlock);

+				} else {

+					dom.insertAfter(newBlock, parentBlock);

+				}

+			} else if (isCaretAtStartOrEndOfBlock(true)) {

+				// Insert new block before

+				newBlock = parentBlock.parentNode.insertBefore(createNewBlock(), parentBlock);

+			} else {

+				// Extract after fragment and insert it after the current block

+				tmpRng = rng.cloneRange();

+				tmpRng.setEndAfter(parentBlock);

+				fragment = tmpRng.extractContents();

+				trimLeadingLineBreaks(fragment);

+				newBlock = fragment.firstChild;

+				dom.insertAfter(fragment, parentBlock);

+			}

+

+			dom.setAttrib(newBlock, 'id', ''); // Remove ID since it needs to be document unique

+			moveToCaretPosition(newBlock);

+			undoManager.add();

+		}

+

+		editor.onKeyDown.add(function(ed, evt) {

+			if (evt.keyCode == 13) {

+				if (handleEnterKey(evt) !== false) {

+					evt.preventDefault();

+				}

+			}

+		});

+	};

+})(tinymce);

+