Merge with WordPress, rev 6285 and untested

git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1125 7be80a69-a1ef-0310-a953-fb0f7c49ff36

1 files changed, 22 insertions, 0 deletions

diff --git a/wp-admin/js/edit-posts.js b/wp-admin/js/edit-posts.js
new file mode 100644
index 0000000..c85fba9
--- /dev/null
+++ b/wp-admin/js/edit-posts.js
@@ -0,0 +1,22 @@
+jQuery(function($) {
+var delAfter; var extra; var list;
+
+if ( document.location.href.match(/(\?|&)c=/) )
+	delAfter = function() { $('#comments, #the-comment-list').remove(); }
+else
+	delAfter = function() {
+		list[0].wpList.add( extra.children(':eq(0)').remove().clone() );
+		$('#get-extra-button').click();
+	}
+
+var addBefore = function ( settings ) {
+	var q = document.location.href.split('?');
+	if ( q[1] )
+		settings.data += '&' + q[1];
+	return settings;
+}
+
+extra = $('#the-extra-list').wpList( { alt: '', addBefore: addBefore, addColor: 'none', delColor: 'none' } );
+list = $('#the-list').wpList( { delAfter: delAfter, addColor: 'none' } );
+
+} );