--- a/wp/wp-admin/js/inline-edit-tax.js	Mon Jun 08 16:11:51 2015 +0000
+++ b/wp/wp-admin/js/inline-edit-tax.js	Tue Jun 09 03:35:32 2015 +0200
@@ -1,4 +1,6 @@
+/* global inlineEditL10n, ajaxurl */
 
+var inlineEditTax;
 (function($) {
 inlineEditTax = {
 
@@ -14,39 +16,57 @@
 		});
 
 		// prepare the edit row
-		row.keyup(function(e) { if(e.which == 27) return inlineEditTax.revert(); });
+		row.keyup( function( e ) {
+			if ( e.which === 27 ) {
+				return inlineEditTax.revert();
+			}
+		});
 
-		$('a.cancel', row).click(function() { return inlineEditTax.revert(); });
-		$('a.save', row).click(function() { return inlineEditTax.save(this); });
-		$('input, select', row).keydown(function(e) { if(e.which == 13) return inlineEditTax.save(this); });
+		$( 'a.cancel', row ).click( function() {
+			return inlineEditTax.revert();
+		});
+		$( 'a.save', row ).click( function() {
+			return inlineEditTax.save(this);
+		});
+		$( 'input, select', row ).keydown( function( e ) {
+			if ( e.which === 13 ) {
+				return inlineEditTax.save( this );
+			}
+		});
 
-		$('#posts-filter input[type="submit"]').mousedown(function(e){
+		$( '#posts-filter input[type="submit"]' ).mousedown( function() {
 			t.revert();
 		});
 	},
 
 	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);
 	},
 
 	edit : function(id) {
-		var t = this, editRow;
+		var editRow, rowData, val,
+			t = this;
 		t.revert();
 
-		if ( typeof(id) == 'object' )
+		if ( typeof(id) === 'object' ) {
 			id = t.getId(id);
+		}
 
 		editRow = $('#inline-edit').clone(true), rowData = $('#inline_'+id);
 		$('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).after('<tr class="hidden"></tr>');
 
-		$(t.what+id).hide().after(editRow);
+		val = $('.name', rowData);
+		val.find( 'img' ).replaceWith( function() { return this.alt; } );
+		val = val.text();
+		$(':input[name="name"]', editRow).val( val );
 
-		$(':input[name="name"]', editRow).val( $('.name', rowData).text() );
-		$(':input[name="slug"]', editRow).val( $('.slug', rowData).text() );
+		val = $('.slug', rowData);
+		val.find( 'img' ).replaceWith( function() { return this.alt; } );
+		val = val.text();
+		$(':input[name="slug"]', editRow).val( val );
 
 		$(editRow).attr('id', 'edit-'+id).addClass('inline-editor').show();
 		$('.ptitle', editRow).eq(0).focus();
@@ -57,10 +77,11 @@
 	save : function(id) {
 		var params, fields, tax = $('input[name="taxonomy"]').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-tax',
@@ -69,30 +90,40 @@
 			taxonomy: tax
 		};
 
-		fields = $('#edit-'+id+' :input').serialize();
+		fields = $('#edit-'+id).find(':input').serialize();
 		params = fields + '&' + $.param(params);
 
 		// make ajax request
 		$.post( ajaxurl, params,
 			function(r) {
-				var row, new_id;
-				$('table.widefat .spinner').hide();
+				var row, new_id, option_value;
+				$( 'table.widefat .spinner' ).removeClass( 'is-active' );
 
 				if (r) {
-					if ( -1 != r.indexOf('<tr') ) {
-						$(inlineEditTax.what+id).remove();
+					if ( -1 !== r.indexOf( '<tr' ) ) {
+						$(inlineEditTax.what+id).siblings('tr.hidden').addBack().remove();
 						new_id = $(r).attr('id');
 
 						$('#edit-'+id).before(r).remove();
-						row = new_id ? $('#'+new_id) : $(inlineEditTax.what+id);
+
+						if ( new_id ) {
+							option_value = new_id.replace( inlineEditTax.type + '-', '' );
+							row = $( '#' + new_id );
+						} else {
+							option_value = id;
+							row = $( inlineEditTax.what + id );
+						}
+
+						// Update the value in the Parent dropdown.
+						$( '#parent' ).find( 'option[value=' + option_value + ']' ).text( row.find( '.row-title' ).text() );
+
 						row.hide().fadeIn();
-					} else
+					} else {
 						$('#edit-'+id+' .inline-edit-save .error').html(r).show();
-				} else
+					}
+				} else {
 					$('#edit-'+id+' .inline-edit-save .error').html(inlineEditL10n.error).show();
-
-				if ($(row).prev('tr').hasClass('alternate'))
-					$(row).removeClass('alternate');
+				}
 			}
 		);
 		return false;
@@ -102,8 +133,8 @@
 		var id = $('table.widefat tr.inline-editor').attr('id');
 
 		if ( id ) {
-			$('table.widefat .spinner').hide();
-			$('#'+id).remove();
+			$( 'table.widefat .spinner' ).removeClass( 'is-active' );
+			$('#'+id).siblings('tr.hidden').addBack().remove();
 			id = id.substr( id.lastIndexOf('-') + 1 );
 			$(this.what+id).show();
 		}
@@ -112,7 +143,7 @@
 	},
 
 	getId : function(o) {
-		var id = o.tagName == 'TR' ? o.id : $(o).parents('tr').attr('id'), parts = id.split('-');
+		var id = o.tagName === 'TR' ? o.id : $(o).parents('tr').attr('id'), parts = id.split('-');
 		return parts[parts.length - 1];
 	}
 };