--- a/web/wp-includes/js/wp-lists.dev.js Thu Sep 16 15:45:36 2010 +0000
+++ b/web/wp-includes/js/wp-lists.dev.js Mon Nov 19 18:26:13 2012 +0100
@@ -18,77 +18,107 @@
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;
+
try {
cl = $(e).attr('class') || '';
cl = cl.match(new RegExp(t+':[\\S]+'));
- if ( cl ) { c = cl[0].split(':'); }
+
+ if ( cl )
+ c = cl[0].split(':');
} catch(r) {}
+
return c;
},
pre: function(e,s,a) {
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 ) {
e = $(e);
s = s || {};
- var list = this, cls = wpList.parseClass(e,'add'), es, valid, formData;
+ var list = this, cls = wpList.parseClass(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'; }
+
+ if ( cls[3] )
+ s.addColor = '#' + cls[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.what + '-add-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);
- es = $('#' + s.element + ' :input').not('[name=_ajax_nonce], [name=_wpnonce], [name=action]');
+ es = $('#' + s.element + ' :input').not('[name="_ajax_nonce"], [name="_wpnonce"], [name="action"]');
valid = wpAjax.validateForm( '#' + s.element );
- if ( !valid ) { return false; }
+
+ if ( !valid )
+ return false;
s.data = $.param( $.extend( { _ajax_nonce: s.nonce, action: s.action }, wpAjax.unserialize( cls[4] || '' ) ) );
formData = $.isFunction(es.fieldSerialize) ? es.fieldSerialize() : es.serialize();
- if ( formData ) { s.data += '&' + formData; }
+
+ 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), o;
- if ( !res || res.errors ) { return false; }
+ res = wpAjax.parseAjaxResponse(r, s.response, s.element);
+
+ rres = r;
- if ( true === res ) { return true; }
+ 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
@@ -98,33 +128,38 @@
} ) );
} );
- if ( $.isFunction(s.addAfter) ) {
- 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 ) {
- e = $(e); s = s || {};
- var list = this, cls = wpList.parseClass(e,'delete'), element;
+ e = $(e);
+ s = s || {};
+ var list = this, cls = wpList.parseClass(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 || '#faa'; }
- if ( !s || !s.element ) { return false; }
+ if ( cls[3] )
+ s.delColor = '#' + cls[3];
+ else
+ s.delColor = s.delColor || '#faa';
+
+ if ( !s || !s.element )
+ return false;
s.action = 'delete-' + s.what;
@@ -137,9 +172,12 @@
if ( $.isFunction(s.delBefore) ) {
s = s.delBefore( s, list );
- if ( !s ) { return true; }
+ if ( !s )
+ return true;
}
- if ( !s.data._ajax_nonce ) { return true; }
+
+ if ( !s.data._ajax_nonce )
+ return true;
element = $('#' + s.element);
@@ -154,22 +192,24 @@
}
s.success = function(r) {
- var res = wpAjax.parseAjaxResponse(r, s.response, s.element), o;
+ res = wpAjax.parseAjaxResponse(r, s.response, s.element);
+ rres = r;
+
if ( !res || res.errors ) {
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) ) {
- 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;
},
@@ -177,18 +217,29 @@
ajaxDim: function( e, s ) {
if ( $(e).parent().css('display') == 'none' ) // Prevent hidden links from being clicked by hotkeys
return false;
- e = $(e); s = s || {};
- var list = this, cls = wpList.parseClass(e,'dim'), element, isClass, color, dimColor;
+
+ e = $(e);
+ s = s || {};
+
+ var list = this, cls = wpList.parseClass(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'; }
+
+ if ( cls[4] )
+ s.dimAddColor = '#' + cls[4];
+ else
+ s.dimAddColor = s.dimAddColor || '#FFFF33';
- if ( !s || !s.element || !s.dimClass ) { return true; }
+ if ( cls[5] )
+ s.dimDelColor = '#' + cls[5];
+ else
+ s.dimDelColor = s.dimDelColor || '#FF3333';
+
+ if ( !s || !s.element || !s.dimClass )
+ return true;
s.action = 'dim-' + s.what;
@@ -201,40 +252,48 @@
if ( $.isFunction(s.dimBefore) ) {
s = s.dimBefore( s );
- if ( !s ) { return true; }
+ if ( !s )
+ return true;
}
element = $('#' + s.element);
isClass = element.toggleClass(s.dimClass).is('.' + s.dimClass);
color = wpList.getColor( element );
- element.toggleClass( s.dimClass )
+ 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', '' ); $(list).trigger( 'wpListDimEnd', [ s, list.wpList ] ); } } );
+ .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), o;
+ 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) ) {
- 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();
}
};
@@ -242,16 +301,9 @@
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';
},
@@ -259,28 +311,45 @@
e = $(e);
var list = $(this), old = false, _s = { pos: 0, id: 0, oldId: null }, ba, ref, color;
- if ( 'string' == typeof s ) { s = { what: s }; }
+
+ 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.before(e);
old.remove();
} else if ( isNaN(s.pos) ) {
ba = 'after';
+
if ( '-' == s.pos.substr(0,1) ) {
s.pos = s.pos.substr(1);
ba = 'before';
}
+
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);
+
+ 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 ) {
@@ -298,45 +367,77 @@
clear: function(e) {
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;
+
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; }
+
+ 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); } );
- $("[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[class^="add:' + list.id + ':"]', 'submit', function(){
+ return list.wpList.add(this);
+ });
+
+ $el.delegate( 'a[class^="add:' + list.id + ':"], input[class^="add:' + list.id + ':"]', 'click', function(){
+ return list.wpList.add(this);
+ });
+
+ $el.delegate( '[class^="delete:' + list.id + ':"]', 'click', function(){
+ return list.wpList.del(this);
+ });
+
+ $el.delegate( '[class^="dim:' + list.id + ':"]', 'click', function(){
+ return list.wpList.dim(this);
+ });
},
recolor: function() {
var list = this, items, eo;
- if ( !list.wpList.settings.alt ) { return; }
+
+ if ( !list.wpList.settings.alt )
+ return;
+
items = $('.list-item:visible', list);
- if ( !items.size() ) { items = $(list).children(':visible'); }
+
+ if ( !items.size() )
+ items = $(list).children(':visible');
+
eo = [':even',':odd'];
- if ( list.wpList.settings.altOffset % 2 ) { eo.reverse(); }
+
+ 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();
@@ -348,11 +449,15 @@
$.fn.wpList = function( settings ) {
this.each( function() {
var _this = this;
+
this.wpList = { settings: $.extend( {}, wpList.settings, { what: wpList.parseClass(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;
};