X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/177fd6fefd2e3d5a0ea6591c71d660cabdb3c1a4..8a4706fdeb1ae30268e510df6ccf3c39b3028059:/wp-includes/js/wp-lists.js

diff --git a/wp-includes/js/wp-lists.js b/wp-includes/js/wp-lists.js
index 884f02a6..5decd3a8 100644
--- a/wp-includes/js/wp-lists.js
+++ b/wp-includes/js/wp-lists.js
@@ -1,10 +1,9 @@
 (function($) {
-var currentFormEl = false;
-var fs = {add:'ajaxAdd',del:'ajaxDel',dim:'ajaxDim',process:'process',recolor:'recolor'};
+var fs = {add:'ajaxAdd',del:'ajaxDel',dim:'ajaxDim',process:'process',recolor:'recolor'}, wpList;
 
-var wpList = {
+wpList = {
 	settings: {
-		url: wpListL10n.url, type: 'POST',
+		url: ajaxurl, type: 'POST',
 		response: 'ajax-response',
 
 		what: '',
@@ -19,74 +18,107 @@ var wpList = {
 
 	nonce: function(e,s) {
 		var url = wpAjax.unserialize(e.attr('href'));
-		return s.nonce || url._ajax_nonce || $('#' + s.element + ' input[name=_ajax_nonce]').val() || url._wpnonce || $('#' + s.element + ' input[name=_wpnonce]').val() || 0;
+		return s.nonce || url._ajax_nonce || $('#' + s.element + ' input[name="_ajax_nonce"]').val() || url._wpnonce || $('#' + s.element + ' input[name="_wpnonce"]').val() || 0;
 	},
 
-	parseClass: function(e,t) {
-		var c = [], cl;
+	parseData: function(e,t) {
+		var d = [], wpListsData;
+
 		try {
-			cl = $(e).attr('class') || '';
-			cl = cl.match(new RegExp(t+':[A-Za-z0-9:_=-]+'));
-			if ( cl ) { c = cl[0].split(':'); }
+			wpListsData = $(e).attr('data-wp-lists') || '';
+			wpListsData = wpListsData.match(new RegExp(t+':[\\S]+'));
+
+			if ( wpListsData )
+				d = wpListsData[0].split(':');
 		} catch(r) {}
-		return c;
+
+		return d;
 	},
 
 	pre: function(e,s,a) {
-		var bg; var r;
+		var bg, r;
+
 		s = $.extend( {}, this.wpList.settings, {
 			element: null,
 			nonce: 0,
 			target: e.get(0)
 		}, s || {} );
+
 		if ( $.isFunction( s.confirm ) ) {
 			if ( 'add' != a ) {
 				bg = $('#' + s.element).css('backgroundColor');
 				$('#' + s.element).css('backgroundColor', '#FF9966');
 			}
-			r = s.confirm.call(this,e,s,a,bg);
-			if ( 'add' != a ) { $('#' + s.element).css('backgroundColor', bg ); }
-			if ( !r ) { return false; }
+			r = s.confirm.call(this, e, s, a, bg);
+
+			if ( 'add' != a )
+				$('#' + s.element).css('backgroundColor', bg );
+
+			if ( !r )
+				return false;
 		}
+
 		return s;
 	},
 
 	ajaxAdd: function( e, s ) {
-		var list = this; e = $(e); s = s || {};
-		var cls = wpList.parseClass(e,'add');
+		e = $(e);
+		s = s || {};
+		var list = this, data = wpList.parseData(e,'add'), es, valid, formData, res, rres;
+
 		s = wpList.pre.call( list, e, s, 'add' );
 
-		s.element = cls[2] || e.attr( 'id' ) || s.element || null;
-		if ( cls[3] ) { s.addColor = '#' + cls[3]; }
-		else { s.addColor = s.addColor || '#FFFF33'; }
+		s.element = data[2] || e.attr( 'id' ) || s.element || null;
+
+		if ( data[3] )
+			s.addColor = '#' + data[3];
+		else
+			s.addColor = s.addColor || '#FFFF33';
 
-		if ( !s ) { return false; }
+		if ( !s )
+			return false;
 
-		if ( !e.is("[class^=add:" + list.id + ":]") ) { return !wpList.add.call( list, e, s ); }
+		if ( !e.is('[id="' + s.element + '-submit"]') )
+			return !wpList.add.call( list, e, s );
 
-		if ( !s.element ) { return true; }
+		if ( !s.element )
+			return true;
 
 		s.action = 'add-' + s.what;
 
 		s.nonce = wpList.nonce(e,s);
 
-		var es = $('#' + s.element + ' :input').not('[name=_ajax_nonce], [name=_wpnonce], [name=action]');
-		var valid = wpAjax.validateForm( '#' + s.element );
-		if ( !valid ) { return false; }
+		es = $('#' + s.element + ' :input').not('[name="_ajax_nonce"], [name="_wpnonce"], [name="action"]');
+		valid = wpAjax.validateForm( '#' + s.element );
 
-		s.data = $.param( $.extend( { _ajax_nonce: s.nonce, action: s.action }, wpAjax.unserialize( cls[4] || '' ) ) );
-		var formData = $.isFunction(es.fieldSerialize) ? es.fieldSerialize() : es.serialize();
-		if ( formData ) { s.data += '&' + formData; }
+		if ( !valid )
+			return false;
+
+		s.data = $.param( $.extend( { _ajax_nonce: s.nonce, action: s.action }, wpAjax.unserialize( data[4] || '' ) ) );
+		formData = $.isFunction(es.fieldSerialize) ? es.fieldSerialize() : es.serialize();
+
+		if ( formData )
+			s.data += '&' + formData;
 
 		if ( $.isFunction(s.addBefore) ) {
 			s = s.addBefore( s );
-			if ( !s ) { return true; }
+			if ( !s )
+				return true;
 		}
-		if ( !s.data.match(/_ajax_nonce=[a-f0-9]+/) ) { return true; }
+
+		if ( !s.data.match(/_ajax_nonce=[a-f0-9]+/) )
+			return true;
 
 		s.success = function(r) {
-			var res = wpAjax.parseAjaxResponse(r, s.response, s.element);
-			if ( !res || res.errors ) { return false; }
+			res = wpAjax.parseAjaxResponse(r, s.response, s.element);
+
+			rres = r;
+
+			if ( !res || res.errors )
+				return false;
+
+			if ( true === res )
+				return true;
 
 			jQuery.each( res.responses, function() {
 				wpList.add.call( list, this.data, $.extend( {}, s, { // this.firstChild.nodevalue
@@ -96,32 +128,38 @@ var wpList = {
 				} ) );
 			} );
 
-			if ( $.isFunction(s.addAfter) ) {
-				var o = this.complete;
-				this.complete = function(x,st) {
-					var _s = $.extend( { xml: x, status: st, parsed: res }, s );
-					s.addAfter( r, _s );
-					if ( $.isFunction(o) ) { o(x,st); }
-				};
-			}
 			list.wpList.recolor();
+			$(list).trigger( 'wpListAddEnd', [ s, list.wpList ] );
 			wpList.clear.call(list,'#' + s.element);
 		};
 
+		s.complete = function(x, st) {
+			if ( $.isFunction(s.addAfter) ) {
+				var _s = $.extend( { xml: x, status: st, parsed: res }, s );
+				s.addAfter( rres, _s );
+			}
+		};
+
 		$.ajax( s );
 		return false;
 	},
 
 	ajaxDel: function( e, s ) {
-		var list = this; e = $(e); s = s || {};
-		var cls = wpList.parseClass(e,'delete');
+		e = $(e);
+		s = s || {};
+		var list = this, data = wpList.parseData(e,'delete'), element, res, rres;
+
 		s = wpList.pre.call( list, e, s, 'delete' );
 
-		s.element = cls[2] || s.element || null;
-		if ( cls[3] ) { s.delColor = '#' + cls[3]; }
-		else { s.delColor = s.delColor || '#FF3333'; }
+		s.element = data[2] || s.element || null;
+
+		if ( data[3] )
+			s.delColor = '#' + data[3];
+		else
+			s.delColor = s.delColor || '#faa';
 
-		if ( !s || !s.element ) { return false; }
+		if ( !s || !s.element )
+			return false;
 
 		s.action = 'delete-' + s.what;
 
@@ -129,62 +167,79 @@ var wpList = {
 
 		s.data = $.extend(
 			{ action: s.action, id: s.element.split('-').pop(), _ajax_nonce: s.nonce },
-			wpAjax.unserialize( cls[4] || '' )
+			wpAjax.unserialize( data[4] || '' )
 		);
 
 		if ( $.isFunction(s.delBefore) ) {
-			s = s.delBefore( s );
-			if ( !s ) { return true; }
+			s = s.delBefore( s, list );
+			if ( !s )
+				return true;
 		}
-		if ( !s.data._ajax_nonce ) { return true; }
 
-		var element = $('#' + s.element);
+		if ( !s.data._ajax_nonce )
+			return true;
+
+		element = $('#' + s.element);
 
 		if ( 'none' != s.delColor ) {
-			var anim = 'slideUp';
-			if ( element.css( 'display' ).match(/table/) )
-				anim = 'fadeOut'; // Can't slideup table rows and other table elements.  Known jQuery bug
-			element
-				.animate( { backgroundColor: s.delColor }, 'fast'  )[anim]( 'fast' )
-				.queue( function() { list.wpList.recolor(); $(this).dequeue(); } );
+			element.css( 'backgroundColor', s.delColor ).fadeOut( 350, function(){
+				list.wpList.recolor();
+				$(list).trigger( 'wpListDelEnd', [ s, list.wpList ] );
+			});
 		} else {
 			list.wpList.recolor();
+			$(list).trigger( 'wpListDelEnd', [ s, list.wpList ] );
 		}
 
 		s.success = function(r) {
-			var res = wpAjax.parseAjaxResponse(r, s.response, s.element);
+			res = wpAjax.parseAjaxResponse(r, s.response, s.element);
+			rres = r;
+
 			if ( !res || res.errors ) {
-				element.stop().stop().css( 'backgroundColor', '#FF3333' ).show().queue( function() { list.wpList.recolor(); $(this).dequeue(); } );
+				element.stop().stop().css( 'backgroundColor', '#faa' ).show().queue( function() { list.wpList.recolor(); $(this).dequeue(); } );
 				return false;
 			}
+		};
+
+		s.complete = function(x, st) {
 			if ( $.isFunction(s.delAfter) ) {
-				var o = this.complete;
-				this.complete = function(x,st) {
-					element.queue( function() {
-						var _s = $.extend( { xml: x, status: st, parsed: res }, s );
-						s.delAfter( r, _s );
-						if ( $.isFunction(o) ) { o(x,st); }
-					} ).dequeue();
-				};
+				element.queue( function() {
+					var _s = $.extend( { xml: x, status: st, parsed: res }, s );
+					s.delAfter( rres, _s );
+				}).dequeue();
 			}
-		};
+		}
+
 		$.ajax( s );
 		return false;
 	},
 
 	ajaxDim: function( e, s ) {
-		var list = this; e = $(e); s = s || {};
-		var cls = wpList.parseClass(e,'dim');
+		if ( $(e).parent().css('display') == 'none' ) // Prevent hidden links from being clicked by hotkeys
+			return false;
+
+		e = $(e);
+		s = s || {};
+
+		var list = this, data = wpList.parseData(e,'dim'), element, isClass, color, dimColor, res, rres;
+
 		s = wpList.pre.call( list, e, s, 'dim' );
 
-		s.element = cls[2] || s.element || null;
-		s.dimClass =  cls[3] || s.dimClass || null;
-		if ( cls[4] ) { s.dimAddColor = '#' + cls[4]; }
-		else { s.dimAddColor = s.dimAddColor || '#FFFF33'; }
-		if ( cls[5] ) { s.dimDelColor = '#' + cls[5]; }
-		else { s.dimDelColor = s.dimDelColor || '#FF3333'; }
+		s.element = data[2] || s.element || null;
+		s.dimClass =  data[3] || s.dimClass || null;
+
+		if ( data[4] )
+			s.dimAddColor = '#' + data[4];
+		else
+			s.dimAddColor = s.dimAddColor || '#FFFF33';
 
-		if ( !s || !s.element || !s.dimClass ) { return true; }
+		if ( data[5] )
+			s.dimDelColor = '#' + data[5];
+		else
+			s.dimDelColor = s.dimDelColor || '#FF3333';
+
+		if ( !s || !s.element || !s.dimClass )
+			return true;
 
 		s.action = 'dim-' + s.what;
 
@@ -192,43 +247,53 @@ var wpList = {
 
 		s.data = $.extend(
 			{ action: s.action, id: s.element.split('-').pop(), dimClass: s.dimClass, _ajax_nonce : s.nonce },
-			wpAjax.unserialize( cls[6] || '' )
+			wpAjax.unserialize( data[6] || '' )
 		);
 
 		if ( $.isFunction(s.dimBefore) ) {
 			s = s.dimBefore( s );
-			if ( !s ) { return true; }
+			if ( !s )
+				return true;
 		}
 
-		var element = $('#' + s.element);
-		var isClass = element.toggleClass(s.dimClass).is('.' + s.dimClass);
-		var color = wpList.getColor( element );
-		element.toggleClass( s.dimClass )
-		var dimColor = isClass ? s.dimAddColor : s.dimDelColor;
+		element = $('#' + s.element);
+		isClass = element.toggleClass(s.dimClass).is('.' + s.dimClass);
+		color = wpList.getColor( element );
+		element.toggleClass( s.dimClass );
+		dimColor = isClass ? s.dimAddColor : s.dimDelColor;
+
 		if ( 'none' != dimColor ) {
 			element
 				.animate( { backgroundColor: dimColor }, 'fast' )
 				.queue( function() { element.toggleClass(s.dimClass); $(this).dequeue(); } )
-				.animate( { backgroundColor: color }, { complete: function() { $(this).css( 'backgroundColor', '' ); } } );
+				.animate( { backgroundColor: color }, { complete: function() {
+						$(this).css( 'backgroundColor', '' );
+						$(list).trigger( 'wpListDimEnd', [ s, list.wpList ] );
+					}
+				});
+		} else {
+			$(list).trigger( 'wpListDimEnd', [ s, list.wpList ] );
 		}
 
-		if ( !s.data._ajax_nonce ) { return true; }
+		if ( !s.data._ajax_nonce )
+			return true;
 
 		s.success = function(r) {
-			var res = wpAjax.parseAjaxResponse(r, s.response, s.element);
+			res = wpAjax.parseAjaxResponse(r, s.response, s.element);
+			rres = r;
+
 			if ( !res || res.errors ) {
 				element.stop().stop().css( 'backgroundColor', '#FF3333' )[isClass?'removeClass':'addClass'](s.dimClass).show().queue( function() { list.wpList.recolor(); $(this).dequeue(); } );
 				return false;
 			}
+		};
+
+		s.complete = function(x, st) {
 			if ( $.isFunction(s.dimAfter) ) {
-				var o = this.complete;
-				this.complete = function(x,st) {
-					element.queue( function() {
-						var _s = $.extend( { xml: x, status: st, parsed: res }, s );
-						s.dimAfter( r, _s );
-						if ( $.isFunction(o) ) { o(x,st); }
-					} ).dequeue();
-				};
+				element.queue( function() {
+					var _s = $.extend( { xml: x, status: st, parsed: res }, s );
+					s.dimAfter( rres, _s );
+				}).dequeue();
 			}
 		};
 
@@ -236,46 +301,55 @@ var wpList = {
 		return false;
 	},
 
-	// From jquery.color.js: jQuery Color Animation by John Resig
 	getColor: function( el ) {
-		if ( el.constructor == Object )
-			el = el.get(0);
-		var elem = el, color, rgbaTrans = new RegExp( "rgba\\(\\s*0,\\s*0,\\s*0,\\s*0\\s*\\)", "i" );
-		do {
-			color = jQuery.curCSS(elem, 'backgroundColor');
-			if ( color != '' && color != 'transparent' && !color.match(rgbaTrans) || jQuery.nodeName(elem, "body") )
-				break;
-		} while ( elem = elem.parentNode );
+		var color = jQuery(el).css('backgroundColor');
+
 		return color || '#ffffff';
 	},
 
 	add: function( e, s ) {
-		var list = $(this);
 		e = $(e);
 
-		var old = false;
-		var _s = { pos: 0, id: 0, oldId: null };
-		if ( 'string' == typeof s ) { s = { what: s }; }
+		var list = $(this), old = false, _s = { pos: 0, id: 0, oldId: null }, ba, ref, color;
+
+		if ( 'string' == typeof s )
+			s = { what: s };
+
 		s = $.extend(_s, this.wpList.settings, s);
-		if ( !e.size() || !s.what ) { return false; }
-		if ( s.oldId ) { old = $('#' + s.what + '-' + s.oldId); }
-		if ( s.id && ( s.id != s.oldId || !old || !old.size() ) ) { $('#' + s.what + '-' + s.id).remove(); }
+
+		if ( !e.size() || !s.what )
+			return false;
+
+		if ( s.oldId )
+			old = $('#' + s.what + '-' + s.oldId);
+
+		if ( s.id && ( s.id != s.oldId || !old || !old.size() ) )
+			$('#' + s.what + '-' + s.id).remove();
 
 		if ( old && old.size() ) {
-			old.replaceWith(e);
+			old.before(e);
+			old.remove();
 		} else if ( isNaN(s.pos) ) {
-			var ba = 'after';
+			ba = 'after';
+
 			if ( '-' == s.pos.substr(0,1) ) {
 				s.pos = s.pos.substr(1);
 				ba = 'before';
 			}
-			var ref = list.find( '#' + s.pos );
-			if ( 1 === ref.size() ) { ref[ba](e); }
-			else { list.append(e); }
-		} else if ( s.pos < 0 ) {
-			list.prepend(e);
-		} else {
-			list.append(e);
+
+			ref = list.find( '#' + s.pos );
+
+			if ( 1 === ref.size() )
+				ref[ba](e);
+			else
+				list.append(e);
+
+		} else if ( 'comment' != s.what || 0 === $('#' + s.element).length ) {
+			if ( s.pos < 0 ) {
+				list.prepend(e);
+			} else {
+				list.append(e);
+			}
 		}
 
 		if ( s.alt ) {
@@ -284,7 +358,7 @@ var wpList = {
 		}
 
 		if ( 'none' != s.addColor ) {
-			var color = wpList.getColor( e );
+			color = wpList.getColor( e );
 			e.css( 'backgroundColor', s.addColor ).animate( { backgroundColor: color }, { complete: function() { $(this).css( 'backgroundColor', '' ); } } );
 		}
 		list.each( function() { this.wpList.process( e ); } );
@@ -292,62 +366,78 @@ var wpList = {
 	},
 
 	clear: function(e) {
-		var list = this;
+		var list = this, t, tag;
+
 		e = $(e);
-		if ( list.wpList && e.parents( '#' + list.id ).size() ) { return; }
+
+		if ( list.wpList && e.parents( '#' + list.id ).size() )
+			return;
+
 		e.find(':input').each( function() {
 			if ( $(this).parents('.form-no-clear').size() )
 				return;
-			var t = this.type.toLowerCase(); var tag = this.tagName.toLowerCase();
-			if ( 'text' == t || 'password' == t || 'textarea' == tag ) { this.value = ''; }
-			else if ( 'checkbox' == t || 'radio' == t ) { this.checked = false; }
-			else if ( 'select' == tag ) { this.selectedIndex = null; }
+
+			t = this.type.toLowerCase();
+			tag = this.tagName.toLowerCase();
+
+			if ( 'text' == t || 'password' == t || 'textarea' == tag )
+				this.value = '';
+			else if ( 'checkbox' == t || 'radio' == t )
+				this.checked = false;
+			else if ( 'select' == tag )
+				this.selectedIndex = null;
 		});
 	},
 
 	process: function(el) {
-		var list = this;
-		$("[class^=add:" + list.id + ":]", el || null)
-			.filter('form').submit( function() { return list.wpList.add(this); } ).end()
-			.not('form').click( function() { return list.wpList.add(this); } ).each( function() {
-				var addEl = this;
-				var c = wpList.parseClass(this,'add')[2] || addEl.id;
-				if ( !c ) { return; }
-				var forms = []; var ins = []; // this is all really inefficient
-				$('#' + c + ' :input').focus( function() { currentFormEl = this; } ).blur( function() { currentFormEl = false; } ).each( function() {
-					ins.push(this);
-					var f = $(this).parents('form:first').get(0);
-					if ( $.inArray(f,forms) < 0 ) { forms.push(f); }
-				} );
-				$(forms).submit( function() {
-					if ( 0 <= $.inArray(currentFormEl,ins) ) {
-						$(addEl).trigger( 'click' );
-						$(currentFormEl).focus();
-						return false;
-					}
-				} );
-			} );
-		$("[class^=delete:" + list.id + ":]", el || null).click( function() { return list.wpList.del(this); } );
-		$("[class^=dim:" + list.id + ":]", el || null).click( function() { return list.wpList.dim(this); } );
+		var list = this,
+			$el = $(el || document);
+
+		$el.delegate( 'form[data-wp-lists^="add:' + list.id + ':"]', 'submit', function(){
+			return list.wpList.add(this);
+		});
+
+		$el.delegate( 'a[data-wp-lists^="add:' + list.id + ':"], input[data-wp-lists^="add:' + list.id + ':"]', 'click', function(){
+			return list.wpList.add(this);
+		});
+
+		$el.delegate( '[data-wp-lists^="delete:' + list.id + ':"]', 'click', function(){
+			return list.wpList.del(this);
+		});
+
+		$el.delegate( '[data-wp-lists^="dim:' + list.id + ':"]', 'click', function(){
+			return list.wpList.dim(this);
+		});
 	},
 
 	recolor: function() {
-		var list = this;
-		if ( !list.wpList.settings.alt ) { return; }
-		var items = $('.list-item:visible', list);
-		if ( !items.size() ) { items = $(list).children(':visible'); }
-		var eo = [':even',':odd'];
-		if ( list.wpList.settings.altOffset % 2 ) { eo.reverse(); }
+		var list = this, items, eo;
+
+		if ( !list.wpList.settings.alt )
+			return;
+
+		items = $('.list-item:visible', list);
+
+		if ( !items.size() )
+			items = $(list).children(':visible');
+
+		eo = [':even',':odd'];
+
+		if ( list.wpList.settings.altOffset % 2 )
+			eo.reverse();
+
 		items.filter(eo[0]).addClass(list.wpList.settings.alt).end().filter(eo[1]).removeClass(list.wpList.settings.alt);
 	},
 
 	init: function() {
 		var lists = this;
+
 		lists.wpList.process = function(a) {
 			lists.each( function() {
 				this.wpList.process(a);
 			} );
 		};
+
 		lists.wpList.recolor = function() {
 			lists.each( function() {
 				this.wpList.recolor();
@@ -359,11 +449,15 @@ var wpList = {
 $.fn.wpList = function( settings ) {
 	this.each( function() {
 		var _this = this;
-		this.wpList = { settings: $.extend( {}, wpList.settings, { what: wpList.parseClass(this,'list')[1] || '' }, settings ) };
+
+		this.wpList = { settings: $.extend( {}, wpList.settings, { what: wpList.parseData(this,'list')[1] || '' }, settings ) };
 		$.each( fs, function(i,f) { _this.wpList[i] = function( e, s ) { return wpList[f].call( _this, e, s ); }; } );
 	} );
+
 	wpList.init.call(this);
+
 	this.wpList.process();
+
 	return this;
 };