X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/fa11948979fd6a4ea5705dc613b239699a459db3..58b0523c599c731e868bd4bc05b0d686a98d254f:/wp-admin/js/inline-edit-post.js

diff --git a/wp-admin/js/inline-edit-post.js b/wp-admin/js/inline-edit-post.js
index 9b8c04d3..a1a9c028 100644
--- a/wp-admin/js/inline-edit-post.js
+++ b/wp-admin/js/inline-edit-post.js
@@ -1,3 +1,6 @@
+/* global inlineEditL10n, ajaxurl, typenow */
+
+var inlineEditPost;
 (function($) {
 inlineEditPost = {
 
@@ -9,12 +12,14 @@ inlineEditPost = {
 
 		// prepare the edit rows
 		qeRow.keyup(function(e){
-			if (e.which == 27)
+			if ( e.which === 27 ) {
 				return inlineEditPost.revert();
+			}
 		});
 		bulkRow.keyup(function(e){
-			if (e.which == 27)
+			if ( e.which === 27 ) {
 				return inlineEditPost.revert();
+			}
 		});
 
 		$('a.cancel', qeRow).click(function(){
@@ -24,8 +29,9 @@ inlineEditPost = {
 			return inlineEditPost.save(this);
 		});
 		$('td', qeRow).keydown(function(e){
-			if ( e.which == 13 )
+			if ( e.which === 13 && ! $( e.target ).hasClass( 'cancel' ) ) {
 				return inlineEditPost.save(this);
+			}
 		});
 
 		$('a.cancel', bulkRow).click(function(){
@@ -47,7 +53,7 @@ inlineEditPost = {
 			return false;
 		});
 
-		$('#bulk-title-div').parents('fieldset').after(
+		$('#bulk-edit').find('fieldset:first').after(
 			$('#inline-edit fieldset.inline-edit-categories').clone()
 		).siblings( 'fieldset:last' ).prepend(
 			$('#inline-edit label.inline-edit-tags').clone()
@@ -57,7 +63,7 @@ inlineEditPost = {
 
 		$('#doaction, #doaction2').click(function(e){
 			var n = $(this).attr('id').substr(2);
-			if ( $('select[name="'+n+'"]').val() == 'edit' ) {
+			if ( 'edit' === $( 'select[name="' + n + '"]' ).val() ) {
 				e.preventDefault();
 				t.setBulk();
 			} else if ( $('form#posts-filter tr.inline-editor').length > 0 ) {
@@ -68,7 +74,7 @@ inlineEditPost = {
 
 	toggle : function(el){
 		var t = this;
-		$(t.what+t.getId(el)).css('display') == 'none' ? t.revert() : t.edit(el);
+		$( t.what + t.getId( el ) ).css( 'display' ) === 'none' ? t.revert() : t.edit( el );
 	},
 
 	setBulk : function(){
@@ -76,10 +82,11 @@ inlineEditPost = {
 		this.revert();
 
 		$('#bulk-edit td').attr('colspan', $('.widefat:first thead th:visible').length);
-		$('table.widefat tbody').prepend( $('#bulk-edit') );
+		// Insert the editor at the top of the table with an empty row above to maintain zebra striping.
+		$('table.widefat tbody').prepend( $('#bulk-edit') ).prepend('<tr class="hidden"></tr>');
 		$('#bulk-edit').addClass('inline-editor').show();
 
-		$('tbody th.check-column input[type="checkbox"]').each(function(i){
+		$( 'tbody th.check-column input[type="checkbox"]' ).each( function() {
 			if ( $(this).prop('checked') ) {
 				c = false;
 				var id = $(this).val(), theTitle;
@@ -88,8 +95,9 @@ inlineEditPost = {
 			}
 		});
 
-		if ( c )
+		if ( c ) {
 			return this.revert();
+		}
 
 		$('#bulk-titles').html(te);
 		$('#bulk-titles a').click(function(){
@@ -100,32 +108,32 @@ inlineEditPost = {
 		});
 
 		// enable autocomplete for tags
-		if ( 'post' == type ) {
+		if ( 'post' === type ) {
 			// support multi taxonomies?
 			tax = 'post_tag';
-			$('tr.inline-editor textarea[name="tax_input['+tax+']"]').suggest( ajaxurl + '?action=ajax-tag-search&tax=' + tax, { delay: 500, minchars: 2, multiple: true, multipleSep: inlineEditL10n.comma + ' ' } );
+			$('tr.inline-editor textarea[name="tax_input['+tax+']"]').suggest( ajaxurl + '?action=ajax-tag-search&tax=' + tax, { delay: 500, minchars: 2, multiple: true, multipleSep: inlineEditL10n.comma } );
 		}
 		$('html, body').animate( { scrollTop: 0 }, 'fast' );
 	},
 
 	edit : function(id) {
-		var t = this, fields, editRow, rowData, status, pageOpt, pageLevel, nextPage, pageLoop = true, nextLevel, cur_format, f;
+		var t = this, fields, editRow, rowData, status, pageOpt, pageLevel, nextPage, pageLoop = true, nextLevel, cur_format, f, val;
 		t.revert();
 
-		if ( typeof(id) == 'object' )
+		if ( typeof(id) === 'object' ) {
 			id = t.getId(id);
+		}
 
 		fields = ['post_title', 'post_name', 'post_author', '_status', 'jj', 'mm', 'aa', 'hh', 'mn', 'ss', 'post_password', 'post_format', 'menu_order'];
-		if ( t.type == 'page' )
+		if ( t.type === 'page' ) {
 			fields.push('post_parent', 'page_template');
+		}
 
-		// add the new blank row
+		// add the new edit row with an extra blank row underneath to maintain zebra striping.
 		editRow = $('#inline-edit').clone(true);
 		$('td', editRow).attr('colspan', $('.widefat:first thead th:visible').length);
 
-		if ( $(t.what+id).hasClass('alternate') )
-			$(editRow).addClass('alternate');
-		$(t.what+id).hide().after(editRow);
+		$(t.what+id).hide().after(editRow).after('<tr class="hidden"></tr>');
 
 		// populate the data
 		rowData = $('#inline_'+id);
@@ -133,7 +141,7 @@ inlineEditPost = {
 			// author no longer has edit caps, so we need to add them to the list of authors
 			$(':input[name="post_author"]', editRow).prepend('<option value="' + $('.post_author', rowData).text() + '">' + $('#' + t.type + '-' + id + ' .author').text() + '</option>');
 		}
-		if ( $(':input[name="post_author"] option', editRow).length == 1 ) {
+		if ( $( ':input[name="post_author"] option', editRow ).length === 1 ) {
 			$('label.inline-edit-author', editRow).hide();
 		}
 
@@ -141,24 +149,33 @@ inlineEditPost = {
 		cur_format = $('.post_format', rowData).text();
 		$('option.unsupported', editRow).each(function() {
 			var $this = $(this);
-			if ( $this.val() != cur_format )
+			if ( $this.val() !== cur_format ) {
 				$this.remove();
+			}
 		});
 
 		for ( f = 0; f < fields.length; f++ ) {
-			$(':input[name="' + fields[f] + '"]', editRow).val( $('.'+fields[f], rowData).text() );
+			val = $('.'+fields[f], rowData);
+			// Deal with Twemoji
+			val.find( 'img' ).replaceWith( function() { return this.alt; } );
+			val = val.text();
+			$(':input[name="' + fields[f] + '"]', editRow).val( val );
 		}
 
-		if ( $('.comment_status', rowData).text() == 'open' )
-			$('input[name="comment_status"]', editRow).prop("checked", true);
-		if ( $('.ping_status', rowData).text() == 'open' )
-			$('input[name="ping_status"]', editRow).prop("checked", true);
-		if ( $('.sticky', rowData).text() == 'sticky' )
-			$('input[name="sticky"]', editRow).prop("checked", true);
+		if ( $( '.comment_status', rowData ).text() === 'open' ) {
+			$( 'input[name="comment_status"]', editRow ).prop( 'checked', true );
+		}
+		if ( $( '.ping_status', rowData ).text() === 'open' ) {
+			$( 'input[name="ping_status"]', editRow ).prop( 'checked', true );
+		}
+		if ( $( '.sticky', rowData ).text() === 'sticky' ) {
+			$( 'input[name="sticky"]', editRow ).prop( 'checked', true );
+		}
 
 		// hierarchical taxonomies
 		$('.post_category', rowData).each(function(){
-			var term_ids = $(this).text();
+			var taxname,
+				term_ids = $(this).text();
 
 			if ( term_ids ) {
 				taxname = $(this).attr('id').replace('_'+id, '');
@@ -168,27 +185,32 @@ inlineEditPost = {
 
 		//flat taxonomies
 		$('.tags_input', rowData).each(function(){
-			var terms = $(this).text(),
+			var terms = $(this),
 				taxname = $(this).attr('id').replace('_' + id, ''),
 				textarea = $('textarea.tax_input_' + taxname, editRow),
 				comma = inlineEditL10n.comma;
 
+			terms.find( 'img' ).replaceWith( function() { return this.alt; } );
+			terms = terms.text();
+
 			if ( terms ) {
-				if ( ',' !== comma )
+				if ( ',' !== comma ) {
 					terms = terms.replace(/,/g, comma);
+				}
 				textarea.val(terms);
 			}
 
-			textarea.suggest( ajaxurl + '?action=ajax-tag-search&tax=' + taxname, { delay: 500, minchars: 2, multiple: true, multipleSep: inlineEditL10n.comma + ' ' } );
+			textarea.suggest( ajaxurl + '?action=ajax-tag-search&tax=' + taxname, { delay: 500, minchars: 2, multiple: true, multipleSep: inlineEditL10n.comma } );
 		});
 
 		// handle the post status
 		status = $('._status', rowData).text();
-		if ( 'future' != status )
+		if ( 'future' !== status ) {
 			$('select[name="_status"] option[value="future"]', editRow).remove();
+		}
 
-		if ( 'private' == status ) {
-			$('input[name="keep_private"]', editRow).prop("checked", true);
+		if ( 'private' === status ) {
+			$('input[name="keep_private"]', editRow).prop('checked', true);
 			$('input.inline-edit-password-input').val('').prop('disabled', true);
 		}
 
@@ -199,8 +221,12 @@ inlineEditPost = {
 			nextPage = pageOpt;
 			while ( pageLoop ) {
 				nextPage = nextPage.next('option');
-				if (nextPage.length == 0) break;
+				if ( nextPage.length === 0 ) {
+					break;
+				}
+
 				nextLevel = nextPage[0].className.split('-')[1];
+
 				if ( nextLevel <= pageLevel ) {
 					pageLoop = false;
 				} else {
@@ -220,10 +246,11 @@ inlineEditPost = {
 	save : function(id) {
 		var params, fields, page = $('.post_status_page').val() || '';
 
-		if ( typeof(id) == 'object' )
+		if ( typeof(id) === 'object' ) {
 			id = this.getId(id);
+		}
 
-		$('table.widefat .spinner').show();
+		$( 'table.widefat .spinner' ).addClass( 'is-active' );
 
 		params = {
 			action: 'inline-save',
@@ -233,17 +260,17 @@ inlineEditPost = {
 			post_status: page
 		};
 
-		fields = $('#edit-'+id+' :input').serialize();
+		fields = $('#edit-'+id).find(':input').serialize();
 		params = fields + '&' + $.param(params);
 
 		// make ajax request
 		$.post( ajaxurl, params,
 			function(r) {
-				$('table.widefat .spinner').hide();
+				$( 'table.widefat .spinner' ).removeClass( 'is-active' );
 
 				if (r) {
-					if ( -1 != r.indexOf('<tr') ) {
-						$(inlineEditPost.what+id).remove();
+					if ( -1 !== r.indexOf( '<tr' ) ) {
+						$(inlineEditPost.what+id).siblings('tr.hidden').addBack().remove();
 						$('#edit-'+id).before(r).remove();
 						$(inlineEditPost.what+id).hide().fadeIn();
 					} else {
@@ -253,12 +280,8 @@ inlineEditPost = {
 				} else {
 					$('#edit-'+id+' .inline-edit-save .error').html(inlineEditL10n.error).show();
 				}
-
-				if ( $('#post-'+id).prev().hasClass('alternate') ) {
-					$('#post-'+id).removeClass('alternate');
-				}
-			}
-		, 'html');
+			},
+		'html');
 		return false;
 	},
 
@@ -266,14 +289,14 @@ inlineEditPost = {
 		var id = $('table.widefat tr.inline-editor').attr('id');
 
 		if ( id ) {
-			$('table.widefat .spinner').hide();
+			$( 'table.widefat .spinner' ).removeClass( 'is-active' );
 
-			if ( 'bulk-edit' == id ) {
-				$('table.widefat #bulk-edit').removeClass('inline-editor').hide();
-				$('#bulk-titles').html('');
+			if ( 'bulk-edit' === id ) {
+				$('table.widefat #bulk-edit').removeClass('inline-editor').hide().siblings('tr.hidden').remove();
+				$('#bulk-titles').empty();
 				$('#inlineedit').append( $('#bulk-edit') );
 			} else {
-				$('#'+id).remove();
+				$('#'+id).siblings('tr.hidden').addBack().remove();
 				id = id.substr( id.lastIndexOf('-') + 1 );
 				$(this.what+id).show();
 			}
@@ -319,12 +342,19 @@ $( document ).on( 'heartbeat-tick.wp-check-locked-posts', function( e, data ) {
 	var check = [];
 
 	$('#the-list tr').each( function(i, el) {
-		if ( el.id )
+		if ( el.id ) {
 			check.push( el.id );
+		}
 	});
 
-	if ( check.length )
+	if ( check.length ) {
 		data['wp-check-locked-posts'] = check;
+	}
+}).ready( function() {
+	// Set the heartbeat interval to 15 sec.
+	if ( typeof wp !== 'undefined' && wp.heartbeat ) {
+		wp.heartbeat.interval( 15 );
+	}
 });
 
 }(jQuery));