diff --git a/wp-admin/js/media-upload.js b/wp-admin/js/media-upload.js
index 356380a2a4..9b998ff2a3 100644
--- a/wp-admin/js/media-upload.js
+++ b/wp-admin/js/media-upload.js
@@ -86,478 +86,3 @@ var tb_position;
 	});
 
 })(jQuery);
-
-// WordPress, TinyMCE, and Media
-// -----------------------------
-(function($){
-	// Stores the editors' `wp.media.controller.Frame` instances.
-	var workflows = {},
-		linkToUrl;
-
-	linkToUrl = function( props, attachment ) {
-		var link = props.link || getUserSetting( 'urlbutton', 'post' ),
-			url;
-
-		if ( 'file' === link )
-			url = attachment.url;
-		else if ( 'post' === link )
-			url = attachment.link;
-		else if ( 'custom' === link )
-			url = props.linkUrl;
-
-		return url || '';
-	};
-
-	wp.media.string = {
-		// Joins the `props` and `attachment` objects,
-		// outputting the proper object format based on the
-		// attachment's type.
-		props: function( props, attachment ) {
-			var link, linkUrl, size, sizes;
-
-			props = props ? _.clone( props ) : {};
-
-			if ( attachment && attachment.type )
-				props.type = attachment.type;
-
-			if ( 'image' === props.type ) {
-				props = _.defaults( props || {}, {
-					align:   getUserSetting( 'align', 'none' ),
-					size:    getUserSetting( 'imgsize', 'medium' ),
-					url:     '',
-					classes: []
-				});
-			}
-
-			// All attachment-specific settings follow.
-			if ( ! attachment )
-				return props;
-
-			link = props.link || getUserSetting( 'urlbutton', 'post' );
-			if ( 'file' === link )
-				linkUrl = attachment.url;
-			else if ( 'post' === link )
-				linkUrl = attachment.link;
-			else if ( 'custom' === link )
-				linkUrl = props.linkUrl;
-			props.linkUrl = linkUrl || '';
-
-			// Format properties for images.
-			if ( 'image' === attachment.type ) {
-				props.classes.push( 'wp-image-' + attachment.id );
-
-				sizes = attachment.sizes;
-				size = sizes && sizes[ props.size ] ? sizes[ props.size ] : attachment;
-
-				_.extend( props, _.pick( attachment, 'align', 'caption' ), {
-					width:     size.width,
-					height:    size.height,
-					src:       size.url,
-					captionId: 'attachment_' + attachment.id
-				});
-
-			// Format properties for non-images.
-			} else {
-				_.extend( props, {
-					title:   attachment.title || attachment.filename,
-					rel:     'attachment wp-att-' + attachment.id
-				});
-			}
-
-			return props;
-		},
-
-		link: function( props, attachment ) {
-			var options;
-
-			props = wp.media.string.props( props, attachment );
-
-			options = {
-				tag:     'a',
-				content: props.title,
-				attrs:   {
-					href: props.linkUrl
-				}
-			};
-
-			if ( props.rel )
-				options.attrs.rel = props.rel;
-
-			return wp.html.string( options );
-		},
-
-		image: function( props, attachment ) {
-			var img = {},
-				options, classes, shortcode, html;
-
-			props = wp.media.string.props( props, attachment );
-			classes = props.classes || [];
-
-			img.src = props.url;
-			_.extend( img, _.pick( props, 'width', 'height', 'alt' ) );
-
-			// Only assign the align class to the image if we're not printing
-			// a caption, since the alignment is sent to the shortcode.
-			if ( props.align && ! props.caption )
-				classes.push( 'align' + props.align );
-
-			if ( props.size )
-				classes.push( 'size-' + props.size );
-
-			img['class'] = _.compact( classes ).join(' ');
-
-			// Generate `img` tag options.
-			options = {
-				tag:    'img',
-				attrs:  img,
-				single: true
-			};
-
-			// Generate the `a` element options, if they exist.
-			if ( props.linkUrl ) {
-				options = {
-					tag:   'a',
-					attrs: {
-						href: props.linkUrl
-					},
-					content: options
-				};
-			}
-
-			html = wp.html.string( options );
-
-			// Generate the caption shortcode.
-			if ( props.caption ) {
-				shortcode = {};
-
-				if ( img.width )
-					shortcode.width = img.width;
-
-				if ( props.captionId )
-					shortcode.id = props.captionId;
-
-				if ( props.align )
-					shortcode.align = 'align' + props.align;
-
-				html = wp.shortcode.string({
-					tag:     'caption',
-					attrs:   shortcode,
-					content: html + ' ' + props.caption
-				});
-			}
-
-			return html;
-		}
-	};
-
-	wp.media.gallery = (function() {
-		var galleries = {};
-
-		return {
-			defaults: {
-				order:      'ASC',
-				id:         wp.media.view.settings.postId,
-				itemtag:    'dl',
-				icontag:    'dt',
-				captiontag: 'dd',
-				columns:    3,
-				size:       'thumbnail'
-			},
-
-			attachments: function( shortcode ) {
-				var shortcodeString = shortcode.string(),
-					result = galleries[ shortcodeString ],
-					attrs, args, query, others;
-
-				delete galleries[ shortcodeString ];
-
-				if ( result )
-					return result;
-
-				attrs = shortcode.attrs.named;
-				args  = _.pick( attrs, 'orderby', 'order' );
-
-				args.type    = 'image';
-				args.perPage = -1;
-
-				// Map the `ids` param to the correct query args.
-				if ( attrs.ids ) {
-					args.post__in = attrs.ids.split(',');
-					args.orderby  = 'post__in';
-				} else if ( attrs.include ) {
-					args.post__in = attrs.include.split(',');
-				}
-
-				if ( attrs.exclude )
-					args.post__not_in = attrs.exclude.split(',');
-
-				if ( ! args.post__in )
-					args.parent = attrs.id;
-
-				// Collect the attributes that were not included in `args`.
-				others = {};
-				_.filter( attrs, function( value, key ) {
-					if ( _.isUndefined( args[ key ] ) )
-						others[ key ] = value;
-				});
-
-				query = media.query( args );
-				query.gallery = new Backbone.Model( others );
-				return query;
-			},
-
-			shortcode: function( attachments ) {
-				var props = attachments.props.toJSON(),
-					attrs = _.pick( props, 'include', 'exclude', 'orderby', 'order' ),
-					shortcode, clone;
-
-				if ( attachments.gallery )
-					_.extend( attrs, attachments.gallery.toJSON() );
-
-				attrs.ids = attachments.pluck('id');
-
-				// If the `ids` attribute is set and `orderby` attribute
-				// is the default value, clear it for cleaner output.
-				if ( attrs.ids && 'post__in' === attrs.orderby )
-					delete attrs.orderby;
-
-				// Remove default attributes from the shortcode.
-				_.each( wp.media.gallery.defaults, function( value, key ) {
-					if ( value === attrs[ key ] )
-						delete attrs[ key ];
-				});
-
-				shortcode = new wp.shortcode({
-					tag:    'gallery',
-					attrs:  attrs,
-					type:   'single'
-				});
-
-				// Use a cloned version of the gallery.
-				clone = new wp.media.model.Attachments( attachments.models, {
-					props: props
-				});
-				clone.gallery = attachments.gallery;
-				galleries[ shortcode.string() ] = clone;
-
-				return shortcode;
-			},
-
-			edit: function( content ) {
-				var shortcode = wp.shortcode.next( 'gallery', content ),
-					defaultPostId = wp.media.gallery.defaults.id,
-					attachments, selection;
-
-				// Bail if we didn't match the shortcode or all of the content.
-				if ( ! shortcode || shortcode.content !== content )
-					return;
-
-				// Ignore the rest of the match object.
-				shortcode = shortcode.shortcode;
-
-				if ( _.isUndefined( shortcode.get('id') ) && ! _.isUndefined( defaultPostId ) )
-					shortcode.set( 'id', defaultPostId );
-
-				attachments = wp.media.gallery.attachments( shortcode );
-
-				selection = new wp.media.model.Selection( attachments.models, {
-					props:    attachments.props.toJSON(),
-					multiple: true
-				});
-
-				selection.gallery = attachments.gallery;
-
-				// Fetch the query's attachments, and then break ties from the
-				// query to allow for sorting.
-				selection.more().done( function() {
-					// Break ties with the query.
-					selection.props.set({ query: false });
-					selection.unmirror();
-					selection.props.unset('orderby');
-				});
-
-				return wp.media({
-					frame:     'post',
-					state:     'gallery-edit',
-					title:     wp.media.view.l10n.editGalleryTitle,
-					editing:   true,
-					multiple:  true,
-					selection: selection
-				});
-			}
-		};
-	}());
-
-	wp.media.editor = {
-		insert: send_to_editor,
-
-		add: function( id, options ) {
-			var workflow = this.get( id );
-
-			if ( workflow )
-				return workflow;
-
-			workflow = workflows[ id ] = wp.media( _.defaults( options || {}, {
-				frame:    'post',
-				title:    wp.media.view.l10n.insertMedia,
-				multiple: true
-			} ) );
-
-			workflow.on( 'insert', function( selection ) {
-				var state = workflow.state(),
-					details = state.get('details');
-
-				selection = selection || state.get('selection');
-
-				if ( ! selection || ! details )
-					return;
-
-				selection.each( function( attachment ) {
-					var detail = details[ attachment.cid ];
-
-					if ( detail )
-						detail = detail.toJSON();
-
-					// Reset the attachment details.
-					delete details[ attachment.cid ];
-
-					attachment = attachment.toJSON();
-
-					this.send.attachment( detail, attachment );
-				}, this );
-			}, this );
-
-			workflow.get('gallery-edit').on( 'update', function( selection ) {
-				this.insert( wp.media.gallery.shortcode( selection ).string() );
-			}, this );
-
-			workflow.get('embed').on( 'select', function() {
-				var embed = workflow.state().toJSON();
-
-				embed.url = embed.url || '';
-
-				if ( 'link' === embed.type ) {
-					_.defaults( embed, {
-						title:   embed.url,
-						linkUrl: embed.url
-					});
-
-					this.send.link( embed );
-
-				} else if ( 'image' === embed.type ) {
-					_.defaults( embed, {
-						title:   embed.url,
-						linkUrl: '',
-						align:   'none',
-						link:    'none'
-					});
-
-					if ( 'none' === embed.link )
-						embed.linkUrl = '';
-					else if ( 'file' === embed.link )
-						embed.linkUrl = embed.url;
-
-					this.insert( wp.media.string.image( embed ) );
-				}
-			}, this );
-
-			return workflow;
-		},
-
-		get: function( id ) {
-			return workflows[ id ];
-		},
-
-		remove: function( id ) {
-			delete workflows[ id ];
-		},
-
-		send: {
-			attachment: function( props, attachment ) {
-				var caption = attachment.caption,
-					options, html;
-
-				// If captions are disabled, clear the caption.
-				if ( ! wp.media.view.settings.captions )
-					delete attachment.caption;
-
-				props = wp.media.string.props( props, attachment );
-
-				options = {
-					id: attachment.id
-				};
-
-				if ( 'image' === attachment.type ) {
-					html = wp.media.string.image( props );
-					options['caption'] = caption;
-
-					_.each({
-						align:   'image-align',
-						size:    'image-size',
-						alt:     'image-alt',
-						linkUrl: 'url'
-					}, function( option, prop ) {
-						if ( props[ prop ] )
-							options[ option ] = props[ prop ];
-					});
-
-				} else {
-					html = wp.media.string.link( props );
-					options.title = props.title;
-				}
-
-				return media.post( 'send-attachment-to-editor', {
-					nonce:      wp.media.view.settings.nonce.sendToEditor,
-					attachment: options,
-					html:       html
-				}).done( function( resp ) {
-					wp.media.editor.insert( resp );
-				});
-			},
-
-			link: function( embed ) {
-				return media.post( 'send-link-to-editor', {
-					nonce: wp.media.view.settings.nonce.sendToEditor,
-					src:   embed.linkUrl,
-					title: embed.title,
-					html:  wp.media.string.link( embed )
-				}).done( function( resp ) {
-					wp.media.editor.insert( resp );
-				});
-			}
-		},
-
-		init: function() {
-			$(document.body).on('click', '.insert-media', function( event ) {
-				var $this = $(this),
-					editor = $this.data('editor'),
-					workflow;
-
-				event.preventDefault();
-
-				// Remove focus from the `.insert-media` button.
-				// Prevents Opera from showing the outline of the button
-				// above the modal.
-				//
-				// See: http://core.trac.wordpress.org/ticket/22445
-				$this.blur();
-
-				if ( ! _.isString( editor ) )
-					return;
-
-				workflow = wp.media.editor.get( editor );
-
-				// If the workflow exists, just open it.
-				if ( workflow ) {
-					workflow.open();
-					return;
-				}
-
-				// Initialize the editor's workflow if we haven't yet.
-				wp.media.editor.add( editor );
-			});
-		}
-	};
-
-	$( wp.media.editor.init );
-}(jQuery));
\ No newline at end of file
diff --git a/wp-includes/js/media-editor.js b/wp-includes/js/media-editor.js
new file mode 100644
index 0000000000..356380a2a4
--- /dev/null
+++ b/wp-includes/js/media-editor.js
@@ -0,0 +1,563 @@
+// send html to the post editor
+
+var wpActiveEditor;
+
+function send_to_editor(h) {
+	var ed, mce = typeof(tinymce) != 'undefined', qt = typeof(QTags) != 'undefined';
+
+	if ( !wpActiveEditor ) {
+		if ( mce && tinymce.activeEditor ) {
+			ed = tinymce.activeEditor;
+			wpActiveEditor = ed.id;
+		} else if ( !qt ) {
+			return false;
+		}
+	} else if ( mce ) {
+		if ( tinymce.activeEditor && (tinymce.activeEditor.id == 'mce_fullscreen' || tinymce.activeEditor.id == 'wp_mce_fullscreen') )
+			ed = tinymce.activeEditor;
+		else
+			ed = tinymce.get(wpActiveEditor);
+	}
+
+	if ( ed && !ed.isHidden() ) {
+		// restore caret position on IE
+		if ( tinymce.isIE && ed.windowManager.insertimagebookmark )
+			ed.selection.moveToBookmark(ed.windowManager.insertimagebookmark);
+
+		if ( h.indexOf('[caption') === 0 ) {
+			if ( ed.wpSetImgCaption )
+				h = ed.wpSetImgCaption(h);
+		} else if ( h.indexOf('[gallery') === 0 ) {
+			if ( ed.plugins.wpgallery )
+				h = ed.plugins.wpgallery._do_gallery(h);
+		} else if ( h.indexOf('[embed') === 0 ) {
+			if ( ed.plugins.wordpress )
+				h = ed.plugins.wordpress._setEmbed(h);
+		}
+
+		ed.execCommand('mceInsertContent', false, h);
+	} else if ( qt ) {
+		QTags.insertContent(h);
+	} else {
+		document.getElementById(wpActiveEditor).value += h;
+	}
+
+	try{tb_remove();}catch(e){};
+}
+
+// thickbox settings
+var tb_position;
+(function($) {
+	tb_position = function() {
+		var tbWindow = $('#TB_window'), width = $(window).width(), H = $(window).height(), W = ( 720 < width ) ? 720 : width, adminbar_height = 0;
+
+		if ( $('body.admin-bar').length )
+			adminbar_height = 28;
+
+		if ( tbWindow.size() ) {
+			tbWindow.width( W - 50 ).height( H - 45 - adminbar_height );
+			$('#TB_iframeContent').width( W - 50 ).height( H - 75 - adminbar_height );
+			tbWindow.css({'margin-left': '-' + parseInt((( W - 50 ) / 2),10) + 'px'});
+			if ( typeof document.body.style.maxWidth != 'undefined' )
+				tbWindow.css({'top': 20 + adminbar_height + 'px','margin-top':'0'});
+		};
+
+		return $('a.thickbox').each( function() {
+			var href = $(this).attr('href');
+			if ( ! href ) return;
+			href = href.replace(/&width=[0-9]+/g, '');
+			href = href.replace(/&height=[0-9]+/g, '');
+			$(this).attr( 'href', href + '&width=' + ( W - 80 ) + '&height=' + ( H - 85 - adminbar_height ) );
+		});
+	};
+
+	$(window).resize(function(){ tb_position(); });
+
+	// store caret position in IE
+	$(document).ready(function($){
+		$('a.thickbox').click(function(){
+			var ed;
+
+			if ( typeof(tinymce) != 'undefined' && tinymce.isIE && ( ed = tinymce.get(wpActiveEditor) ) && !ed.isHidden() ) {
+				ed.focus();
+				ed.windowManager.insertimagebookmark = ed.selection.getBookmark();
+			}
+		});
+	});
+
+})(jQuery);
+
+// WordPress, TinyMCE, and Media
+// -----------------------------
+(function($){
+	// Stores the editors' `wp.media.controller.Frame` instances.
+	var workflows = {},
+		linkToUrl;
+
+	linkToUrl = function( props, attachment ) {
+		var link = props.link || getUserSetting( 'urlbutton', 'post' ),
+			url;
+
+		if ( 'file' === link )
+			url = attachment.url;
+		else if ( 'post' === link )
+			url = attachment.link;
+		else if ( 'custom' === link )
+			url = props.linkUrl;
+
+		return url || '';
+	};
+
+	wp.media.string = {
+		// Joins the `props` and `attachment` objects,
+		// outputting the proper object format based on the
+		// attachment's type.
+		props: function( props, attachment ) {
+			var link, linkUrl, size, sizes;
+
+			props = props ? _.clone( props ) : {};
+
+			if ( attachment && attachment.type )
+				props.type = attachment.type;
+
+			if ( 'image' === props.type ) {
+				props = _.defaults( props || {}, {
+					align:   getUserSetting( 'align', 'none' ),
+					size:    getUserSetting( 'imgsize', 'medium' ),
+					url:     '',
+					classes: []
+				});
+			}
+
+			// All attachment-specific settings follow.
+			if ( ! attachment )
+				return props;
+
+			link = props.link || getUserSetting( 'urlbutton', 'post' );
+			if ( 'file' === link )
+				linkUrl = attachment.url;
+			else if ( 'post' === link )
+				linkUrl = attachment.link;
+			else if ( 'custom' === link )
+				linkUrl = props.linkUrl;
+			props.linkUrl = linkUrl || '';
+
+			// Format properties for images.
+			if ( 'image' === attachment.type ) {
+				props.classes.push( 'wp-image-' + attachment.id );
+
+				sizes = attachment.sizes;
+				size = sizes && sizes[ props.size ] ? sizes[ props.size ] : attachment;
+
+				_.extend( props, _.pick( attachment, 'align', 'caption' ), {
+					width:     size.width,
+					height:    size.height,
+					src:       size.url,
+					captionId: 'attachment_' + attachment.id
+				});
+
+			// Format properties for non-images.
+			} else {
+				_.extend( props, {
+					title:   attachment.title || attachment.filename,
+					rel:     'attachment wp-att-' + attachment.id
+				});
+			}
+
+			return props;
+		},
+
+		link: function( props, attachment ) {
+			var options;
+
+			props = wp.media.string.props( props, attachment );
+
+			options = {
+				tag:     'a',
+				content: props.title,
+				attrs:   {
+					href: props.linkUrl
+				}
+			};
+
+			if ( props.rel )
+				options.attrs.rel = props.rel;
+
+			return wp.html.string( options );
+		},
+
+		image: function( props, attachment ) {
+			var img = {},
+				options, classes, shortcode, html;
+
+			props = wp.media.string.props( props, attachment );
+			classes = props.classes || [];
+
+			img.src = props.url;
+			_.extend( img, _.pick( props, 'width', 'height', 'alt' ) );
+
+			// Only assign the align class to the image if we're not printing
+			// a caption, since the alignment is sent to the shortcode.
+			if ( props.align && ! props.caption )
+				classes.push( 'align' + props.align );
+
+			if ( props.size )
+				classes.push( 'size-' + props.size );
+
+			img['class'] = _.compact( classes ).join(' ');
+
+			// Generate `img` tag options.
+			options = {
+				tag:    'img',
+				attrs:  img,
+				single: true
+			};
+
+			// Generate the `a` element options, if they exist.
+			if ( props.linkUrl ) {
+				options = {
+					tag:   'a',
+					attrs: {
+						href: props.linkUrl
+					},
+					content: options
+				};
+			}
+
+			html = wp.html.string( options );
+
+			// Generate the caption shortcode.
+			if ( props.caption ) {
+				shortcode = {};
+
+				if ( img.width )
+					shortcode.width = img.width;
+
+				if ( props.captionId )
+					shortcode.id = props.captionId;
+
+				if ( props.align )
+					shortcode.align = 'align' + props.align;
+
+				html = wp.shortcode.string({
+					tag:     'caption',
+					attrs:   shortcode,
+					content: html + ' ' + props.caption
+				});
+			}
+
+			return html;
+		}
+	};
+
+	wp.media.gallery = (function() {
+		var galleries = {};
+
+		return {
+			defaults: {
+				order:      'ASC',
+				id:         wp.media.view.settings.postId,
+				itemtag:    'dl',
+				icontag:    'dt',
+				captiontag: 'dd',
+				columns:    3,
+				size:       'thumbnail'
+			},
+
+			attachments: function( shortcode ) {
+				var shortcodeString = shortcode.string(),
+					result = galleries[ shortcodeString ],
+					attrs, args, query, others;
+
+				delete galleries[ shortcodeString ];
+
+				if ( result )
+					return result;
+
+				attrs = shortcode.attrs.named;
+				args  = _.pick( attrs, 'orderby', 'order' );
+
+				args.type    = 'image';
+				args.perPage = -1;
+
+				// Map the `ids` param to the correct query args.
+				if ( attrs.ids ) {
+					args.post__in = attrs.ids.split(',');
+					args.orderby  = 'post__in';
+				} else if ( attrs.include ) {
+					args.post__in = attrs.include.split(',');
+				}
+
+				if ( attrs.exclude )
+					args.post__not_in = attrs.exclude.split(',');
+
+				if ( ! args.post__in )
+					args.parent = attrs.id;
+
+				// Collect the attributes that were not included in `args`.
+				others = {};
+				_.filter( attrs, function( value, key ) {
+					if ( _.isUndefined( args[ key ] ) )
+						others[ key ] = value;
+				});
+
+				query = media.query( args );
+				query.gallery = new Backbone.Model( others );
+				return query;
+			},
+
+			shortcode: function( attachments ) {
+				var props = attachments.props.toJSON(),
+					attrs = _.pick( props, 'include', 'exclude', 'orderby', 'order' ),
+					shortcode, clone;
+
+				if ( attachments.gallery )
+					_.extend( attrs, attachments.gallery.toJSON() );
+
+				attrs.ids = attachments.pluck('id');
+
+				// If the `ids` attribute is set and `orderby` attribute
+				// is the default value, clear it for cleaner output.
+				if ( attrs.ids && 'post__in' === attrs.orderby )
+					delete attrs.orderby;
+
+				// Remove default attributes from the shortcode.
+				_.each( wp.media.gallery.defaults, function( value, key ) {
+					if ( value === attrs[ key ] )
+						delete attrs[ key ];
+				});
+
+				shortcode = new wp.shortcode({
+					tag:    'gallery',
+					attrs:  attrs,
+					type:   'single'
+				});
+
+				// Use a cloned version of the gallery.
+				clone = new wp.media.model.Attachments( attachments.models, {
+					props: props
+				});
+				clone.gallery = attachments.gallery;
+				galleries[ shortcode.string() ] = clone;
+
+				return shortcode;
+			},
+
+			edit: function( content ) {
+				var shortcode = wp.shortcode.next( 'gallery', content ),
+					defaultPostId = wp.media.gallery.defaults.id,
+					attachments, selection;
+
+				// Bail if we didn't match the shortcode or all of the content.
+				if ( ! shortcode || shortcode.content !== content )
+					return;
+
+				// Ignore the rest of the match object.
+				shortcode = shortcode.shortcode;
+
+				if ( _.isUndefined( shortcode.get('id') ) && ! _.isUndefined( defaultPostId ) )
+					shortcode.set( 'id', defaultPostId );
+
+				attachments = wp.media.gallery.attachments( shortcode );
+
+				selection = new wp.media.model.Selection( attachments.models, {
+					props:    attachments.props.toJSON(),
+					multiple: true
+				});
+
+				selection.gallery = attachments.gallery;
+
+				// Fetch the query's attachments, and then break ties from the
+				// query to allow for sorting.
+				selection.more().done( function() {
+					// Break ties with the query.
+					selection.props.set({ query: false });
+					selection.unmirror();
+					selection.props.unset('orderby');
+				});
+
+				return wp.media({
+					frame:     'post',
+					state:     'gallery-edit',
+					title:     wp.media.view.l10n.editGalleryTitle,
+					editing:   true,
+					multiple:  true,
+					selection: selection
+				});
+			}
+		};
+	}());
+
+	wp.media.editor = {
+		insert: send_to_editor,
+
+		add: function( id, options ) {
+			var workflow = this.get( id );
+
+			if ( workflow )
+				return workflow;
+
+			workflow = workflows[ id ] = wp.media( _.defaults( options || {}, {
+				frame:    'post',
+				title:    wp.media.view.l10n.insertMedia,
+				multiple: true
+			} ) );
+
+			workflow.on( 'insert', function( selection ) {
+				var state = workflow.state(),
+					details = state.get('details');
+
+				selection = selection || state.get('selection');
+
+				if ( ! selection || ! details )
+					return;
+
+				selection.each( function( attachment ) {
+					var detail = details[ attachment.cid ];
+
+					if ( detail )
+						detail = detail.toJSON();
+
+					// Reset the attachment details.
+					delete details[ attachment.cid ];
+
+					attachment = attachment.toJSON();
+
+					this.send.attachment( detail, attachment );
+				}, this );
+			}, this );
+
+			workflow.get('gallery-edit').on( 'update', function( selection ) {
+				this.insert( wp.media.gallery.shortcode( selection ).string() );
+			}, this );
+
+			workflow.get('embed').on( 'select', function() {
+				var embed = workflow.state().toJSON();
+
+				embed.url = embed.url || '';
+
+				if ( 'link' === embed.type ) {
+					_.defaults( embed, {
+						title:   embed.url,
+						linkUrl: embed.url
+					});
+
+					this.send.link( embed );
+
+				} else if ( 'image' === embed.type ) {
+					_.defaults( embed, {
+						title:   embed.url,
+						linkUrl: '',
+						align:   'none',
+						link:    'none'
+					});
+
+					if ( 'none' === embed.link )
+						embed.linkUrl = '';
+					else if ( 'file' === embed.link )
+						embed.linkUrl = embed.url;
+
+					this.insert( wp.media.string.image( embed ) );
+				}
+			}, this );
+
+			return workflow;
+		},
+
+		get: function( id ) {
+			return workflows[ id ];
+		},
+
+		remove: function( id ) {
+			delete workflows[ id ];
+		},
+
+		send: {
+			attachment: function( props, attachment ) {
+				var caption = attachment.caption,
+					options, html;
+
+				// If captions are disabled, clear the caption.
+				if ( ! wp.media.view.settings.captions )
+					delete attachment.caption;
+
+				props = wp.media.string.props( props, attachment );
+
+				options = {
+					id: attachment.id
+				};
+
+				if ( 'image' === attachment.type ) {
+					html = wp.media.string.image( props );
+					options['caption'] = caption;
+
+					_.each({
+						align:   'image-align',
+						size:    'image-size',
+						alt:     'image-alt',
+						linkUrl: 'url'
+					}, function( option, prop ) {
+						if ( props[ prop ] )
+							options[ option ] = props[ prop ];
+					});
+
+				} else {
+					html = wp.media.string.link( props );
+					options.title = props.title;
+				}
+
+				return media.post( 'send-attachment-to-editor', {
+					nonce:      wp.media.view.settings.nonce.sendToEditor,
+					attachment: options,
+					html:       html
+				}).done( function( resp ) {
+					wp.media.editor.insert( resp );
+				});
+			},
+
+			link: function( embed ) {
+				return media.post( 'send-link-to-editor', {
+					nonce: wp.media.view.settings.nonce.sendToEditor,
+					src:   embed.linkUrl,
+					title: embed.title,
+					html:  wp.media.string.link( embed )
+				}).done( function( resp ) {
+					wp.media.editor.insert( resp );
+				});
+			}
+		},
+
+		init: function() {
+			$(document.body).on('click', '.insert-media', function( event ) {
+				var $this = $(this),
+					editor = $this.data('editor'),
+					workflow;
+
+				event.preventDefault();
+
+				// Remove focus from the `.insert-media` button.
+				// Prevents Opera from showing the outline of the button
+				// above the modal.
+				//
+				// See: http://core.trac.wordpress.org/ticket/22445
+				$this.blur();
+
+				if ( ! _.isString( editor ) )
+					return;
+
+				workflow = wp.media.editor.get( editor );
+
+				// If the workflow exists, just open it.
+				if ( workflow ) {
+					workflow.open();
+					return;
+				}
+
+				// Initialize the editor's workflow if we haven't yet.
+				wp.media.editor.add( editor );
+			});
+		}
+	};
+
+	$( wp.media.editor.init );
+}(jQuery));
\ No newline at end of file
diff --git a/wp-includes/js/media-editor.min.js b/wp-includes/js/media-editor.min.js
new file mode 100644
index 0000000000..08860219a4
--- /dev/null
+++ b/wp-includes/js/media-editor.min.js
@@ -0,0 +1 @@
+var wpActiveEditor;function send_to_editor(c){var b,a=typeof(tinymce)!="undefined",f=typeof(QTags)!="undefined";if(!wpActiveEditor){if(a&&tinymce.activeEditor){b=tinymce.activeEditor;wpActiveEditor=b.id}else{if(!f){return false}}}else{if(a){if(tinymce.activeEditor&&(tinymce.activeEditor.id=="mce_fullscreen"||tinymce.activeEditor.id=="wp_mce_fullscreen")){b=tinymce.activeEditor}else{b=tinymce.get(wpActiveEditor)}}}if(b&&!b.isHidden()){if(tinymce.isIE&&b.windowManager.insertimagebookmark){b.selection.moveToBookmark(b.windowManager.insertimagebookmark)}if(c.indexOf("[caption")===0){if(b.wpSetImgCaption){c=b.wpSetImgCaption(c)}}else{if(c.indexOf("[gallery")===0){if(b.plugins.wpgallery){c=b.plugins.wpgallery._do_gallery(c)}}else{if(c.indexOf("[embed")===0){if(b.plugins.wordpress){c=b.plugins.wordpress._setEmbed(c)}}}}b.execCommand("mceInsertContent",false,c)}else{if(f){QTags.insertContent(c)}else{document.getElementById(wpActiveEditor).value+=c}}try{tb_remove()}catch(d){}}var tb_position;(function(a){tb_position=function(){var f=a("#TB_window"),e=a(window).width(),d=a(window).height(),c=(720<e)?720:e,b=0;if(a("body.admin-bar").length){b=28}if(f.size()){f.width(c-50).height(d-45-b);a("#TB_iframeContent").width(c-50).height(d-75-b);f.css({"margin-left":"-"+parseInt(((c-50)/2),10)+"px"});if(typeof document.body.style.maxWidth!="undefined"){f.css({top:20+b+"px","margin-top":"0"})}}return a("a.thickbox").each(function(){var g=a(this).attr("href");if(!g){return}g=g.replace(/&width=[0-9]+/g,"");g=g.replace(/&height=[0-9]+/g,"");a(this).attr("href",g+"&width="+(c-80)+"&height="+(d-85-b))})};a(window).resize(function(){tb_position()});a(document).ready(function(b){b("a.thickbox").click(function(){var c;if(typeof(tinymce)!="undefined"&&tinymce.isIE&&(c=tinymce.get(wpActiveEditor))&&!c.isHidden()){c.focus();c.windowManager.insertimagebookmark=c.selection.getBookmark()}})})})(jQuery);(function(b){var a={},c;c=function(e,g){var f=e.link||getUserSetting("urlbutton","post"),d;if("file"===f){d=g.url}else{if("post"===f){d=g.link}else{if("custom"===f){d=e.linkUrl}}}return d||""};wp.media.string={link:function(e,f){var d;e=_.defaults(e||{},{title:"",linkUrl:""});if(f){_.extend(e,{title:f.title||f.filename,linkUrl:c(e,f),rel:"attachment wp-att-"+f.id})}d={tag:"a",content:e.title,attrs:{href:e.linkUrl}};if(e.rel){d.attrs.rel=e.rel}return wp.html.string(d)},image:function(i,h){var d=[],f={},l,j,k,e,g;i=_.defaults(i||{},{align:getUserSetting("align","none"),size:getUserSetting("imgsize","medium"),url:""});if(h){d.push("wp-image-"+h.id);j=h.sizes;k=j&&j[i.size]?j[i.size]:h;_.extend(i,_.pick(h,"align","caption"),{width:k.width,height:k.height,src:k.url,linkUrl:c(i,h),captionId:"attachment_"+h.id})}f.src=i.url;_.extend(f,_.pick(i,"width","height","alt"));if(i.align&&!i.caption){d.push("align"+i.align)}if(i.size){d.push("size-"+i.size)}f["class"]=_.compact(d).join(" ");l={tag:"img",attrs:f,single:true};if(i.linkUrl){l={tag:"a",attrs:{href:i.linkUrl},content:l}}g=wp.html.string(l);if(i.caption){e={};if(f.width){e.width=f.width}if(i.captionId){e.id=i.captionId}if(i.align){e.align="align"+i.align}g=wp.shortcode.string({tag:"caption",attrs:e,content:g+" "+i.caption})}return g}};wp.media.gallery=(function(){var d={};return{defaults:{order:"ASC",id:wp.media.view.settings.postId,itemtag:"dl",icontag:"dt",captiontag:"dd",columns:3,size:"thumbnail"},attachments:function(i){var k=i.string(),e=d[k],g,f,j,h;delete d[k];if(e){return e}g=i.attrs.named;f=_.pick(g,"orderby","order");f.type="image";f.perPage=-1;if(g.ids){f.post__in=g.ids.split(",");f.orderby="post__in"}else{if(g.include){f.post__in=g.include.split(",")}}if(g.exclude){f.post__not_in=g.exclude.split(",")}if(!f.post__in){f.parent=g.id}h={};_.filter(g,function(m,l){if(_.isUndefined(f[l])){h[l]=m}});j=media.query(f);j.gallery=new Backbone.Model(h);return j},shortcode:function(e){var g=e.props.toJSON(),f=_.pick(g,"include","exclude","orderby","order"),h,i;if(e.gallery){_.extend(f,e.gallery.toJSON())}f.ids=e.pluck("id");if(f.ids&&"post__in"===f.orderby){delete f.orderby}_.each(wp.media.gallery.defaults,function(k,j){if(k===f[j]){delete f[j]}});h=new wp.shortcode({tag:"gallery",attrs:f,type:"single"});i=new wp.media.model.Attachments(e.models,{props:g});i.gallery=e.gallery;d[h.string()]=i;return h},edit:function(h){var g=wp.shortcode.next("gallery",h),i=wp.media.gallery.defaults.id,e,f;if(!g||g.content!==h){return}g=g.shortcode;if(_.isUndefined(g.get("id"))&&!_.isUndefined(i)){g.set("id",i)}e=wp.media.gallery.attachments(g);f=new wp.media.model.Selection(e.models,{props:e.props.toJSON(),multiple:true});f.gallery=e.gallery;f.more().done(function(){f.props.set({query:false});f.unmirror();f.props.unset("orderby")});return wp.media({frame:"post",state:"gallery-edit",title:wp.media.view.l10n.editGalleryTitle,editing:true,multiple:true,selection:f})}}}());wp.media.editor={insert:send_to_editor,add:function(f,d){var e=this.get(f);if(e){return e}e=a[f]=wp.media(_.defaults(d||{},{frame:"post",title:wp.media.view.l10n.insertMedia,multiple:true}));e.on("insert",function(h){var i=e.state(),g=i.get("details");h=h||i.get("selection");if(!h||!g){return}h.each(function(k){var j=g[k.cid];if(j){j=j.toJSON()}delete g[k.cid];k=k.toJSON();if(!wp.media.view.settings.captions){delete k.caption}if("image"===k.type){this.insert(wp.media.string.image(j,k)+" ")}else{this.insert(wp.media.string.link(j,k)+" ")}},this)},this);e.get("gallery-edit").on("update",function(g){this.insert(wp.media.gallery.shortcode(g).string())},this);e.get("embed").on("select",function(){var g=e.state().toJSON();g.url=g.url||"";if("link"===g.type){_.defaults(g,{title:g.url,linkUrl:g.url});this.insert(wp.media.string.link(g))}else{if("image"===g.type){_.defaults(g,{title:g.url,linkUrl:"",align:"none",link:"none"});if("none"===g.link){g.linkUrl=""}else{if("file"===g.link){g.linkUrl=g.url}}this.insert(wp.media.string.image(g))}}},this);return e},get:function(d){return a[d]},remove:function(d){delete a[d]},init:function(){b(document.body).on("click",".insert-media",function(e){var f=b(this),d=f.data("editor"),g;e.preventDefault();f.blur();if(!_.isString(d)){return}g=wp.media.editor.get(d);if(g){g.open();return}wp.media.editor.add(d)})}};b(wp.media.editor.init)}(jQuery));
\ No newline at end of file
diff --git a/wp-includes/js/media-models.js b/wp-includes/js/media-models.js
index e4779f8efc..6f2c2f7a45 100644
--- a/wp-includes/js/media-models.js
+++ b/wp-includes/js/media-models.js
@@ -41,6 +41,10 @@ window.wp = window.wp || {};
 	// Link any localized strings.
 	l10n = media.model.l10n = typeof _wpMediaModelsL10n === 'undefined' ? {} : _wpMediaModelsL10n;
 
