tinymce-rails 3.5b3 → 3.5

data/vendor/assets/javascripts/tinymce/tiny_mce_src.js

@@ -6,9 +6,9 @@
 	var tinymce = {
 		majorVersion : '3',
 
-		minorVersion : '5b3',
+		minorVersion : '5',
 
-		releaseDate : '2012-03-29',
+		releaseDate : '2012-05-03',
 
 		_init : function() {
 			var t = this, d = document, na = navigator, ua = na.userAgent, i, nl, n, base, p, v;
@@ -506,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.length > 0 ? a : [c.scope]);
+		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;
 	}
 
 	});
@@ -1134,12 +1146,8 @@ tinymce.util.Quirks = function(editor) {
 		editor.onKeyDown.add(function(editor, e) {
 			var isDelete;
 
-			if (e.isDefaultPrevented()) {
-				return;
-			}
-
 			isDelete = e.keyCode == DELETE;
-			if ((isDelete || e.keyCode == BACKSPACE) && !VK.modifierPressed(e)) {
+			if (!e.isDefaultPrevented() && (isDelete || e.keyCode == BACKSPACE) && !VK.modifierPressed(e)) {
 				e.preventDefault();
 				removeMergedFormatSpans(isDelete);
 			}
@@ -1147,33 +1155,73 @@ tinymce.util.Quirks = function(editor) {
 
 		editor.addCommand('Delete', function() {removeMergedFormatSpans();});
 	};
-
+	
 	function emptyEditorWhenDeleting() {
-		function serializeRng(rng) {
-			var body = dom.create("body");
-			var contents = rng.cloneContents();
-			body.appendChild(contents);
-			return selection.serializer.serialize(body, {format: 'html'});
-		}
+		function getEndPointNode(rng, start) {
+			var container, offset, prefix = start ? 'start' : 'end';
 
-		function allContentsSelected(rng) {
-			var selection = serializeRng(rng);
+			container = rng[prefix + 'Container'];
+			offset = rng[prefix + 'Offset'];
 
-			var allRng = dom.createRng();
-			allRng.selectNode(editor.getBody());
+			// 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)]
+			}
 
-			var allSelection = serializeRng(allRng);
-			return selection === allSelection;
-		}
+			return container;
+		};
+
+		function isAtStartEndOfBody(rng, start) {
+			var container, offset, root, childNode, prefix = start ? 'start' : 'end', isAfter;
+
+			container = rng[prefix + 'Container'];
+			offset = rng[prefix + 'Offset'];
+			root = dom.getRoot();
+
+			// Resolve indexed container
+			if (container.nodeType == 1) {
+				isAfter = offset >= container.childNodes.length;
+				container = getEndPointNode(rng, start);
+
+				if (container.nodeType == 3) {
+					offset = start && !isAfter ? 0 : container.nodeValue.length;
+				}
+			}
+
+			// Check if start/end is in the middle of text
+			if (container.nodeType == 3 && ((start && offset > 0) || (!start && offset < container.nodeValue.length))) {
+				return false;
+			}
+
+			// 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 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;
+				}
+
+				// 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;
+			}
+
+			return true;
+		};
 
 		editor.onKeyDown.addToTop(function(editor, e) {
-			var keyCode = e.keyCode;
+			var rng, keyCode = e.keyCode;
 
-			if (keyCode == DELETE || keyCode == BACKSPACE) {
-				var rng = selection.getRng(true);
+			if (!e.isDefaultPrevented() && (keyCode == DELETE || keyCode == BACKSPACE)) {
+				rng = selection.getRng(true);
 
-				if (!rng.collapsed && allContentsSelected(rng)) {
-					editor.setContent('', {format : 'raw'});
+				if (isAtStartEndOfBody(rng, true) && isAtStartEndOfBody(rng, false) &&
+					(rng.collapsed || dom.findCommonAncestor(getEndPointNode(rng, true), getEndPointNode(rng)) === dom.getRoot())) {
+					editor.setContent('');
 					editor.nodeChanged();
 					e.preventDefault();
 				}
@@ -1182,14 +1230,25 @@ tinymce.util.Quirks = function(editor) {
 	};
 
 	function inputMethodFocus() {
-		dom.bind(editor.getBody(), 'focusin', function() {
-			selection.setRng(selection.getRng());
-		});
+		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 removeHrOnBackspace() {
 		editor.onKeyDown.add(function(editor, e) {
-			if (e.keyCode === BACKSPACE) {
+			if (!e.isDefaultPrevented() && e.keyCode === BACKSPACE) {
 				if (selection.isCollapsed() && selection.getRng(true).startOffset === 0) {
 					var node = selection.getNode();
 					var previousSibling = node.previousSibling;
@@ -1322,7 +1381,7 @@ tinymce.util.Quirks = function(editor) {
 
 	function disableBackspaceIntoATable() {
 		editor.onKeyDown.add(function(editor, e) {
-			if (e.keyCode === BACKSPACE) {
+			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") {
@@ -1410,12 +1469,8 @@ tinymce.util.Quirks = function(editor) {
 		editor.onKeyDown.add(function(editor, e) {
 			var isDelete, rng, container, offset, brElm, sibling, collapsed;
 
-			if (e.isDefaultPrevented()) {
-				return;
-			}
-
 			isDelete = e.keyCode == DELETE;
-			if ((isDelete || e.keyCode == BACKSPACE) && !VK.modifierPressed(e)) {
+			if (!e.isDefaultPrevented() && (isDelete || e.keyCode == BACKSPACE) && !VK.modifierPressed(e)) {
 				rng = selection.getRng();
 				container = rng.startContainer;
 				offset = rng.startOffset;
@@ -1455,7 +1510,7 @@ tinymce.util.Quirks = function(editor) {
 		editor.onKeyDown.add(function(editor, e) {
 			var rng, container, offset, root, parent;
 
-			if (e.keyCode != VK.BACKSPACE) {
+			if (e.isDefaultPrevented() || e.keyCode != VK.BACKSPACE) {
 				return;
 			}
 
@@ -1469,7 +1524,7 @@ tinymce.util.Quirks = function(editor) {
 				return;
 			}
 
-			while (parent && parent.parentNode.firstChild == parent && parent.parentNode != root) {
+			while (parent && parent.parentNode && parent.parentNode.firstChild == parent && parent.parentNode != root) {
 				parent = parent.parentNode;
 			}
 
@@ -1547,7 +1602,7 @@ tinymce.util.Quirks = function(editor) {
 
 	function deleteImageOnBackSpace() {
 		editor.onKeyDown.add(function(editor, e) {
-			if (e.keyCode == 8 && selection.getNode().nodeName == 'IMG') {
+			if (!e.isDefaultPrevented() && e.keyCode == 8 && selection.getNode().nodeName == 'IMG') {
 				e.preventDefault();
 				editor.undoManager.beforeChange();
 				dom.remove(selection.getNode());
@@ -1559,12 +1614,12 @@ tinymce.util.Quirks = function(editor) {
 	// All browsers
 	disableBackspaceIntoATable();
 	removeBlockQuoteOnBackSpace();
+	emptyEditorWhenDeleting();
 
 	// WebKit
 	if (tinymce.isWebKit) {
 		keepInlineElementOnDeleteBackspace();
 		cleanupStylesWhenDeleting();
-		emptyEditorWhenDeleting();
 		inputMethodFocus();
 		selectControlElements();
 
@@ -1577,7 +1632,6 @@ tinymce.util.Quirks = function(editor) {
 	// IE
 	if (tinymce.isIE) {
 		removeHrOnBackspace();
-		emptyEditorWhenDeleting();
 		ensureBodyHasRoleApplication();
 		addNewLinesBeforeBrInPre();
 		removePreSerializedStylesWhenSelectingControls();
@@ -3459,7 +3513,7 @@ 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 = [], isInWhiteSpacePreservedElement,
-				endWhiteSpaceRegExp, allWhiteSpaceRegExp, whiteSpaceElements, children, nonEmptyElements, rootBlockName;
+				endWhiteSpaceRegExp, allWhiteSpaceRegExp, isAllWhiteSpaceRegExp, whiteSpaceElements, children, nonEmptyElements, rootBlockName;
 
 			args = args || {};
 			matchedNodes = {};
@@ -3474,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;
@@ -3626,10 +3681,12 @@ tinymce.html.Styles = function(settings, schema) {
 					if (elementRule) {
 						if (blockElements[name]) {
 							if (!isInWhiteSpacePreservedElement) {
-								// Trim whitespace at beginning of block
-								for (textNode = node.firstChild; textNode && textNode.type === 3; ) {
+								// 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;
@@ -3638,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;
@@ -3652,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;
+									}
 								}
 							}
 
@@ -4532,7 +4617,11 @@ tinymce.dom = {};
 			return self.bind(target, events instanceof Array ? events.join(' ') : events, func, scope);
 		};
 
-		self.remove = function(target, events, func) {
+		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);
@@ -4540,7 +4629,7 @@ tinymce.dom = {};
 
 			// Old API supported multiple targets
 			if (target instanceof Array) {
-				var i = target;
+				var i = target.length;
 
 				while (i--) {
 					self.remove(target[i], events, func, scope);
@@ -8967,6 +9056,29 @@ window.tinymce.dom.Sizzle = Sizzle;
 				return index;
 			};
 
+			function normalizeTableCellSelection(rng) {
+				function moveEndPoint(start) {
+					var container, offset, childNodes, prefix = start ? 'start' : 'end';
+
+					container = rng[prefix + 'Container'];
+					offset = rng[prefix + 'Offset'];
+
+					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);
+						}
+					}
+				};
+
+				moveEndPoint(true);
+				moveEndPoint();
+
+				return rng;
+			};
+
 			function getLocation() {
 				var rng = t.getRng(true), root = dom.getRoot(), bookmark = {};
 
@@ -9061,13 +9173,8 @@ window.tinymce.dom.Sizzle = Sizzle;
 				if (name == 'IMG')
 					return {name : name, index : findIndex(name, element)};
 
-				// Can't insert a node into the root of document WebKit defaults to document
-				if (rng.startContainer.nodeType == 9) {
-					return;
-				}
-
 				// W3C method
-				rng2 = rng.cloneRange();
+				rng2 = normalizeTableCellSelection(rng.cloneRange());
 
 				// Insert end marker
 				if (!collapsed) {
@@ -9075,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));
 			}
@@ -9299,48 +9407,58 @@ 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) {
@@ -9356,6 +9474,13 @@ window.tinymce.dom.Sizzle = Sizzle;
 					}
 
 					s.addRange(r);
+
+					// 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;
 				}
@@ -9471,12 +9596,41 @@ window.tinymce.dom.Sizzle = Sizzle;
 			return bl;
 		},
 
+		isForward: function(){
+			var dom = this.dom, sel = this.getSel(), anchorRange, focusRange;
+
+			// 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;
+			var self = this, rng, normalized, collapsed, node, sibling;
 
 			function normalizeEndPoint(start) {
 				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) {
@@ -9517,7 +9671,7 @@ window.tinymce.dom.Sizzle = Sizzle;
 
 				// If the container is a document move it to the body element
 				if (container.nodeType === 9) {
-					container = container.body;
+					container = dom.getRoot();
 					offset = 0;
 				}
 
@@ -9540,7 +9694,7 @@ window.tinymce.dom.Sizzle = Sizzle;
 						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 TreeWalker(container, body);
@@ -9572,7 +9726,6 @@ window.tinymce.dom.Sizzle = Sizzle;
 					}
 				}
 
-
 				// Lean the caret to the left if possible
 				if (collapsed) {
 					// So this: <b>x</b><i>|x</i>
@@ -9586,8 +9739,11 @@ window.tinymce.dom.Sizzle = Sizzle;
 					// 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 && container.childNodes[offset] && container.childNodes[offset].nodeName === 'BR') {
-						findTextNodeRelative(true, container.childNodes[offset]);
+					if (container.nodeType === 1) {
+						node = container.childNodes[offset];
+						if(node && node.nodeName === 'BR' && !hasBrBeforeAfter(node) && !hasBrBeforeAfter(node, true)) {
+							findTextNodeRelative(true, container.childNodes[offset]);
+						}
 					}
 				}
 
@@ -9603,9 +9759,6 @@ window.tinymce.dom.Sizzle = Sizzle;
 					rng['set' + (start ? 'Start' : 'End')](container, offset);
 			};
 
-			// TODO:
-			// Retain selection direction.
-
 			// Normalize only on non IE browsers for now
 			if (tinymce.isIE)
 				return;
@@ -9627,7 +9780,7 @@ window.tinymce.dom.Sizzle = Sizzle;
 				}
 
 				//console.log(self.dom.dumpRng(rng));
-				self.setRng(rng);
+				self.setRng(rng, self.isForward());
 			}
 		},
 
@@ -9771,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);
 			}
 		});
@@ -10851,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});
@@ -11397,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
 			});
 
@@ -13515,7 +13668,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 		},
 
 		hide : function() {
-			var self = this, doc = t.getDoc();
+			var self = this, doc = self.getDoc();
 
 			// Fixed bug where IE has a blinking cursor left from the editor
 			if (isIE && doc)
@@ -14642,9 +14795,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 			// Override justify commands
 			'JustifyLeft,JustifyCenter,JustifyRight,JustifyFull' : function(command) {
 				var name = 'align' + command.substring(7);
-				// Use Formatter.matchNode instead of Formatter.match so that we don't match on parent node. This fixes bug where for both left
-				// and right align buttons can be active. This could occur when selected nodes have align right and the parent has align left.
-				var nodes = selection.isCollapsed() ? [selection.getNode()] : selection.getSelectedBlocks();
+				var nodes = selection.isCollapsed() ? [dom.getParent(selection.getNode(), dom.isBlock)] : selection.getSelectedBlocks();
 				var matches = tinymce.map(nodes, function(node) {
 					return !!formatter.matchNode(node, name);
 				});
@@ -14926,7 +15077,7 @@ tinymce.ForceBlocks = function(editor) {
 	var settings = editor.settings, dom = editor.dom, selection = editor.selection, blockElements = editor.schema.getBlockElements();
 
 	function addRootBlocks() {
-		var node = selection.getStart(), rootNode = editor.getBody(), rng, startContainer, startOffset, endContainer, endOffset, rootBlockNode, tempNode, offset = -0xFFFFFF;
+		var node = selection.getStart(), rootNode = editor.getBody(), rng, startContainer, startOffset, endContainer, endOffset, rootBlockNode, tempNode, offset = -0xFFFFFF, wrapped;
 
 		if (!node || node.nodeType !== 1 || !settings.forced_root_block)
 			return;
@@ -14972,6 +15123,7 @@ tinymce.ForceBlocks = function(editor) {
 				if (!rootBlockNode) {
 					rootBlockNode = dom.create(settings.forced_root_block);
 					node.parentNode.insertBefore(rootBlockNode, node);
+					wrapped = true;
 				}
 
 				tempNode = node;
@@ -15003,13 +15155,16 @@ tinymce.ForceBlocks = function(editor) {
 			}
 		}
 
-		editor.nodeChanged();
+		// Only trigger nodeChange when we wrapped nodes to prevent a forever loop
+		if (wrapped) {
+			editor.nodeChanged();
+		}
 	};
 
 	// Force root blocks
 	if (settings.forced_root_block) {
 		editor.onKeyUp.add(addRootBlocks);
-		editor.onClick.add(addRootBlocks);
+		editor.onNodeChange.add(addRootBlocks);
 	}
 };
 
@@ -15105,6 +15260,8 @@ tinymce.ForceBlocks = function(editor) {
 			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);
@@ -16218,9 +16375,8 @@ tinymce.ForceBlocks = function(editor) {
 					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
-						node = startContainer.firstChild;
-						if (startContainer.nodeName == "TD" && node) {
-							startContainer = node;
+						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
@@ -17381,6 +17537,15 @@ tinymce.ForceBlocks = function(editor) {
 					}
 				});
 
+				// 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;
 			}