Index: wp-admin/press-this.php
===================================================================
--- wp-admin/press-this.php	(revision 22260)
+++ wp-admin/press-this.php	(working copy)
@@ -109,28 +109,6 @@
 
 if ( !empty($_REQUEST['ajax']) ) {
 	switch ($_REQUEST['ajax']) {
-		case 'video': ?>
-			<script type="text/javascript">
-			/* <![CDATA[ */
-				jQuery('.select').click(function() {
-					append_editor(jQuery('#embed-code').val());
-					jQuery('#extra-fields').hide();
-					jQuery('#extra-fields').html('');
-				});
-				jQuery('.close').click(function() {
-					jQuery('#extra-fields').hide();
-					jQuery('#extra-fields').html('');
-				});
-			/* ]]> */
-			</script>
-			<div class="postbox">
-				<h2><label for="embed-code"><?php _e('Embed Code') ?></label></h2>
-				<div class="inside">
-					<textarea name="embed-code" id="embed-code" rows="8" cols="40"><?php echo esc_textarea( $selection ); ?></textarea>
-					<p id="options"><a href="#" class="select button"><?php _e('Insert Video'); ?></a> <a href="#" class="close button"><?php _e('Cancel'); ?></a></p>
-				</div>
-			</div>
-			<?php break;
 
 		case 'photo_thickbox': ?>
 			<script type="text/javascript">
@@ -343,88 +321,53 @@
 		}
 	}
 