+	// Link any settings.
+	media.model.settings = l10n.settings || {};
+	delete l10n.settings;
+
 	/**
 	 * ========================================================================
 	 * UTILITIES
@@ -124,7 +128,7 @@ window.wp = window.wp || {};
 
 			options = _.defaults( options || {}, {
 				type:    'POST',
-				url:     ajaxurl,
+				url:     media.model.settings.ajaxurl,
 				context: this
 			});
 
@@ -221,7 +225,7 @@ window.wp = window.wp || {};
 				options.data = _.extend( options.data || {}, {
 					action: 'save-attachment',
 					id:     this.id,
-					nonce:  l10n.saveAttachmentNonce
+					nonce:  media.model.settings.saveAttachmentNonce
 				});
 
 				// Record the values of the changed attributes.
diff --git a/wp-includes/media.php b/wp-includes/media.php
index fba25d53e4..d8475f18af 100644
--- a/wp-includes/media.php
+++ b/wp-includes/media.php
@@ -1387,7 +1387,7 @@ function wp_enqueue_media( $args = array() ) {
 
 	wp_localize_script( 'media-views', '_wpMediaViewsL10n', $strings );
 
-	wp_enqueue_script( 'media-upload' );
+	wp_enqueue_script( 'media-editor' );
 	wp_enqueue_style( 'media-views' );
 	wp_plupload_default_settings();
 	add_action( 'admin_footer', 'wp_print_media_templates' );
diff --git a/wp-includes/script-loader.php b/wp-includes/script-loader.php
index 6b9666a90c..6d71aeb72b 100644
--- a/wp-includes/script-loader.php
+++ b/wp-includes/script-loader.php
@@ -298,7 +298,7 @@ function wp_default_scripts( &$scripts ) {
 		'type' => 'characters' == _x( 'words', 'word count: words or characters?' ) ? 'c' : 'w',
 	) );
 
-	$scripts->add( 'media-upload', "/wp-admin/js/media-upload$suffix.js", array( 'thickbox', 'shortcode', 'media-views' ), false, 1 );
+	$scripts->add( 'media-upload', "/wp-admin/js/media-upload$suffix.js", array( 'thickbox', 'shortcode' ), false, 1 );
 
 	$scripts->add( 'hoverIntent', "/wp-includes/js/hoverIntent$suffix.js", array('jquery'), 'r6', 1 );
 
@@ -318,13 +318,19 @@ function wp_default_scripts( &$scripts ) {
 		'allowedFiles' => __( 'Allowed Files' ),
 	) );
 
+	$scripts->add( 'shortcode', "/wp-includes/js/shortcode$suffix.js", array( 'underscore' ), false, 1 );
 	$scripts->add( 'media-models', "/wp-includes/js/media-models$suffix.js", array( 'backbone', 'jquery' ), false, 1 );
 	did_action( 'init' ) && $scripts->localize( 'media-models', '_wpMediaModelsL10n', array(
-		'saveAttachmentNonce' => wp_create_nonce( 'save-attachment' ),
+		'settings' => array(
+			'saveAttachmentNonce' => wp_create_nonce( 'save-attachment' ),
+			'ajaxurl' => admin_url( 'admin-ajax.php', 'relative' ),
+		),
 	) );
 
+	// To enqueue media-views or media-editor, call wp_enqueue_media().
+	// Both rely on numerous settings, styles, and templates to operate correctly.
 	$scripts->add( 'media-views',  "/wp-includes/js/media-views$suffix.js",  array( 'media-models', 'wp-plupload' ), false, 1 );
-	$scripts->add( 'shortcode', "/wp-includes/js/shortcode$suffix.js", array( 'underscore' ), false, 1 );
+	$scripts->add( 'media-editor', "/wp-includes/js/media-editor$suffix.js", array( 'shortcode', 'media-views' ), false, 1 );
 	$scripts->add( 'mce-view', "/wp-includes/js/mce-view$suffix.js", array( 'shortcode', 'media-models' ), false, 1 );
 
 	if ( is_admin() ) {