Index: src/wp-admin/js/editor.js
===================================================================
--- src/wp-admin/js/editor.js	(revision 32508)
+++ src/wp-admin/js/editor.js	(working copy)
@@ -1,38 +1,27 @@
-/* global tinymce, tinyMCEPreInit, QTags, setUserSetting */
 
-window.switchEditors = {
+( function( $ ) {
+	function switchEditors() {
+		var tinymce, mce$, exports;
 
-	switchto: function( el ) {
-		var aid = el.id,
-			l = aid.length,
-			id = aid.substr( 0, l - 5 ),
-			mode = aid.substr( l - 4 );
+		function init() {
+			if ( ! tinymce && window.tinymce ) {
+				tinymce = window.tinymce;
+				mce$ = tinymce.$;
 
-		this.go( id, mode );
-	},
+				mce$( document ).on( 'click', function( event ) {
+					var id, mode, target = mce$( event.target );
 
-	// mode can be 'html', 'tmce', or 'toggle'; 'html' is used for the 'Text' editor tab.
-	go: function( id, mode ) {
-		var t = this, ed, wrap_id, txtarea_el, iframe, editorHeight, toolbarHeight,
-			DOM = tinymce.DOM; //DOMUtils outside the editor iframe
-
-		id = id || 'content';
-		mode = mode || 'toggle';
-
-		ed = tinymce.get( id );
-		wrap_id = 'wp-' + id + '-wrap';
-		txtarea_el = DOM.get( id );
-
-		if ( 'toggle' === mode ) {
-			if ( ed && ! ed.isHidden() ) {
-				mode = 'html';
-			} else {
-				mode = 'tmce';
+					if ( target.hasClass( 'wp-switch-editor' ) ) {
+						id = target.attr( 'data-wp-editor-id' );
+						mode = target.hasClass( 'switch-tmce' ) ? 'tmce' : 'html';
+						switchEditor( id, mode );
+					}
+				});
 			}
 		}
 
-		function getToolbarHeight() {
-			var node = DOM.select( '.mce-toolbar-grp', ed.getContainer() )[0],
+		function getToolbarHeight( editor ) {
+			var node = mce$( '.mce-toolbar-grp', editor.getContainer() )[0],
 				height = node && node.clientHeight;
 
 			if ( height && height > 10 && height < 200 ) {
@@ -42,283 +31,317 @@
 			return 30;
 		}
 
-		if ( 'tmce' === mode || 'tinymce' === mode ) {
-			if ( ed && ! ed.isHidden() ) {
-				return false;
-			}
+		function switchEditor( id, mode ) {
+			id = id || 'content';
+			mode = mode || 'toggle';
 
-			if ( typeof( QTags ) !== 'undefined' ) {
-				QTags.closeAllTags( id );
+			var editorHeight, toolbarHeight, iframe,
+				editor = tinymce.get( id ),
+				wrap = mce$( '#wp-' + id + '-wrap' ),
+				$textarea = mce$( '#' + id ),
+				textarea = $textarea[0];
+
+			if ( 'toggle' === mode ) {
+				if ( editor && ! editor.isHidden() ) {
+					mode = 'html';
+				} else {
+					mode = 'tmce';
+				}
 			}
 
-			editorHeight = txtarea_el ? parseInt( txtarea_el.style.height, 10 ) : 0;
+			if ( 'tmce' === mode || 'tinymce' === mode ) {
+				if ( editor && ! editor.isHidden() ) {
+					return false;
+				}
 
-			if ( tinyMCEPreInit.mceInit[ id ] && tinyMCEPreInit.mceInit[ id ].wpautop ) {
-				txtarea_el.value = t.wpautop( txtarea_el.value );
-			}
+				if ( typeof( window.QTags ) !== 'undefined' ) {
+					window.QTags.closeAllTags( id );
+				}
 
-			if ( ed ) {
-				ed.show();
+				editorHeight = parseInt( textarea.style.height, 10 ) || 0;
 
-				// No point resizing the iframe in iOS
-				if ( ! tinymce.Env.iOS && editorHeight ) {
-					toolbarHeight = getToolbarHeight();
-					editorHeight = editorHeight - toolbarHeight + 14;
+				if ( editor ) {
+					editor.show();
 
-					// height cannot be under 50 or over 5000
-					if ( editorHeight > 50 && editorHeight < 5000 ) {
-						ed.theme.resizeTo( null, editorHeight );
+					// No point resizing the iframe in iOS
+					if ( ! tinymce.Env.iOS && editorHeight ) {
+						toolbarHeight = getToolbarHeight( editor );
+						editorHeight = editorHeight - toolbarHeight + 14;
+
+						// height cannot be under 50 or over 5000
+						if ( editorHeight > 50 && editorHeight < 5000 ) {
+							editor.theme.resizeTo( null, editorHeight );
+						}
 					}
+				} else {
+					tinymce.init( window.tinyMCEPreInit.mceInit[id] );
 				}
-			} else {
-				tinymce.init( tinyMCEPreInit.mceInit[id] );
-			}
 
-			DOM.removeClass( wrap_id, 'html-active' );
-			DOM.addClass( wrap_id, 'tmce-active' );
-			DOM.setAttrib( txtarea_el, 'aria-hidden', true );
-			setUserSetting( 'editor', 'tinymce' );
+				wrap.removeClass( 'html-active' ).addClass( 'tmce-active' );
+				$textarea.attr( 'aria-hidden', true );
+				window.setUserSetting( 'editor', 'tinymce' );
 
-		} else if ( 'html' === mode ) {
+			} else if ( 'html' === mode ) {
+				if ( editor && editor.isHidden() ) {
+					return false;
+				}
 
-			if ( ed && ed.isHidden() ) {
-				return false;
-			}
+				if ( editor ) {
+					if ( ! tinymce.Env.iOS ) {
+						iframe = editor.iframeElement;
+						editorHeight = iframe ? parseInt( iframe.style.height, 10 ) : 0;
 
-			if ( ed ) {
-				if ( ! tinymce.Env.iOS ) {
-					iframe = DOM.get( id + '_ifr' );
-					editorHeight = iframe ? parseInt( iframe.style.height, 10 ) : 0;
+						if ( editorHeight ) {
+							toolbarHeight = getToolbarHeight( editor );
+							editorHeight = editorHeight + toolbarHeight - 14;
 
-					if ( editorHeight ) {
-						toolbarHeight = getToolbarHeight();
-						editorHeight = editorHeight + toolbarHeight - 14;
-
-						// height cannot be under 50 or over 5000
-						if ( editorHeight > 50 && editorHeight < 5000 ) {
-							txtarea_el.style.height = editorHeight + 'px';
+							// height cannot be under 50 or over 5000
+							if ( editorHeight > 50 && editorHeight < 5000 ) {
+								textarea.style.height = editorHeight + 'px';
+							}
 						}
 					}
-				}
 
-				ed.hide();
-			} else {
-				// The TinyMCE instance doesn't exist, run the content through 'pre_wpautop()' and show the textarea
-				if ( tinyMCEPreInit.mceInit[ id ] && tinyMCEPreInit.mceInit[ id ].wpautop ) {
-					txtarea_el.value = t.pre_wpautop( txtarea_el.value );
+					editor.hide();
+				} else {
+					// The TinyMCE instance doesn't exist, show the textarea
+					$textarea.css({ 'display': '', 'visibility': '' });
 				}
 
-				DOM.setStyles( txtarea_el, {'display': '', 'visibility': ''} );
+				wrap.removeClass( 'tmce-active' ).addClass( 'html-active' );
+				$textarea.attr( 'aria-hidden', false );
+				window.setUserSetting( 'editor', 'html' );
 			}
-
-			DOM.removeClass( wrap_id, 'tmce-active' );
-			DOM.addClass( wrap_id, 'html-active' );
-			DOM.setAttrib( txtarea_el, 'aria-hidden', false );
-			setUserSetting( 'editor', 'html' );
 		}
-		return false;
-	},
 
-	_wp_Nop: function( content ) {
-		var blocklist1, blocklist2,
-			preserve_linebreaks = false,
-			preserve_br = false;
+		function _preWpautop( content ) {
+			var blocklist1, blocklist2,
+				preserve_linebreaks = false,
+				preserve_br = false;
 
-		// Protect pre|script tags
-		if ( content.indexOf( '<pre' ) !== -1 || content.indexOf( '<script' ) !== -1 ) {
-			preserve_linebreaks = true;
-			content = content.replace( /<(pre|script)[^>]*>[\s\S]+?<\/\1>/g, function( a ) {
-				a = a.replace( /<br ?\/?>(\r\n|\n)?/g, '<wp-line-break>' );
-				a = a.replace( /<\/?p( [^>]*)?>(\r\n|\n)?/g, '<wp-line-break>' );
-				return a.replace( /\r?\n/g, '<wp-line-break>' );
-			});
-		}
+			// Protect pre|script tags
+			if ( content.indexOf( '<pre' ) !== -1 || content.indexOf( '<script' ) !== -1 ) {
+				preserve_linebreaks = true;
+				content = content.replace( /<(pre|script)[^>]*>[\s\S]+?<\/\1>/g, function( a ) {
+					a = a.replace( /<br ?\/?>(\r\n|\n)?/g, '<wp-line-break>' );
+					a = a.replace( /<\/?p( [^>]*)?>(\r\n|\n)?/g, '<wp-line-break>' );
+					return a.replace( /\r?\n/g, '<wp-line-break>' );
+				});
+			}
 
-		// keep <br> tags inside captions and remove line breaks
-		if ( content.indexOf( '[caption' ) !== -1 ) {
-			preserve_br = true;
-			content = content.replace( /\[caption[\s\S]+?\[\/caption\]/g, function( a ) {
-				return a.replace( /<br([^>]*)>/g, '<wp-temp-br$1>' ).replace( /[\r\n\t]+/, '' );
-			});
-		}
+			// keep <br> tags inside captions and remove line breaks
+			if ( content.indexOf( '[caption' ) !== -1 ) {
+				preserve_br = true;
+				content = content.replace( /\[caption[\s\S]+?\[\/caption\]/g, function( a ) {
+					return a.replace( /<br([^>]*)>/g, '<wp-temp-br$1>' ).replace( /[\r\n\t]+/, '' );
+				});
+			}
 
-		// Pretty it up for the source editor
-		blocklist1 = 'blockquote|ul|ol|li|table|thead|tbody|tfoot|tr|th|td|div|h[1-6]|p|fieldset';
-		content = content.replace( new RegExp( '\\s*</(' + blocklist1 + ')>\\s*', 'g' ), '</$1>\n' );
-		content = content.replace( new RegExp( '\\s*<((?:' + blocklist1 + ')(?: [^>]*)?)>', 'g' ), '\n<$1>' );
+			// Pretty it up for the source editor
+			blocklist1 = 'blockquote|ul|ol|li|table|thead|tbody|tfoot|tr|th|td|div|h[1-6]|p|fieldset';
+			content = content.replace( new RegExp( '\\s*</(' + blocklist1 + ')>\\s*', 'g' ), '</$1>\n' );
+			content = content.replace( new RegExp( '\\s*<((?:' + blocklist1 + ')(?: [^>]*)?)>', 'g' ), '\n<$1>' );
 
-		// Mark </p> if it has any attributes.
-		content = content.replace( /(<p [^>]+>.*?)<\/p>/g, '$1</p#>' );
+			// Mark </p> if it has any attributes.
+			content = content.replace( /(<p [^>]+>.*?)<\/p>/g, '$1</p#>' );
 
-		// Separate <div> containing <p>
-		content = content.replace( /<div( [^>]*)?>\s*<p>/gi, '<div$1>\n\n' );
+			// Separate <div> containing <p>
+			content = content.replace( /<div( [^>]*)?>\s*<p>/gi, '<div$1>\n\n' );
 
-		// Remove <p> and <br />
-		content = content.replace( /\s*<p>/gi, '' );
-		content = content.replace( /\s*<\/p>\s*/gi, '\n\n' );
-		content = content.replace( /\n[\s\u00a0]+\n/g, '\n\n' );
-		content = content.replace( /\s*<br ?\/?>\s*/gi, '\n' );
+			// Remove <p> and <br />
+			content = content.replace( /\s*<p>/gi, '' );
+			content = content.replace( /\s*<\/p>\s*/gi, '\n\n' );
+			content = content.replace( /\n[\s\u00a0]+\n/g, '\n\n' );
+			content = content.replace( /\s*<br ?\/?>\s*/gi, '\n' );
 
-		// Fix some block element newline issues
-		content = content.replace( /\s*<div/g, '\n<div' );
-		content = content.replace( /<\/div>\s*/g, '</div>\n' );
-		content = content.replace( /\s*\[caption([^\[]+)\[\/caption\]\s*/gi, '\n\n[caption$1[/caption]\n\n' );
-		content = content.replace( /caption\]\n\n+\[caption/g, 'caption]\n\n[caption' );
+			// Fix some block element newline issues
+			content = content.replace( /\s*<div/g, '\n<div' );
+			content = content.replace( /<\/div>\s*/g, '</div>\n' );
+			content = content.replace( /\s*\[caption([^\[]+)\[\/caption\]\s*/gi, '\n\n[caption$1[/caption]\n\n' );
+			content = content.replace( /caption\]\n\n+\[caption/g, 'caption]\n\n[caption' );
 
-		blocklist2 = 'blockquote|ul|ol|li|table|thead|tbody|tfoot|tr|th|td|h[1-6]|pre|fieldset';
-		content = content.replace( new RegExp('\\s*<((?:' + blocklist2 + ')(?: [^>]*)?)\\s*>', 'g' ), '\n<$1>' );
-		content = content.replace( new RegExp('\\s*</(' + blocklist2 + ')>\\s*', 'g' ), '</$1>\n' );
-		content = content.replace( /<li([^>]*)>/g, '\t<li$1>' );
+			blocklist2 = 'blockquote|ul|ol|li|table|thead|tbody|tfoot|tr|th|td|h[1-6]|pre|fieldset';
+			content = content.replace( new RegExp('\\s*<((?:' + blocklist2 + ')(?: [^>]*)?)\\s*>', 'g' ), '\n<$1>' );
+			content = content.replace( new RegExp('\\s*</(' + blocklist2 + ')>\\s*', 'g' ), '</$1>\n' );
+			content = content.replace( /<li([^>]*)>/g, '\t<li$1>' );
 
-		if ( content.indexOf( '<option' ) !== -1 ) {
-			content = content.replace( /\s*<option/g, '\n<option' );
-			content = content.replace( /\s*<\/select>/g, '\n</select>' );
-		}
+			if ( content.indexOf( '<option' ) !== -1 ) {
+				content = content.replace( /\s*<option/g, '\n<option' );
+				content = content.replace( /\s*<\/select>/g, '\n</select>' );
+			}
 
-		if ( content.indexOf( '<hr' ) !== -1 ) {
-			content = content.replace( /\s*<hr( [^>]*)?>\s*/g, '\n\n<hr$1>\n\n' );
-		}
+			if ( content.indexOf( '<hr' ) !== -1 ) {
+				content = content.replace( /\s*<hr( [^>]*)?>\s*/g, '\n\n<hr$1>\n\n' );
+			}
 
-		if ( content.indexOf( '<object' ) !== -1 ) {
-			content = content.replace( /<object[\s\S]+?<\/object>/g, function( a ) {
-				return a.replace( /[\r\n]+/g, '' );
-			});
-		}
+			if ( content.indexOf( '<object' ) !== -1 ) {
+				content = content.replace( /<object[\s\S]+?<\/object>/g, function( a ) {
+					return a.replace( /[\r\n]+/g, '' );
+				});
+			}
 
-		// Unmark special paragraph closing tags
-		content = content.replace( /<\/p#>/g, '</p>\n' );
-		content = content.replace( /\s*(<p [^>]+>[\s\S]*?<\/p>)/g, '\n$1' );
+			// Unmark special paragraph closing tags
+			content = content.replace( /<\/p#>/g, '</p>\n' );
+			content = content.replace( /\s*(<p [^>]+>[\s\S]*?<\/p>)/g, '\n$1' );
 
-		// Trim whitespace
-		content = content.replace( /^\s+/, '' );
-		content = content.replace( /[\s\u00a0]+$/, '' );
+			// Trim whitespace
+			content = content.replace( /^\s+/, '' );
+			content = content.replace( /[\s\u00a0]+$/, '' );
 
-		// put back the line breaks in pre|script
-		if ( preserve_linebreaks ) {
-			content = content.replace( /<wp-line-break>/g, '\n' );
-		}
+			// put back the line breaks in pre|script
+			if ( preserve_linebreaks ) {
+				content = content.replace( /<wp-line-break>/g, '\n' );
+			}
 
-		// and the <br> tags in captions
-		if ( preserve_br ) {
-			content = content.replace( /<wp-temp-br([^>]*)>/g, '<br$1>' );
+			// and the <br> tags in captions
+			if ( preserve_br ) {
+				content = content.replace( /<wp-temp-br([^>]*)>/g, '<br$1>' );
+			}
+
+			return content;
 		}
 
-		return content;
-	},
+		function _wpautop( pee ) {
+			var preserve_linebreaks = false,
+				preserve_br = false,
+				blocklist = 'table|thead|tfoot|caption|col|colgroup|tbody|tr|td|th|div|dl|dd|dt|ul|ol|li|pre' +
+					'|form|map|area|blockquote|address|math|style|p|h[1-6]|hr|fieldset|legend|section' +
+					'|article|aside|hgroup|header|footer|nav|figure|figcaption|details|menu|summary';
 
-	_wp_Autop: function(pee) {
-		var preserve_linebreaks = false,
-			preserve_br = false,
-			blocklist = 'table|thead|tfoot|caption|col|colgroup|tbody|tr|td|th|div|dl|dd|dt|ul|ol|li|pre' +
-				'|form|map|area|blockquote|address|math|style|p|h[1-6]|hr|fieldset|legend|section' +
-				'|article|aside|hgroup|header|footer|nav|figure|figcaption|details|menu|summary';
+			if ( pee.indexOf( '<object' ) !== -1 ) {
+				pee = pee.replace( /<object[\s\S]+?<\/object>/g, function( a ) {
+					return a.replace( /[\r\n]+/g, '' );
+				});
+			}
 
-		if ( pee.indexOf( '<object' ) !== -1 ) {
-			pee = pee.replace( /<object[\s\S]+?<\/object>/g, function( a ) {
-				return a.replace( /[\r\n]+/g, '' );
+			pee = pee.replace( /<[^<>]+>/g, function( a ){
+				return a.replace( /[\r\n]+/g, ' ' );
 			});
-		}
 
-		pee = pee.replace( /<[^<>]+>/g, function( a ){
-			return a.replace( /[\r\n]+/g, ' ' );
-		});
+			// Protect pre|script tags
+			if ( pee.indexOf( '<pre' ) !== -1 || pee.indexOf( '<script' ) !== -1 ) {
+				preserve_linebreaks = true;
+				pee = pee.replace( /<(pre|script)[^>]*>[\s\S]+?<\/\1>/g, function( a ) {
+					return a.replace( /(\r\n|\n)/g, '<wp-line-break>' );
+				});
+			}
 
-		// Protect pre|script tags
-		if ( pee.indexOf( '<pre' ) !== -1 || pee.indexOf( '<script' ) !== -1 ) {
-			preserve_linebreaks = true;
-			pee = pee.replace( /<(pre|script)[^>]*>[\s\S]+?<\/\1>/g, function( a ) {
-				return a.replace( /(\r\n|\n)/g, '<wp-line-break>' );
-			});
-		}
+			// keep <br> tags inside captions and convert line breaks
+			if ( pee.indexOf( '[caption' ) !== -1 ) {
+				preserve_br = true;
+				pee = pee.replace( /\[caption[\s\S]+?\[\/caption\]/g, function( a ) {
+					// keep existing <br>
+					a = a.replace( /<br([^>]*)>/g, '<wp-temp-br$1>' );
+					// no line breaks inside HTML tags
+					a = a.replace( /<[a-zA-Z0-9]+( [^<>]+)?>/g, function( b ) {
+						return b.replace( /[\r\n\t]+/, ' ' );
+					});
+					// convert remaining line breaks to <br>
+					return a.replace( /\s*\n\s*/g, '<wp-temp-br />' );
+				});
+			}
 
-		// keep <br> tags inside captions and convert line breaks
-		if ( pee.indexOf( '[caption' ) !== -1 ) {
-			preserve_br = true;
-			pee = pee.replace( /\[caption[\s\S]+?\[\/caption\]/g, function( a ) {
-				// keep existing <br>
-				a = a.replace( /<br([^>]*)>/g, '<wp-temp-br$1>' );
-				// no line breaks inside HTML tags
-				a = a.replace( /<[a-zA-Z0-9]+( [^<>]+)?>/g, function( b ) {
-					return b.replace( /[\r\n\t]+/, ' ' );
-				});
-				// convert remaining line breaks to <br>
-				return a.replace( /\s*\n\s*/g, '<wp-temp-br />' );
+			pee = pee + '\n\n';
+			pee = pee.replace( /<br \/>\s*<br \/>/gi, '\n\n' );
+			pee = pee.replace( new RegExp( '(<(?:' + blocklist + ')(?: [^>]*)?>)', 'gi' ), '\n$1' );
+			pee = pee.replace( new RegExp( '(</(?:' + blocklist + ')>)', 'gi' ), '$1\n\n' );
+			pee = pee.replace( /<hr( [^>]*)?>/gi, '<hr$1>\n\n' ); // hr is self closing block element
+			pee = pee.replace( /\s*<option/gi, '<option' ); // No <p> or <br> around <option>
+			pee = pee.replace( /<\/option>\s*/gi, '</option>' );
+			pee = pee.replace( /\r\n|\r/g, '\n' );
+			pee = pee.replace( /\n\s*\n+/g, '\n\n' );
+			pee = pee.replace( /([\s\S]+?)\n\n/g, '<p>$1</p>\n' );
+			pee = pee.replace( /<p>\s*?<\/p>/gi, '');
+			pee = pee.replace( new RegExp( '<p>\\s*(</?(?:' + blocklist + ')(?: [^>]*)?>)\\s*</p>', 'gi' ), '$1' );
+			pee = pee.replace( /<p>(<li.+?)<\/p>/gi, '$1');
+			pee = pee.replace( /<p>\s*<blockquote([^>]*)>/gi, '<blockquote$1><p>');
+			pee = pee.replace( /<\/blockquote>\s*<\/p>/gi, '</p></blockquote>');
+			pee = pee.replace( new RegExp( '<p>\\s*(</?(?:' + blocklist + ')(?: [^>]*)?>)', 'gi' ), '$1' );
+			pee = pee.replace( new RegExp( '(</?(?:' + blocklist + ')(?: [^>]*)?>)\\s*</p>', 'gi' ), '$1' );
+			pee = pee.replace( /\s*\n/gi, '<br />\n');
+			pee = pee.replace( new RegExp( '(</?(?:' + blocklist + ')[^>]*>)\\s*<br />', 'gi' ), '$1' );
+			pee = pee.replace( /<br \/>(\s*<\/?(?:p|li|div|dl|dd|dt|th|pre|td|ul|ol)>)/gi, '$1' );
+			pee = pee.replace( /(?:<p>|<br ?\/?>)*\s*\[caption([^\[]+)\[\/caption\]\s*(?:<\/p>|<br ?\/?>)*/gi, '[caption$1[/caption]' );
+
+			pee = pee.replace( /(<(?:div|th|td|form|fieldset|dd)[^>]*>)(.*?)<\/p>/g, function( a, b, c ) {
+				if ( c.match( /<p( [^>]*)?>/ ) ) {
+					return a;
+				}
+
+				return b + '<p>' + c + '</p>';
 			});
-		}
 
-		pee = pee + '\n\n';
-		pee = pee.replace( /<br \/>\s*<br \/>/gi, '\n\n' );
-		pee = pee.replace( new RegExp( '(<(?:' + blocklist + ')(?: [^>]*)?>)', 'gi' ), '\n$1' );
-		pee = pee.replace( new RegExp( '(</(?:' + blocklist + ')>)', 'gi' ), '$1\n\n' );
-		pee = pee.replace( /<hr( [^>]*)?>/gi, '<hr$1>\n\n' ); // hr is self closing block element
-		pee = pee.replace( /\s*<option/gi, '<option' ); // No <p> or <br> around <option>
-		pee = pee.replace( /<\/option>\s*/gi, '</option>' );
-		pee = pee.replace( /\r\n|\r/g, '\n' );
-		pee = pee.replace( /\n\s*\n+/g, '\n\n' );
-		pee = pee.replace( /([\s\S]+?)\n\n/g, '<p>$1</p>\n' );
-		pee = pee.replace( /<p>\s*?<\/p>/gi, '');
-		pee = pee.replace( new RegExp( '<p>\\s*(</?(?:' + blocklist + ')(?: [^>]*)?>)\\s*</p>', 'gi' ), '$1' );
-		pee = pee.replace( /<p>(<li.+?)<\/p>/gi, '$1');
-		pee = pee.replace( /<p>\s*<blockquote([^>]*)>/gi, '<blockquote$1><p>');
-		pee = pee.replace( /<\/blockquote>\s*<\/p>/gi, '</p></blockquote>');
-		pee = pee.replace( new RegExp( '<p>\\s*(</?(?:' + blocklist + ')(?: [^>]*)?>)', 'gi' ), '$1' );
-		pee = pee.replace( new RegExp( '(</?(?:' + blocklist + ')(?: [^>]*)?>)\\s*</p>', 'gi' ), '$1' );
-		pee = pee.replace( /\s*\n/gi, '<br />\n');
-		pee = pee.replace( new RegExp( '(</?(?:' + blocklist + ')[^>]*>)\\s*<br />', 'gi' ), '$1' );
-		pee = pee.replace( /<br \/>(\s*<\/?(?:p|li|div|dl|dd|dt|th|pre|td|ul|ol)>)/gi, '$1' );
-		pee = pee.replace( /(?:<p>|<br ?\/?>)*\s*\[caption([^\[]+)\[\/caption\]\s*(?:<\/p>|<br ?\/?>)*/gi, '[caption$1[/caption]' );
+			// put back the line breaks in pre|script
+			if ( preserve_linebreaks ) {
+				pee = pee.replace( /<wp-line-break>/g, '\n' );
+			}
 
-		pee = pee.replace( /(<(?:div|th|td|form|fieldset|dd)[^>]*>)(.*?)<\/p>/g, function( a, b, c ) {
-			if ( c.match( /<p( [^>]*)?>/ ) ) {
-				return a;
+			if ( preserve_br ) {
+				pee = pee.replace( /<wp-temp-br([^>]*)>/g, '<br$1>' );
 			}
 
-			return b + '<p>' + c + '</p>';
-		});
-
-		// put back the line breaks in pre|script
-		if ( preserve_linebreaks ) {
-			pee = pee.replace( /<wp-line-break>/g, '\n' );
+			return pee;
 		}
 
-		if ( preserve_br ) {
-			pee = pee.replace( /<wp-temp-br([^>]*)>/g, '<br$1>' );
-		}
+		function preWpautop( content ) {
+			var obj = { o: exports, data: content, unfiltered: content };
 
-		return pee;
-	},
+			if ( $ ) {
+				$( 'body' ).trigger( 'beforePreWpautop', [ obj ] );
+			}
 
-	pre_wpautop: function( content ) {
-		var t = this, o = { o: t, data: content, unfiltered: content },
-			q = typeof( jQuery ) !== 'undefined';
+			obj.data = _preWpautop( obj.data );
 
-		if ( q ) {
-			jQuery( 'body' ).trigger( 'beforePreWpautop', [ o ] );
+			if ( $ ) {
+				$( 'body' ).trigger( 'afterPreWpautop', [ obj ] );
+			}
+
+			return obj.data;
 		}
 
-		o.data = t._wp_Nop( o.data );
+		function wpautop( content ) {
+			var obj = { o: exports, data: content, unfiltered: content };
 
-		if ( q ) {
-			jQuery('body').trigger('afterPreWpautop', [ o ] );
-		}
+			if ( $ ) {
+				$( 'body' ).trigger( 'beforeWpautop', [ obj ] );
+			}
 
-		return o.data;
-	},
+			obj.data = _wpautop( obj.data );
 
-	wpautop: function( pee ) {
-		var t = this, o = { o: t, data: pee, unfiltered: pee },
-			q = typeof( jQuery ) !== 'undefined';
+			if ( $ ) {
+				$( 'body' ).trigger( 'afterWpautop', [ obj ] );
+			}
 
-		if ( q ) {
-			jQuery( 'body' ).trigger('beforeWpautop', [ o ] );
+			return obj.data;
 		}
 
-		o.data = t._wp_Autop( o.data );
-
-		if ( q ) {
-			jQuery( 'body' ).trigger('afterWpautop', [ o ] );
+		if ( $ ) {
+			$( document ).ready( init );
+		} else if ( document.addEventListener ) {
+			document.addEventListener( 'DOMContentLoaded', init, false );
+			window.addEventListener( 'load', init, false );
+		} else if ( window.attachEvent ) {
+			window.attachEvent( 'onload', init );
+			document.attachEvent( 'onreadystatechange', function() {
+				if ( 'complete' === document.readyState ) {
+					init();
+				}
+			} );
 		}
 
-		return o.data;
+		exports = {
+			wpautop: wpautop,
+			preWpautop: preWpautop,
+
+			// Back-compat
+			go: switchEditor,
+			pre_wpautop: preWpautop,
+			_wp_Autop: _wpautop,
+			_wp_Nop: _preWpautop
+		};
+
+		return exports;
 	}
-};
+
+	window.switchEditors = new switchEditors();
+}( window.jQuery ));
Index: src/wp-includes/class-wp-editor.php
===================================================================
--- src/wp-includes/class-wp-editor.php	(revision 32508)
+++ src/wp-includes/class-wp-editor.php	(working copy)
@@ -137,43 +137,45 @@
 	 * @param array $settings See the _parse_settings() method for description.
 	 */
 	public static function editor( $content, $editor_id, $settings = array() ) {
-
 		$set = self::parse_settings( $editor_id, $settings );
-		$editor_class = ' class="' . trim( $set['editor_class'] . ' wp-editor-area' ) . '"';
+		$editor_class = ' class="' . esc_attr( trim( $set['editor_class'] ) ) . ' wp-editor-area"';
 		$tabindex = $set['tabindex'] ? ' tabindex="' . (int) $set['tabindex'] . '"' : '';
 		$switch_class = 'html-active';
 		$toolbar = $buttons = $autocomplete = '';
+		$default_editor = null;
+		$editor_id_attr = esc_attr( $editor_id );
 
 		if ( $set['drag_drop_upload'] ) {
 			self::$drag_drop_upload = true;
 		}
 
-		if ( ! empty( $set['editor_height'] ) )
-			$height = ' style="height: ' . $set['editor_height'] . 'px"';
-		else
-			$height = ' rows="' . $set['textarea_rows'] . '"';
+		if ( ! empty( $set['editor_height'] ) ) {
+			$height = ' style="height: ' . (int) $set['editor_height'] . 'px"';
+		} else {
+			$height = ' rows="' . (int) $set['textarea_rows'] . '"';
+		}
 
-		if ( !current_user_can( 'upload_files' ) )
+		if ( ! current_user_can( 'upload_files' ) ) {
 			$set['media_buttons'] = false;
+		}
 
-		if ( ! self::$this_quicktags && self::$this_tinymce ) {
-			$switch_class = 'tmce-active';
+		if ( self::$this_tinymce ) {
 			$autocomplete = ' autocomplete="off"';
-		} elseif ( self::$this_quicktags && self::$this_tinymce ) {
 			$default_editor = $set['default_editor'] ? $set['default_editor'] : wp_default_editor();
-			$autocomplete = ' autocomplete="off"';
 
-			// 'html' is used for the "Text" editor tab.
-			if ( 'html' === $default_editor ) {
-				add_filter('the_editor_content', 'wp_htmledit_pre');
-				$switch_class = 'html-active';
+			if ( self::$this_quicktags ) {
+				// 'html' is used for the "Text" editor tab.
+				if ( 'html' !== $default_editor ) {
+					$switch_class = 'tmce-active';
+				}
+
+				$buttons .= '<button type="button" id="' . $editor_id_attr . '-tmce" class="wp-switch-editor switch-tmce"' .
+					' data-wp-editor-id="' . $editor_id_attr . '">' . __('Visual') . "</button>\n";
+				$buttons .= '<button type="button" id="' . $editor_id_attr . '-html" class="wp-switch-editor switch-html"' .
+					' data-wp-editor-id="' . $editor_id_attr . '">' . _x( 'Text', 'Name for the Text editor tab (formerly HTML)' ) . "</button>\n";
 			} else {
-				add_filter('the_editor_content', 'wp_richedit_pre');
 				$switch_class = 'tmce-active';
 			}
-
-			$buttons .= '<button type="button" id="' . $editor_id . '-tmce" class="wp-switch-editor switch-tmce" onclick="switchEditors.switchto(this);">' . __('Visual') . "</button>\n";
-			$buttons .= '<button type="button" id="' . $editor_id . '-html" class="wp-switch-editor switch-html" onclick="switchEditors.switchto(this);">' . _x( 'Text', 'Name for the Text editor tab (formerly HTML)' ) . "</button>\n";
 		}
 
 		$wrap_class = 'wp-core-ui wp-editor-wrap ' . $switch_class;
@@ -182,26 +184,27 @@
 			$wrap_class .= ' has-dfw';
 		}
 
-		echo '<div id="wp-' . $editor_id . '-wrap" class="' . $wrap_class . '">';
+		echo '<div id="wp-' . $editor_id_attr . '-wrap" class="' . $wrap_class . '">';
 
 		if ( self::$editor_buttons_css ) {
-			wp_print_styles('editor-buttons');
+			wp_print_styles( 'editor-buttons' );
 			self::$editor_buttons_css = false;
 		}
 
-		if ( !empty($set['editor_css']) )
+		if ( ! empty( $set['editor_css'] ) ) {
 			echo $set['editor_css'] . "\n";
+		}
 
-		if ( !empty($buttons) || $set['media_buttons'] ) {
-			echo '<div id="wp-' . $editor_id . '-editor-tools" class="wp-editor-tools hide-if-no-js">';
+		if ( ! empty( $buttons ) || $set['media_buttons'] ) {
+			echo '<div id="wp-' . $editor_id_attr . '-editor-tools" class="wp-editor-tools hide-if-no-js">';
 
 			if ( $set['media_buttons'] ) {
 				self::$has_medialib = true;
 
-				if ( !function_exists('media_buttons') )
-					include(ABSPATH . 'wp-admin/includes/media.php');
+				if ( ! function_exists( 'media_buttons' ) )
+					include( ABSPATH . 'wp-admin/includes/media.php' );
 
-				echo '<div id="wp-' . $editor_id . '-media-buttons" class="wp-media-buttons">';
+				echo '<div id="wp-' . $editor_id_attr . '-media-buttons" class="wp-media-buttons">';
 
 				/**
 				 * Fires after the default media button(s) are displayed.
@@ -218,6 +221,18 @@
 			echo "</div>\n";
 		}
 
+		$quicktags_toolbar = '';
+
+		if ( self::$this_quicktags ) {
+			if ( 'content' === $editor_id && ! empty( $GLOBALS['current_screen'] ) && $GLOBALS['current_screen']->base === 'post' ) {
+				$toolbar_id = 'ed_toolbar';
+			} else {
+				$toolbar_id = 'qt_' . $editor_id_attr . '_toolbar';
+			}
+
+			$quicktags_toolbar = '<div id="' . $toolbar_id . '" class="quicktags-toolbar"></div>';
+		}
+
 		/**
 		 * Filter the HTML markup output that displays the editor.
 		 *
@@ -225,9 +240,10 @@
 		 *
 		 * @param string $output Editor's HTML markup.
 		 */
-		$the_editor = apply_filters( 'the_editor', '<div id="wp-' . $editor_id . '-editor-container" class="wp-editor-container">' .
-			'<textarea' . $editor_class . $height . $tabindex . $autocomplete . ' cols="40" name="' . $set['textarea_name'] . '" ' .
-			'id="' . $editor_id . '">%s</textarea></div>' );
+		$the_editor = apply_filters( 'the_editor', '<div id="wp-' . $editor_id_attr . '-editor-container" class="wp-editor-container">' .
+			$quicktags_toolbar .
+			'<textarea' . $editor_class . $height . $tabindex . $autocomplete . ' cols="40" name="' . esc_attr( $set['textarea_name'] ) . '" ' .
+			'id="' . $editor_id_attr . '">%s</textarea></div>' );
 
 		/**
 		 * Filter the default editor content.
@@ -238,6 +254,16 @@
 		 */
 		$content = apply_filters( 'the_editor_content', $content );
 
+		// Back-compat for the `htmledit_pre` and `richedit_pre` filters
+		if ( 'html' === $default_editor && has_filter( 'htmledit_pre' ) ) {
+			// TODO: needs _deprecated_filter(), use _deprecated_function() as substitute for now
+			_deprecated_function( 'add_filter( htmledit_pre )', '4.3.0', 'add_filter( format_for_editor )' );
+			$content = apply_filters( 'htmledit_pre', $content );
+		} elseif ( null !== $default_editor && has_filter( 'richedit_pre' ) ) {
+			_deprecated_function( 'add_filter( richedit_pre )', '4.3.0', 'add_filter( format_for_editor )' );
+			$content = apply_filters( 'richedit_pre', $content );
+		}
+
 		printf( $the_editor, $content );
 		echo "\n</div>\n\n";
 
@@ -470,21 +496,21 @@
 					'theme' => 'modern',
 					'skin' => 'lightgray',
 					'language' => self::$mce_locale,
-					'formats' => "{
-						alignleft: [
-							{selector: 'p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li', styles: {textAlign:'left'}},
-							{selector: 'img,table,dl.wp-caption', classes: 'alignleft'}
-						],
-						aligncenter: [
-							{selector: 'p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li', styles: {textAlign:'center'}},
-							{selector: 'img,table,dl.wp-caption', classes: 'aligncenter'}
-						],
-						alignright: [
-							{selector: 'p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li', styles: {textAlign:'right'}},
-							{selector: 'img,table,dl.wp-caption', classes: 'alignright'}
-						],
-						strikethrough: {inline: 'del'}
-					}",
+					'formats' => '{' .
+						'alignleft: [' .
+							'{selector: "p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li", styles: {textAlign:"left"}},' .
+							'{selector: "img,table,dl.wp-caption", classes: "alignleft"}' .
+						'],' .
+						'aligncenter: [' .
+							'{selector: "p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li", styles: {textAlign:"center"}},' .
+							'{selector: "img,table,dl.wp-caption", classes: "aligncenter"}' .
+						'],' .
+						'alignright: [' .
+							'{selector: "p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li", styles: {textAlign:"right"}},' .
+							'{selector: "img,table,dl.wp-caption", classes: "alignright"}' .
+						'],' .
+						'strikethrough: {inline: "del"}' .
+					'}',
 					'relative_urls' => false,
 					'remove_script_host' => false,
 					'convert_urls' => false,
@@ -654,8 +680,8 @@
 				'body_class' => $body_class
 			);
 
-			if ( $first_run )
-				$mceInit = array_merge( self::$first_init, $mceInit );
+			// Merge with the first part of the init array
+			$mceInit = array_merge( self::$first_init, $mceInit );
 
 			if ( is_array( $set['tinymce'] ) )
 				$mceInit = array_merge( $mceInit, $set['tinymce'] );
@@ -666,7 +692,7 @@
 			 * before tinyMCE.init. Setting "valid_elements", "invalid_elements"
 			 * and "extended_valid_elements" can be done through this filter. Best
 			 * is to use the default cleanup by not specifying valid_elements,
-			 * as TinyMCE contains full set of XHTML 1.0.
+			 * as TinyMCE checks against the full set of HTML 5.0 elements and attributes.
 			 */
 			if ( $set['teeny'] ) {
 
@@ -1166,55 +1192,29 @@
 		?>
 
 		( function() {
-			var init, edId, qtId, firstInit, wrapper;
+			var init, id;
 
 			if ( typeof tinymce !== 'undefined' ) {
-				for ( edId in tinyMCEPreInit.mceInit ) {
-					if ( firstInit ) {
-						init = tinyMCEPreInit.mceInit[edId] = tinymce.extend( {}, firstInit, tinyMCEPreInit.mceInit[edId] );
-					} else {
-						init = firstInit = tinyMCEPreInit.mceInit[edId];
-					}
+				for ( id in tinyMCEPreInit.mceInit ) {
+					init = tinyMCEPreInit.mceInit[id];
 
-					wrapper = tinymce.DOM.select( '#wp-' + edId + '-wrap' )[0];
+					if ( ! init.wp_skip_init ) {
+						tinymce.init( init );
 
-					if ( ( tinymce.DOM.hasClass( wrapper, 'tmce-active' ) || ! tinyMCEPreInit.qtInit.hasOwnProperty( edId ) ) &&
-						! init.wp_skip_init ) {
-
-						try {
-							tinymce.init( init );
-
-							if ( ! window.wpActiveEditor ) {
-								window.wpActiveEditor = edId;
-							}
-						} catch(e){}
+						if ( ! window.wpActiveEditor ) {
+							window.wpActiveEditor = id;
+						}
 					}
 				}
 			}
 
 			if ( typeof quicktags !== 'undefined' ) {
-				for ( qtId in tinyMCEPreInit.qtInit ) {
-					try {
-						quicktags( tinyMCEPreInit.qtInit[qtId] );
+				for ( id in tinyMCEPreInit.qtInit ) {
+					quicktags( tinyMCEPreInit.qtInit[id] );
 
-						if ( ! window.wpActiveEditor ) {
-							window.wpActiveEditor = qtId;
-						}
-					} catch(e){};
-				}
-			}
-
-			if ( typeof jQuery !== 'undefined' ) {
-				jQuery('.wp-editor-wrap').on( 'click.wp-editor', function() {
-					if ( this.id ) {
-						window.wpActiveEditor = this.id.slice( 3, -5 );
+					if ( ! window.wpActiveEditor ) {
+						window.wpActiveEditor = id;
 					}
-				});
-			} else {
-				for ( qtId in tinyMCEPreInit.qtInit ) {
-					document.getElementById( 'wp-' + qtId + '-wrap' ).onclick = function() {
-						window.wpActiveEditor = this.id.slice( 3, -5 );
-					}
 				}
 			}
 		}());
Index: src/wp-includes/css/editor.css
===================================================================
--- src/wp-includes/css/editor.css	(revision 32508)
+++ src/wp-includes/css/editor.css	(working copy)
@@ -286,7 +286,6 @@
 .mce-path-item,
 .mce-path .mce-divider {
 	font-size: 12px;
-	line-height: 18px;
 }
 
 .mce-toolbar .mce-btn,
@@ -1066,6 +1065,7 @@
 	position: relative;
 	border-bottom: 1px solid #dedede;
 	background: #f5f5f5;
+	min-height: 30px;
 }
 
 .has-dfw .quicktags-toolbar {
Index: src/wp-includes/default-filters.php
===================================================================
--- src/wp-includes/default-filters.php	(revision 32508)
+++ src/wp-includes/default-filters.php	(working copy)
@@ -346,6 +346,9 @@
 add_action( 'before_delete_post', '_reset_front_page_settings_for_post' );
 add_action( 'wp_trash_post',      '_reset_front_page_settings_for_post' );
 
+// Prepare the content for both Visual and Text editors
+add_filter( 'the_editor_content', 'format_for_editor' );
+
 // Post Formats
 add_filter( 'request', '_post_format_request' );
 add_filter( 'term_link', '_post_format_link', 10, 3 );
Index: src/wp-includes/deprecated.php
===================================================================
--- src/wp-includes/deprecated.php	(revision 32508)
+++ src/wp-includes/deprecated.php	(working copy)
@@ -3491,3 +3491,75 @@
 
 	return false;
 }
+
+/**
+ * Formats text for the rich text editor.
+ *
+ * The filter 'richedit_pre' is applied here. If $text is empty the filter will
+ * be applied to an empty string.
+ *
+ * @since 2.0.0
+ * @deprecated 4.3.0
+ *
+ * @param string $text The text to be formatted.
+ * @return string The formatted text after filter is applied.
+ */
+function wp_richedit_pre($text) {
+	_deprecated_function( __FUNCTION__, '4.3', 'format_for_editor()' );
+
+	if ( empty( $text ) ) {
+		/**
+		 * Filter text returned for the rich text editor.
+		 *
+		 * This filter is first evaluated, and the value returned, if an empty string
+		 * is passed to wp_richedit_pre(). If an empty string is passed, it results
+		 * in a break tag and line feed.
+		 *
+		 * If a non-empty string is passed, the filter is evaluated on the wp_richedit_pre()
+		 * return after being formatted.
+		 *
+		 * @since 2.0.0
+		 * @deprecated 4.3.0
+		 *
+		 * @param string $output Text for the rich text editor.
+		 */
+		return apply_filters( 'richedit_pre', '' );
+	}
+
+	$output = convert_chars($text);
+	$output = wpautop($output);
+	$output = htmlspecialchars($output, ENT_NOQUOTES, get_option( 'blog_charset' ) );
+
+	/** This filter is documented in wp-includes/deprecated.php */
+	return apply_filters( 'richedit_pre', $output );
+}
+
+/**
+ * Formats text for the HTML editor.
+ *
+ * Unless $output is empty it will pass through htmlspecialchars before the
+ * 'htmledit_pre' filter is applied.
+ *
+ * @since 2.5.0
+ * @deprecated 4.3.0
+ *
+ * @param string $output The text to be formatted.
+ * @return string Formatted text after filter applied.
+ */
+function wp_htmledit_pre($output) {
+	_deprecated_function( __FUNCTION__, '4.3', 'format_for_editor()' );
+
+	if ( !empty($output) )
+		$output = htmlspecialchars($output, ENT_NOQUOTES, get_option( 'blog_charset' ) ); // convert only < > &
+
+	/**
+	 * Filter the text before it is formatted for the HTML editor.
+	 *
+	 * @since 2.5.0
+	 * @deprecated 4.3.0
+	 *
+	 * @param string $output The HTML-formatted text.
+	 */
+	return apply_filters( 'htmledit_pre', $output );
+}
+
Index: src/wp-includes/formatting.php
===================================================================
--- src/wp-includes/formatting.php	(revision 32508)
+++ src/wp-includes/formatting.php	(working copy)
@@ -2980,66 +2980,29 @@
 }
 
 /**
- * Formats text for the rich text editor.
+ * Formats text for the editor.
  *
- * The filter 'richedit_pre' is applied here. If $text is empty the filter will
+ * The filter 'format_for_editor' is applied here. If $text is empty the filter will
  * be applied to an empty string.
  *
- * @since 2.0.0
+ * @since 4.3.0
  *
  * @param string $text The text to be formatted.
  * @return string The formatted text after filter is applied.
  */
-function wp_richedit_pre($text) {
-	if ( empty( $text ) ) {
-		/**
-		 * Filter text returned for the rich text editor.
-		 *
-		 * This filter is first evaluated, and the value returned, if an empty string
-		 * is passed to wp_richedit_pre(). If an empty string is passed, it results
-		 * in a break tag and line feed.
-		 *
-		 * If a non-empty string is passed, the filter is evaluated on the wp_richedit_pre()
-		 * return after being formatted.
-		 *
-		 * @since 2.0.0
-		 *
-		 * @param string $output Text for the rich text editor.
-		 */
-		return apply_filters( 'richedit_pre', '' );
+function format_for_editor( $text ) {
+	if ( ! empty( $text ) ) {
+		$text = htmlspecialchars( $text, ENT_NOQUOTES, get_option( 'blog_charset' ) ); // convert only < > &
 	}
 
-	$output = convert_chars($text);
-	$output = wpautop($output);
-	$output = htmlspecialchars($output, ENT_NOQUOTES, get_option( 'blog_charset' ) );
-
-	/** This filter is documented in wp-includes/formatting.php */
-	return apply_filters( 'richedit_pre', $output );
-}
-
-/**
- * Formats text for the HTML editor.
- *
- * Unless $output is empty it will pass through htmlspecialchars before the
- * 'htmledit_pre' filter is applied.
- *
- * @since 2.5.0
- *
- * @param string $output The text to be formatted.
- * @return string Formatted text after filter applied.
- */
-function wp_htmledit_pre($output) {
-	if ( !empty($output) )
-		$output = htmlspecialchars($output, ENT_NOQUOTES, get_option( 'blog_charset' ) ); // convert only < > &
-
 	/**
-	 * Filter the text before it is formatted for the HTML editor.
+	 * Filter the text after it is formatted for the editor.
 	 *
-	 * @since 2.5.0
+	 * @since 4.3.0
 	 *
-	 * @param string $output The HTML-formatted text.
+	 * @param string $text The formatted text.
 	 */
-	return apply_filters( 'htmledit_pre', $output );
+	return apply_filters( 'format_for_editor', $text );
 }
 
 /**
Index: src/wp-includes/js/quicktags.js
===================================================================
--- src/wp-includes/js/quicktags.js	(revision 32508)
+++ src/wp-includes/js/quicktags.js	(working copy)
@@ -163,7 +163,7 @@
 			id = settings.id,
 			canvas = document.getElementById(id),
 			name = 'qt_' + id,
-			tb, onclick, toolbar_id;
+			tb, onclick, toolbar_id, wrap, setActiveEditor;
 
 		if ( !id || !canvas ) {
 			return false;
@@ -182,13 +182,14 @@
 			toolbar_id = name + '_toolbar';
 		}
 
-		tb = document.createElement('div');
-		tb.id = toolbar_id;
-		tb.className = 'quicktags-toolbar';
-		tb.onclick = function() {
-			window.wpActiveEditor = id;
-		};
+		tb = document.getElementById( toolbar_id );
 
+		if ( ! tb ) {
+			tb = document.createElement('div');
+			tb.id = toolbar_id;
+			tb.className = 'quicktags-toolbar';
+		}
+
 		canvas.parentNode.insertBefore(tb, canvas);
 		t.toolbar = tb;
 
@@ -214,10 +215,24 @@
 			}
 		};
 
+		setActiveEditor = function() {
+			window.wpActiveEditor = id;
+		};
+
+		wrap = document.getElementById( 'wp-' + id + '-wrap' );
+
 		if ( tb.addEventListener ) {
-			tb.addEventListener('click', onclick, false);
+			tb.addEventListener( 'click', onclick, false );
+			
+			if ( wrap ) {
+				wrap.addEventListener( 'click', setActiveEditor, false );
+			}
 		} else if ( tb.attachEvent ) {
-			tb.attachEvent('onclick', onclick);
+			tb.attachEvent( 'onclick', onclick );
+
+			if ( wrap ) {
+				wrap.attachEvent( 'onclick', setActiveEditor );
+			}
 		}
 
 		t.getButton = function(id) {
Index: src/wp-includes/js/tinymce/plugins/wordpress/plugin.js
===================================================================
--- src/wp-includes/js/tinymce/plugins/wordpress/plugin.js	(revision 32508)
+++ src/wp-includes/js/tinymce/plugins/wordpress/plugin.js	(working copy)
@@ -8,10 +8,12 @@
 		each = tinymce.each,
 		__ = editor.editorManager.i18n.translate,
 		wpAdvButton, style,
+		hasWpautop = ( editor.getParam( 'wpautop', true ) && typeof window.switchEditors !== 'undefined' ),
+		jq = window.jQuery,
 		last = 0;
 
-	if ( typeof window.jQuery !== 'undefined' ) {
-		window.jQuery( document ).triggerHandler( 'tinymce-editor-setup', [ editor ] );
+	if ( jq ) {
+		jq( document ).triggerHandler( 'tinymce-editor-setup', [ editor ] );
 	}
 
 	function toggleToolbars( state ) {
@@ -89,26 +91,34 @@
     });
 
 	// Replace Read More/Next Page tags with images
-	editor.on( 'BeforeSetContent', function( e ) {
-		var title;
+	editor.on( 'BeforeSetContent', function( event ) {
+		var title,
+			paragraph = tinymce.Env.webkit ? '<p><br /></p>' : '<p></p>';
 
-		if ( e.content ) {
-			if ( e.content.indexOf( '<!--more' ) !== -1 ) {
+		if ( event.content ) {
+			if ( event.content.indexOf( '<!--more' ) !== -1 ) {
 				title = __( 'Read more...' );
 
-				e.content = e.content.replace( /<!--more(.*?)-->/g, function( match, moretext ) {
+				event.content = event.content.replace( /<!--more(.*?)-->/g, function( match, moretext ) {
 					return '<img src="' + tinymce.Env.transparentSrc + '" data-wp-more="more" data-wp-more-text="' + moretext + '" ' +
 						'class="wp-more-tag mce-wp-more" title="' + title + '" data-mce-resize="false" data-mce-placeholder="1" />';
 				});
 			}
 
-			if ( e.content.indexOf( '<!--nextpage-->' ) !== -1 ) {
+			if ( event.content.indexOf( '<!--nextpage-->' ) !== -1 ) {
 				title = __( 'Page break' );
 
-				e.content = e.content.replace( /<!--nextpage-->/g,
+				event.content = event.content.replace( /<!--nextpage-->/g,
 					'<img src="' + tinymce.Env.transparentSrc + '" data-wp-more="nextpage" class="wp-more-tag mce-wp-nextpage" ' +
 						'title="' + title + '" data-mce-resize="false" data-mce-placeholder="1" />' );
 			}
+
+			// Remove spaces from empty paragraphs.
+			event.content = event.content.replace( /<p>(?:&nbsp;|\u00a0|\uFEFF|\s)+<\/p>/gi, paragraph );
+
+			if ( event.load && event.format !== 'raw' && hasWpautop ) {
+				event.content = window.switchEditors.wpautop( event.content );
+			}
 		}
 	});
 
@@ -289,7 +299,7 @@
 			doc = editor.getDoc(),
 			dom = editor.dom;
 
-		if ( tinymce.Env.iOS ) {
+		if ( env.iOS ) {
 			dom.addClass( doc.documentElement, 'ios' );
 		}
 
@@ -318,24 +328,28 @@
 			}
 		});
 
+		// Start hidden when the Text editor is set to load first.
+		if ( tinymce.$( '#wp-' + editor.id + '-wrap' ).hasClass( 'html-active' ) ) {
+			editor.hide();
+		}
+
 		// Remove invalid parent paragraphs when inserting HTML
-		// TODO: still needed?
-		editor.on( 'BeforeSetContent', function( e ) {
-			if ( e.content ) {
-				e.content = e.content.replace(/<p>\s*<(p|div|ul|ol|dl|table|blockquote|h[1-6]|fieldset|pre|address)( [^>]*)?>/gi, '<$1$2>');
-				e.content = e.content.replace(/<\/(p|div|ul|ol|dl|table|blockquote|h[1-6]|fieldset|pre|address)>\s*<\/p>/gi, '</$1>');
+		editor.on( 'BeforeSetContent', function( event ) {
+			if ( event.content ) {
+				event.content = event.content.replace( /<p>\s*<(p|div|ul|ol|dl|table|blockquote|h[1-6]|fieldset|pre)( [^>]*)?>/gi, '<$1$2>' )
+					.replace( /<\/(p|div|ul|ol|dl|table|blockquote|h[1-6]|fieldset|pre)>\s*<\/p>/gi, '</$1>' );
 			}
 		});
 
-		if ( typeof window.jQuery !== 'undefined' ) {
-			window.jQuery( document ).triggerHandler( 'tinymce-editor-init', [editor] );
+		if ( jq ) {
+			jq( document ).triggerHandler( 'tinymce-editor-init', [editor] );
 		}
 
 		if ( window.tinyMCEPreInit && window.tinyMCEPreInit.dragDropUpload ) {
 			dom.bind( doc, 'dragstart dragend dragover drop', function( event ) {
-				if ( typeof window.jQuery !== 'undefined' ) {
+				if ( jq ) {
 					// Trigger the jQuery handlers.
-					window.jQuery( document ).trigger( new window.jQuery.Event( event ) );
+					jq( document ).trigger( new jq.Event( event ) );
 				}
 			});
 		}
@@ -364,7 +378,7 @@
 	});
 
 	// Word count
-	if ( typeof window.jQuery !== 'undefined' ) {
+	if ( jq ) {
 		editor.on( 'keyup', function( e ) {
 			var key = e.keyCode || e.charCode;
 
@@ -373,7 +387,7 @@
 			}
 
 			if ( 13 === key || 8 === last || 46 === last ) {
-				window.jQuery( document ).triggerHandler( 'wpcountwords', [ editor.getContent({ format : 'raw' }) ] );
+				jq( document ).triggerHandler( 'wpcountwords', [ editor.getContent({ format : 'raw' }) ] );
 			}
 
 			last = key;
@@ -390,20 +404,11 @@
 		// Keep empty paragraphs :(
 		e.content = e.content.replace( /<p>(?:<br ?\/?>|\u00a0|\uFEFF| )*<\/p>/g, '<p>&nbsp;</p>' );
 
-		if ( editor.getParam( 'wpautop', true ) && typeof window.switchEditors !== 'undefined' ) {
+		if ( hasWpautop ) {
 			e.content = window.switchEditors.pre_wpautop( e.content );
 		}
 	});
 
-	// Remove spaces from empty paragraphs.
-	editor.on( 'BeforeSetContent', function( event ) {
-		var paragraph = tinymce.Env.webkit ? '<p><br /></p>' : '<p></p>';
-
-		if ( event.content ) {
-			event.content = event.content.replace( /<p>(?:&nbsp;|\u00a0|\uFEFF|\s)+<\/p>/gi, paragraph );
-		}
-	});
-
 	editor.on( 'preInit', function() {
 		// Don't replace <i> with <em> and <b> with <strong> and don't remove them when empty
 		editor.schema.addValidElements( '@[id|accesskey|class|dir|lang|style|tabindex|title|contenteditable|draggable|dropzone|hidden|spellcheck|translate],i,b' );