-	function show(tab_name) {
+	function show() {
 		jQuery('#extra-fields').html('');
-		switch(tab_name) {
-			case 'video' :
-				jQuery('#extra-fields').load('<?php echo esc_url($_SERVER['PHP_SELF']); ?>', { ajax: 'video', s: '<?php echo esc_attr($selection); ?>'}, function() {
-					<?php
-					$content = '';
-					if ( preg_match("/youtube\.com\/watch/i", $url) ) {
-						list($domain, $video_id) = explode("v=", $url);
-						$video_id = esc_attr($video_id);
-						$content = '<object width="425" height="350"><param name="movie" value="http://www.youtube.com/v/' . $video_id . '"></param><param name="wmode" value="transparent"></param><embed src="http://www.youtube.com/v/' . $video_id . '" type="application/x-shockwave-flash" wmode="transparent" width="425" height="350"></embed></object>';
+		function setup_photo_actions() {
+			jQuery('.close').click(function() {
+				jQuery('#extra-fields').hide();
+				jQuery('#extra-fields').html('');
+			});
+			jQuery('.refresh').click(function() {
+				photostorage = false;
+				show();
+			});
+			jQuery('#photo-add-url').click(function(){
+				var form = jQuery('#photo-add-url-div').clone();
+				jQuery('#img_container').empty().append( form.show() );
+			});
+			jQuery('#waiting').hide();
+			jQuery('#extra-fields').show();
+		}
 
-					} elseif ( preg_match("/vimeo\.com\/[0-9]+/i", $url) ) {
-						list($domain, $video_id) = explode(".com/", $url);
-						$video_id = esc_attr($video_id);
-						$content = '<object width="400" height="225"><param name="allowfullscreen" value="true" /><param name="allowscriptaccess" value="always" /><param name="movie" value="http://www.vimeo.com/moogaloop.swf?clip_id=' . $video_id . '&amp;server=www.vimeo.com&amp;show_title=1&amp;show_byline=1&amp;show_portrait=0&amp;color=&amp;fullscreen=1" />	<embed src="http://www.vimeo.com/moogaloop.swf?clip_id=' . $video_id . '&amp;server=www.vimeo.com&amp;show_title=1&amp;show_byline=1&amp;show_portrait=0&amp;color=&amp;fullscreen=1" type="application/x-shockwave-flash" allowfullscreen="true" allowscriptaccess="always" width="400" height="225"></embed></object>';
-
-						if ( trim($selection) == '' )
-							$selection = '<p><a href="http://www.vimeo.com/' . $video_id . '?pg=embed&sec=' . $video_id . '">' . $title . '</a> on <a href="http://vimeo.com?pg=embed&sec=' . $video_id . '">Vimeo</a></p>';
-
-					} elseif ( strpos( $selection, '<object' ) !== false ) {
-						$content = $selection;
-					}
-					?>
-					jQuery('#embed-code').prepend('<?php echo htmlentities($content); ?>');
-				});
-				jQuery('#extra-fields').show();
-				return false;
-				break;
-			case 'photo' :
-				function setup_photo_actions() {
-					jQuery('.close').click(function() {
-						jQuery('#extra-fields').hide();
-						jQuery('#extra-fields').html('');
-					});
-					jQuery('.refresh').click(function() {
-						photostorage = false;
-						show('photo');
-					});
-					jQuery('#photo-add-url').click(function(){
-						var form = jQuery('#photo-add-url-div').clone();
-						jQuery('#img_container').empty().append( form.show() );
-					});
-					jQuery('#waiting').hide();
-					jQuery('#extra-fields').show();
-				}
-
-				jQuery('#waiting').show();
-				if(photostorage == false) {
-					jQuery.ajax({
-						type: "GET",
-						cache : false,
-						url: "<?php echo esc_url($_SERVER['PHP_SELF']); ?>",
-						data: "ajax=photo_js&u=<?php echo urlencode($url)?>",
-						dataType : "script",
-						success : function(data) {
-							eval(data);
-							photostorage = jQuery('#extra-fields').html();
-							setup_photo_actions();
-						}
-					});
-				} else {
-					jQuery('#extra-fields').html(photostorage);
+		jQuery('#waiting').show();
+		if(photostorage == false) {
+			jQuery.ajax({
+				type: "GET",
+				cache : false,
+				url: "<?php echo esc_url($_SERVER['PHP_SELF']); ?>",
+				data: "ajax=photo_js&u=<?php echo urlencode($url)?>",
+				dataType : "script",
+				success : function(data) {
+					eval(data);
+					photostorage = jQuery('#extra-fields').html();
 					setup_photo_actions();
 				}
-				return false;
-				break;
+			});
+		} else {
+			jQuery('#extra-fields').html(photostorage);
+			setup_photo_actions();
 		}
+		return false;
 	}
 	jQuery(document).ready(function($) {
 		//resize screen
 		window.resizeTo(720,580);
 		// set button actions
-		jQuery('#photo_button').click(function() { show('photo'); return false; });
-		jQuery('#video_button').click(function() { show('video'); return false; });
+		jQuery('#photo_button').click(function() { show(); return false; });
 		// auto select
-		<?php if ( preg_match("/youtube\.com\/watch/i", $url) ) { ?>
-			show('video');
-		<?php } elseif ( preg_match("/vimeo\.com\/[0-9]+/i", $url) ) { ?>
-			show('video');
-		<?php } elseif ( preg_match("/flickr\.com/i", $url) ) { ?>
-			show('photo');
+		<?php if ( preg_match("/flickr\.com/i", $url) ) { ?>
+			show();
 		<?php } ?>
 		jQuery('#title').unbind();
 		jQuery('#publish, #save').click(function() { jQuery('.press-this #publishing-actions .spinner').css('display', 'inline-block'); });
@@ -614,17 +557,12 @@
 		remove_action( 'media_buttons', 'media_buttons' );
 		add_action( 'media_buttons', 'press_this_media_buttons' );
 		function press_this_media_buttons() {
-			_e( 'Add:' );
 
 			if ( current_user_can('upload_files') ) {
 				?>
-				<a id="photo_button" title="<?php esc_attr_e('Insert an Image'); ?>" href="#">
-				<img alt="<?php esc_attr_e('Insert an Image'); ?>" src="<?php echo esc_url( admin_url( 'images/media-button-image.gif?ver=20100531' ) ); ?>"/></a>
+				<a id="photo_button" title="<?php esc_attr_e('Insert an Image'); ?>" data-editor="content" class="insert-media add_media" href="#">Upload/Insert <span class="wp-media-buttons-icon"></span></a>
 				<?php
 			}
-			?>
-			<a id="video_button" title="<?php esc_attr_e('Embed a Video'); ?>" href="#"><img alt="<?php esc_attr_e('Embed a Video'); ?>" src="<?php echo esc_url( admin_url( 'images/media-button-video.gif?ver=20100531' ) ); ?>"/></a>
-			<?php
 		}
 
 		wp_editor( $content, 'content', $editor_settings );