X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/449d082fcc4873c1f7d363a0d9f7409be7f6e77d..b22765f41bf0b2021b9beb9120ee0ac91fa89292:/wp-admin/js/inline-edit-tax.js

diff --git a/wp-admin/js/inline-edit-tax.js b/wp-admin/js/inline-edit-tax.js
index d5539cc2..3bbf4fb7 100644
--- a/wp-admin/js/inline-edit-tax.js
+++ b/wp-admin/js/inline-edit-tax.js
@@ -1,85 +1,73 @@
+/* global inlineEditL10n, ajaxurl */
+window.wp = window.wp || {};
 
-(function($) {
+var inlineEditTax;
+( function( $, wp ) {
 inlineEditTax = {
 
 	init : function() {
 		var t = this, row = $('#inline-edit');
 
-		t.type = $('#the-list').attr('className').substr(5);
+		t.type = $('#the-list').attr('data-wp-lists').substr(5);
 		t.what = '#'+t.type+'-';
 
-		// get all editable rows
-		t.rows = $('tr.iedit');
+		$('#the-list').on('click', 'a.editinline', function(){
+			inlineEditTax.edit(this);
+			return false;
+		});
 
 		// prepare the edit row
-		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); });
+		row.keyup( function( e ) {
+			if ( e.which === 27 ) {
+				return inlineEditTax.revert();
+			}
+		});
 
-		// add events
-		t.addEvents(t.rows);
+		$( '.cancel', row ).click( function() {
+			return inlineEditTax.revert();
+		});
+		$( '.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"]').click(function(e){
-			if ( $('form#posts-filter tr.inline-editor').length > 0 )
-				t.revert();
+		$( '#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);
-	},
-
-	addEvents : function(r) {
-		r.each(function() {
-			$(this).find('a.editinline').click(function() { inlineEditTax.edit(this); return false; });
-			$(this).find('.hide-if-no-js').removeClass('hide-if-no-js');
-		});
+		$(t.what+t.getId(el)).css('display') === 'none' ? t.revert() : t.edit(el);
 	},
 
 	edit : function(id) {
-		var t = this;
+		var editRow, rowData, val,
+			t = this;
 		t.revert();
 
-		if ( typeof(id) == 'object' )
+		if ( typeof(id) === 'object' ) {
 			id = t.getId(id);
+		}
 
-		var 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');
+		editRow = $('#inline-edit').clone(true), rowData = $('#inline_'+id);
+		$( 'td', editRow ).attr( 'colspan', $( 'th:visible, td:visible', '.wp-list-table.widefat:first thead' ).length );
 
-		$(t.what+id).hide().after(editRow);
+		$(t.what+id).hide().after(editRow).after('<tr class="hidden"></tr>');
 
-		$(':input[name="name"]', editRow).val( $('.name', rowData).text() );
-		$(':input[name="slug"]', editRow).val( $('.slug', rowData).text() );
+		val = $('.name', rowData);
+		val.find( 'img' ).replaceWith( function() { return this.alt; } );
+		val = val.text();
+		$(':input[name="name"]', editRow).val( val );
 
-		// cat parents
-		var cat_parent = $('.cat_parent', rowData).text();
-		if ( cat_parent != '0' )
-			$('select[name="parent"]', editRow).val(cat_parent);
-
-		// remove the current parent and children from the parent dropdown
-		var pageOpt = $('select[name="parent"] option[value="'+id+'"]', editRow);
-		if ( pageOpt.length > 0 ) {
-			var pageLevel = pageOpt[0].className.split('-')[1], nextPage = pageOpt, pageLoop = true;
-			while ( pageLoop ) {
-				var nextPage = nextPage.next('option');
-				if (nextPage.length == 0) break;
-				var nextLevel = nextPage[0].className.split('-')[1];
-				if ( nextLevel <= pageLevel ) {
-					pageLoop = false;
-				} else {
-					nextPage.remove();
-					nextPage = pageOpt;
-				}
-			}
-			pageOpt.remove();
-		}
+		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();
@@ -88,43 +76,68 @@ inlineEditTax = {
 	},
 
 	save : function(id) {
-		if( typeof(id) == 'object' )
+		var params, fields, tax = $('input[name="taxonomy"]').val() || '';
+
+		if( typeof(id) === 'object' ) {
 			id = this.getId(id);
+		}
 
-		$('table.widefat .inline-edit-save .waiting').show();
+		$( 'table.widefat .spinner' ).addClass( 'is-active' );
 
-		var params = {
+		params = {
 			action: 'inline-save-tax',
 			tax_type: this.type,
-			tax_ID: id
+			tax_ID: id,
+			taxonomy: tax
 		};
 
-		var fields = $('#edit-'+id+' :input').fieldSerialize();
+		fields = $('#edit-'+id).find(':input').serialize();
 		params = fields + '&' + $.param(params);
 
 		// make ajax request
-		$.post('admin-ajax.php', params,
+		$.post( ajaxurl, params,
 			function(r) {
+				var row, new_id, option_value,
+					$errorSpan = $( '#edit-' + id + ' .inline-edit-save .error' );
 
-				$('table.widefat .inline-edit-save .waiting').hide();
+				$( 'table.widefat .spinner' ).removeClass( 'is-active' );
 
 				if (r) {
-					if ( -1 != r.indexOf('<tr') ) {
-						$(inlineEditTax.what+id).remove();
-						$('#edit-'+id).before(r).remove();
+					if ( -1 !== r.indexOf( '<tr' ) ) {
+						$(inlineEditTax.what+id).siblings('tr.hidden').addBack().remove();
+						new_id = $(r).attr('id');
 
-						var row = $(inlineEditTax.what+id);
-						row.hide();
+						$('#edit-'+id).before(r).remove();
 
-						row.find('.hide-if-no-js').removeClass('hide-if-no-js');
-						inlineEditTax.addEvents(row);
-						row.fadeIn();
-					} else
-						$('#edit-'+id+' .inline-edit-save .error').html(r).show();
-				} else
-					$('#edit-'+id+' .inline-edit-save .error').html(inlineEditL10n.error).show();
+						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( 400, function() {
+							// Move focus back to the Quick Edit link.
+							row.find( '.editinline' ).focus();
+							wp.a11y.speak( inlineEditL10n.saved );
+						});
+
+					} else {
+						$errorSpan.html( r ).show();
+						// Some error strings may contain HTML entities (e.g. `&#8220`), let's use the HTML element's text.
+						wp.a11y.speak( $errorSpan.text() );
+					}
+				} else {
+					$errorSpan.html( inlineEditL10n.error ).show();
+					wp.a11y.speak( inlineEditL10n.error );
+				}
 			}
 		);
+		// Prevent submitting the form when pressing Enter on a focused field.
 		return false;
 	},
 
@@ -132,21 +145,19 @@ inlineEditTax = {
 		var id = $('table.widefat tr.inline-editor').attr('id');
 
 		if ( id ) {
-			$('table.widefat .inline-edit-save .waiting').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();
+			// Show the taxonomy row and move focus back to the Quick Edit link.
+			$( this.what + id ).show().find( '.editinline' ).focus();
 		}
-
-		return false;
 	},
 
 	getId : function(o) {
-		var id = o.tagName == 'TR' ? o.id : $(o).parents('tr').attr('id');
-		var parts = id.split('-');
+		var id = o.tagName === 'TR' ? o.id : $(o).parents('tr').attr('id'), parts = id.split('-');
 		return parts[parts.length - 1];
 	}
 };
 
 $(document).ready(function(){inlineEditTax.init();});
-})(jQuery);
+})( jQuery, window.wp );