<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[38599] trunk/src/wp-includes/js/wp-lists.js: Make wpList easier to contribute to.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/38599">38599</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/38599","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>obenland</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-09-13 22:23:30 +0000 (Tue, 13 Sep 2016)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Make wpList easier to contribute to.
Uses more semantic variable names and adds function and inline documentation.
Props rommelxcastro for parallel work in <a href="https://core.trac.wordpress.org/ticket/34917">#34917</a>.
Fixes <a href="https://core.trac.wordpress.org/ticket/36264">#36264</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesjswplistsjs">trunk/src/wp-includes/js/wp-lists.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesjswplistsjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/wp-lists.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/wp-lists.js 2016-09-13 14:08:24 UTC (rev 38598)
+++ trunk/src/wp-includes/js/wp-lists.js 2016-09-13 22:23:30 UTC (rev 38599)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,501 +1,854 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /* global ajaxurl, wpAjax */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-(function($) {
-var fs = {add:'ajaxAdd',del:'ajaxDel',dim:'ajaxDim',process:'process',recolor:'recolor'}, wpList;
</del><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/**
+ * @param {jQuery} $ jQuery object.
+ */
+( function( $ ) {
+var functions = {
+ add: 'ajaxAdd',
+ del: 'ajaxDel',
+ dim: 'ajaxDim',
+ process: 'process',
+ recolor: 'recolor'
+}, wpList;
+
+/**
+ * @namespace
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> wpList = {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ /**
+ * @member {object}
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> settings: {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- url: ajaxurl, type: 'POST',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ /**
+ * URL for Ajax requests.
+ *
+ * @member {string}
+ */
+ url: ajaxurl,
+
+ /**
+ * The HTTP method to use for Ajax requests.
+ *
+ * @member {string}
+ */
+ type: 'POST',
+
+ /**
+ * ID of the element the parsed Ajax response will be stored in.
+ *
+ * @member {string}
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> response: 'ajax-response',
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * The type of list.
+ *
+ * @member {string}
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> what: '',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- alt: 'alternate', altOffset: 0,
- addColor: null, delColor: null, dimAddColor: null, dimDelColor: null,
</del><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * CSS class name for alternate styling.
+ *
+ * @member {string}
+ */
+ alt: 'alternate',
+
+ /**
+ * Offset to start alternate styling from.
+ *
+ * @member {number}
+ */
+ altOffset: 0,
+
+ /**
+ * Color used in animation when adding an element.
+ *
+ * Can be 'none' to disable the animation.
+ *
+ * @member {string}
+ */
+ addColor: '#ffff33',
+
+ /**
+ * Color used in animation when deleting an element.
+ *
+ * Can be 'none' to disable the animation.
+ *
+ * @member {string}
+ */
+ delColor: '#faafaa',
+
+ /**
+ * Color used in dim add animation.
+ *
+ * Can be 'none' to disable the animation.
+ *
+ * @member {string}
+ */
+ dimAddColor: '#ffff33',
+
+ /**
+ * Color used in dim delete animation.
+ *
+ * Can be 'none' to disable the animation.
+ *
+ * @member {string}
+ */
+ dimDelColor: '#ff3333',
+
+ /**
+ * Callback that's run before a request is made.
+ *
+ * @callback wpList~confirm
+ * @param {object} this
+ * @param {HTMLElement} list The list DOM element.
+ * @param {object} settings Settings for the current list.
+ * @param {string} action The type of action to perform: 'add', 'delete', or 'dim'.
+ * @param {string} backgroundColor Background color of the list's DOM element.
+ * @returns {boolean} Whether to proceed with the action or not.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> confirm: null,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- addBefore: null, addAfter: null,
- delBefore: null, delAfter: null,
- dimBefore: null, dimAfter: null
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ /**
+ * Callback that's run before an item gets added to the list.
+ *
+ * Allows to cancel the request.
+ *
+ * @callback wpList~addBefore
+ * @param {object} settings Settings for the Ajax request.
+ * @returns {object|boolean} Settings for the Ajax request or false to abort.
+ */
+ addBefore: null,
+
+ /**
+ * Callback that's run after an item got added to the list.
+ *
+ * @callback wpList~addAfter
+ * @param {XML} returnedResponse Raw response returned from the server.
+ * @param {object} settings Settings for the Ajax request.
+ * @param {jqXHR} settings.xml jQuery XMLHttpRequest object.
+ * @param {string} settings.status Status of the request: 'success', 'notmodified', 'nocontent', 'error',
+ * 'timeout', 'abort', or 'parsererror'.
+ * @param {object} settings.parsed Parsed response object.
+ */
+ addAfter: null,
+
+ /**
+ * Callback that's run before an item gets deleted from the list.
+ *
+ * Allows to cancel the request.
+ *
+ * @callback wpList~delBefore
+ * @param {object} settings Settings for the Ajax request.
+ * @param {HTMLElement} list The list DOM element.
+ * @returns {object|boolean} Settings for the Ajax request or false to abort.
+ */
+ delBefore: null,
+
+ /**
+ * Callback that's run after an item got deleted from the list.
+ *
+ * @callback wpList~delAfter
+ * @param {XML} returnedResponse Raw response returned from the server.
+ * @param {object} settings Settings for the Ajax request.
+ * @param {jqXHR} settings.xml jQuery XMLHttpRequest object.
+ * @param {string} settings.status Status of the request: 'success', 'notmodified', 'nocontent', 'error',
+ * 'timeout', 'abort', or 'parsererror'.
+ * @param {object} settings.parsed Parsed response object.
+ */
+ delAfter: null,
+
+ /**
+ * Callback that's run before an item gets dim'd.
+ *
+ * Allows to cancel the request.
+ *
+ * @callback wpList~dimBefore
+ * @param {object} settings Settings for the Ajax request.
+ * @returns {object|boolean} Settings for the Ajax request or false to abort.
+ */
+ dimBefore: null,
+
+ /**
+ * Callback that's run after an item got dim'd.
+ *
+ * @callback wpList~dimAfter
+ * @param {XML} returnedResponse Raw response returned from the server.
+ * @param {object} settings Settings for the Ajax request.
+ * @param {jqXHR} settings.xml jQuery XMLHttpRequest object.
+ * @param {string} settings.status Status of the request: 'success', 'notmodified', 'nocontent', 'error',
+ * 'timeout', 'abort', or 'parsererror'.
+ * @param {object} settings.parsed Parsed response object.
+ */
+ dimAfter: null
</ins><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 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;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * Finds a nonce.
+ *
+ * 1. Nonce in settings.
+ * 2. `_ajax_nonce` value in element's href attribute.
+ * 3. `_ajax_nonce` input field that is a descendant of element.
+ * 4. `_wpnonce` value in element's href attribute.
+ * 5. `_wpnonce` input field that is a descendant of element.
+ * 6. 0 if none can be found.
+ *
+ * @param {jQuery} element Element that triggered the request.
+ * @param {object} settings Settings for the Ajax request.
+ * @returns {string|number} Nonce
+ */
+ nonce: function( element, settings ) {
+ var url = wpAjax.unserialize( element.attr( 'href' ) ),
+ $element = $( '#' + settings.element );
+
+ return settings.nonce || url._ajax_nonce || $element.find( 'input[name="_ajax_nonce"]' ).val() || url._wpnonce || $element.find( 'input[name="_wpnonce"]' ).val() || 0;
</ins><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Extract list item data from a DOM element.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param {HTMLElement} e The DOM element.
- * @param {string} t
- * @return {array}
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Example 1: data-wp-lists="delete:the-comment-list:comment-{comment_ID}:66cc66:unspam=1"
+ * Example 2: data-wp-lists="dim:the-comment-list:comment-{comment_ID}:unapproved:e7e7d3:e7e7d3:new=approved"
+ *
+ * Returns an unassociated array with the following data:
+ * data[0] - Data identifier: 'list', 'add', 'delete', or 'dim'.
+ * data[1] - ID of the corresponding list. If data[0] is 'list', the type of list ('comment', 'category', etc).
+ * data[2] - ID of the parent element of all inputs necessary for the request.
+ * data[3] - Hex color to be used in this request. If data[0] is 'dim', dim class.
+ * data[4] - Additional arguments in query syntax that are added to the request. Example: 'post_id=1234'.
+ * If data[0] is 'dim', dim add color.
+ * data[5] - Only available if data[0] is 'dim', dim delete color.
+ * data[6] - Only available if data[0] is 'dim', additional arguments in query syntax that are added to the request.
+ *
+ * Result for Example 1:
+ * data[0] - delete
+ * data[1] - the-comment-list
+ * data[2] - comment-{comment_ID}
+ * data[3] - 66cc66
+ * data[4] - unspam=1
+ *
+ * @param {HTMLElement} element The DOM element.
+ * @param {string} type The type of data to look for: 'list', 'add', 'delete', or 'dim'.
+ * @returns {Array} Extracted list item data.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- parseData: function(e,t) {
- var d = [], wpListsData;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ parseData: function( element, type ) {
+ var data = [], wpListsData;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> try {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wpListsData = $(e).attr('data-wp-lists') || '';
- wpListsData = wpListsData.match(new RegExp(t+':[\\S]+'));
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wpListsData = $( element ).data( 'wp-lists' ) || '';
+ wpListsData = wpListsData.match( new RegExp( type + ':[\\S]+' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( wpListsData )
- d = wpListsData[0].split(':');
- } catch(r) {}
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( wpListsData ) {
+ data = wpListsData[0].split( ':' );
+ }
+ } catch ( error ) {}
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return d;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return data;
</ins><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- pre: function(e,s,a) {
- var bg, r;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * Calls a confirm callback to verify the action that is about to be performed.
+ *
+ * @param {HTMLElement} list The DOM element.
+ * @param {object} settings Settings for this list.
+ * @param {string} action The type of action to perform: 'add', 'delete', or 'dim'.
+ * @returns {object|boolean} Settings if confirmed, false if not.
+ */
+ pre: function( list, settings, action ) {
+ var $element, backgroundColor, confirmed;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- s = $.extend( {}, this.wpList.settings, {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ settings = $.extend( {}, this.wpList.settings, {
</ins><span class="cx" style="display: block; padding: 0 10px"> element: null,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- nonce: 0,
- target: e.get(0)
- }, s || {} );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ nonce: 0,
+ target: list.get( 0 )
+ }, settings || {} );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $.isFunction( s.confirm ) ) {
- if ( 'add' != a ) {
- bg = $('#' + s.element).css('backgroundColor');
- $('#' + s.element).css('backgroundColor', '#FF9966');
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $.isFunction( settings.confirm ) ) {
+ $element = $( '#' + settings.element );
+
+ if ( 'add' !== action ) {
+ backgroundColor = $element.css( 'backgroundColor' );
+ $element.css( 'backgroundColor', '#ff9966' );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- r = s.confirm.call(this, e, s, a, bg);
</del><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'add' != a )
- $('#' + s.element).css('backgroundColor', bg );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ confirmed = settings.confirm.call( this, list, settings, action, backgroundColor );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( !r )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'add' !== action ) {
+ $element.css( 'backgroundColor', backgroundColor );
+ }
+
+ if ( ! confirmed ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return s;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return settings;
</ins><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ajaxAdd: function( e, s ) {
- e = $(e);
- s = s || {};
- var list = this, data = wpList.parseData(e,'add'), es, valid, formData, res, rres;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * Adds an item to the list via AJAX.
+ *
+ * @param {HTMLElement} element The DOM element.
+ * @param {object} settings Settings for this list.
+ * @returns {boolean} Whether the item was added.
+ */
+ ajaxAdd: function( element, settings ) {
+ var list = this,
+ $element = $( element ),
+ data = wpList.parseData( $element, 'add' ),
+ formValues, formData, parsedResponse, returnedResponse;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- s = wpList.pre.call( list, e, s, 'add' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ settings = settings || {};
+ settings = wpList.pre.call( list, $element, settings, 'add' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- s.element = data[2] || e.attr( 'id' ) || s.element || null;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ settings.element = data[2] || $element.prop( 'id' ) || settings.element || null;
+ settings.addColor = data[3] ? '#' + data[3] : settings.addColor;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( data[3] )
- s.addColor = '#' + data[3];
- else
- s.addColor = s.addColor || '#FFFF33';
-
- if ( !s )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! settings ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( !e.is('[id="' + s.element + '-submit"]') )
- return !wpList.add.call( list, e, s );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! $element.is( '[id="' + settings.element + '-submit"]' ) ) {
+ return ! wpList.add.call( list, $element, settings );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( !s.element )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! settings.element ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return true;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- s.action = 'add-' + s.what;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ settings.action = 'add-' + settings.what;
+ settings.nonce = wpList.nonce( $element, settings );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- s.nonce = wpList.nonce(e,s);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! wpAjax.validateForm( '#' + settings.element ) ) {
+ return false;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- es = $('#' + s.element + ' :input').not('[name="_ajax_nonce"], [name="_wpnonce"], [name="action"]');
- valid = wpAjax.validateForm( '#' + s.element );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ settings.data = $.param( $.extend( {
+ _ajax_nonce: settings.nonce,
+ action: settings.action
+ }, wpAjax.unserialize( data[4] || '' ) ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( !valid )
- return false;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ formValues = $( '#' + settings.element + ' :input' ).not( '[name="_ajax_nonce"], [name="_wpnonce"], [name="action"]' );
+ formData = $.isFunction( formValues.fieldSerialize ) ? formValues.fieldSerialize() : formValues.serialize();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- s.data = $.param( $.extend( { _ajax_nonce: s.nonce, action: s.action }, wpAjax.unserialize( data[4] || '' ) ) );
- formData = $.isFunction(es.fieldSerialize) ? es.fieldSerialize() : es.serialize();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( formData ) {
+ settings.data += '&' + formData;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( formData )
- s.data += '&' + formData;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $.isFunction( settings.addBefore ) ) {
+ settings = settings.addBefore( settings );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $.isFunction(s.addBefore) ) {
- s = s.addBefore( s );
- if ( !s )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! settings ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return true;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( !s.data.match(/_ajax_nonce=[a-f0-9]+/) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! settings.data.match( /_ajax_nonce=[a-f0-9]+/ ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return true;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- s.success = function(r) {
- res = wpAjax.parseAjaxResponse(r, s.response, s.element);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ settings.success = function( response ) {
+ parsedResponse = wpAjax.parseAjaxResponse( response, settings.response, settings.element );
+ returnedResponse = response;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- rres = r;
-
- if ( !res || res.errors )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! parsedResponse || parsedResponse.errors ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( true === res )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( true === parsedResponse ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return true;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- jQuery.each( res.responses, function() {
- wpList.add.call( list, this.data, $.extend( {}, s, { // this.firstChild.nodevalue
- pos: this.position || 0,
- id: this.id || 0,
- oldId: this.oldId || null
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $.each( parsedResponse.responses, function() {
+ wpList.add.call( list, this.data, $.extend( {}, settings, { // this.firstChild.nodevalue
+ position: this.position || 0,
+ id: this.id || 0,
+ oldId: this.oldId || null
</ins><span class="cx" style="display: block; padding: 0 10px"> } ) );
</span><span class="cx" style="display: block; padding: 0 10px"> } );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> list.wpList.recolor();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $(list).trigger( 'wpListAddEnd', [ s, list.wpList ] );
- wpList.clear.call(list,'#' + s.element);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $( list ).trigger( 'wpListAddEnd', [ settings, list.wpList ] );
+ wpList.clear.call( list, '#' + settings.element );
</ins><span class="cx" style="display: block; padding: 0 10px"> };
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- s.complete = function(x, st) {
- if ( $.isFunction(s.addAfter) ) {
- var _s = $.extend( { xml: x, status: st, parsed: res }, s );
- s.addAfter( rres, _s );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ settings.complete = function( jqXHR, status ) {
+ if ( $.isFunction( settings.addAfter ) ) {
+ settings.addAfter( returnedResponse, $.extend( {
+ xml: jqXHR,
+ status: status,
+ parsed: parsedResponse
+ }, settings ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> };
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $.ajax( s );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $.ajax( settings );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Delete an item in the list via AJAX.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param {HTMLElement} e A DOM element containing item data.
- * @param {Object} s
- * @return {boolean}
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param {HTMLElement} element A DOM element containing item data.
+ * @param {object} settings Settings for this list.
+ * @returns {boolean} Whether the item was deleted.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ajaxDel: function( e, s ) {
- e = $(e);
- s = s || {};
- var list = this, data = wpList.parseData(e,'delete'), element, res, rres;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ajaxDel: function( element, settings ) {
+ var list = this,
+ $element = $( element ),
+ data = wpList.parseData( $element, 'delete' ),
+ $eventTarget, parsedResponse, returnedResponse;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- s = wpList.pre.call( list, e, s, 'delete' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ settings = settings || {};
+ settings = wpList.pre.call( list, $element, settings, 'delete' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- s.element = data[2] || s.element || null;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ settings.element = data[2] || settings.element || null;
+ settings.delColor = data[3] ? '#' + data[3] : settings.delColor;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( data[3] )
- s.delColor = '#' + data[3];
- else
- s.delColor = s.delColor || '#faa';
-
- if ( !s || !s.element )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! settings || ! settings.element ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- s.action = 'delete-' + s.what;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ settings.action = 'delete-' + settings.what;
+ settings.nonce = wpList.nonce( $element, settings );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- s.nonce = wpList.nonce(e,s);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ settings.data = $.extend( {
+ _ajax_nonce: settings.nonce,
+ action: settings.action,
+ id: settings.element.split( '-' ).pop()
+ }, wpAjax.unserialize( data[4] || '' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- s.data = $.extend(
- { action: s.action, id: s.element.split('-').pop(), _ajax_nonce: s.nonce },
- wpAjax.unserialize( data[4] || '' )
- );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $.isFunction( settings.delBefore ) ) {
+ settings = settings.delBefore( settings, list );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $.isFunction(s.delBefore) ) {
- s = s.delBefore( s, list );
- if ( !s )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! settings ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return true;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( !s.data._ajax_nonce )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! settings.data._ajax_nonce ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return true;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- element = $('#' + s.element);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $eventTarget = $( '#' + settings.element );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'none' != s.delColor ) {
- element.css( 'backgroundColor', s.delColor ).fadeOut( 350, function(){
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'none' !== settings.delColor ) {
+ $eventTarget.css( 'backgroundColor', settings.delColor ).fadeOut( 350, function() {
</ins><span class="cx" style="display: block; padding: 0 10px"> list.wpList.recolor();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $(list).trigger( 'wpListDelEnd', [ s, list.wpList ] );
- });
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $( list ).trigger( 'wpListDelEnd', [ settings, list.wpList ] );
+ } );
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> list.wpList.recolor();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $(list).trigger( 'wpListDelEnd', [ s, list.wpList ] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $( list ).trigger( 'wpListDelEnd', [ settings, list.wpList ] );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- s.success = function(r) {
- res = wpAjax.parseAjaxResponse(r, s.response, s.element);
- rres = r;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ settings.success = function( response ) {
+ parsedResponse = wpAjax.parseAjaxResponse( response, settings.response, settings.element );
+ returnedResponse = response;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( !res || res.errors ) {
- element.stop().stop().css( 'backgroundColor', '#faa' ).show().queue( function() { list.wpList.recolor(); $(this).dequeue(); } );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! parsedResponse || parsedResponse.errors ) {
+ $eventTarget.stop().stop().css( 'backgroundColor', '#faa' ).show().queue( function() {
+ list.wpList.recolor();
+ $( this ).dequeue();
+ } );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> };
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- s.complete = function(x, st) {
- if ( $.isFunction(s.delAfter) ) {
- element.queue( function() {
- var _s = $.extend( { xml: x, status: st, parsed: res }, s );
- s.delAfter( rres, _s );
- }).dequeue();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ settings.complete = function( jqXHR, status ) {
+ if ( $.isFunction( settings.delAfter ) ) {
+ $eventTarget.queue( function() {
+ settings.delAfter( returnedResponse, $.extend( {
+ xml: jqXHR,
+ status: status,
+ parsed: parsedResponse
+ }, settings ) );
+ } ).dequeue();
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> };
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $.ajax( s );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $.ajax( settings );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ajaxDim: function( e, s ) {
- if ( $(e).parent().css('display') == 'none' ) // Prevent hidden links from being clicked by hotkeys
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * Dim an item in the list via AJAX.
+ *
+ * @param {HTMLElement} element A DOM element containing item data.
+ * @param {object} settings Settings for this list.
+ * @returns {boolean} Whether the item was dim'ed.
+ */
+ ajaxDim: function( element, settings ) {
+ var list = this,
+ $element = $( element ),
+ data = wpList.parseData( $element, 'dim' ),
+ $eventTarget, isClass, color, dimColor, parsedResponse, returnedResponse;
+
+ // Prevent hidden links from being clicked by hotkeys.
+ if ( 'none' === $element.parent().css( 'display' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- e = $(e);
- s = s || {};
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ settings = settings || {};
+ settings = wpList.pre.call( list, $element, settings, 'dim' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var list = this, data = wpList.parseData(e,'dim'), element, isClass, color, dimColor, res, rres;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ settings.element = data[2] || settings.element || null;
+ settings.dimClass = data[3] || settings.dimClass || null;
+ settings.dimAddColor = data[4] ? '#' + data[4] : settings.dimAddColor;
+ settings.dimDelColor = data[5] ? '#' + data[5] : settings.dimDelColor;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- s = wpList.pre.call( list, e, s, 'dim' );
-
- 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 ( data[5] )
- s.dimDelColor = '#' + data[5];
- else
- s.dimDelColor = s.dimDelColor || '#FF3333';
-
- if ( !s || !s.element || !s.dimClass )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! settings || ! settings.element || ! settings.dimClass ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return true;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- s.action = 'dim-' + s.what;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ settings.action = 'dim-' + settings.what;
+ settings.nonce = wpList.nonce( $element, settings );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- s.nonce = wpList.nonce(e,s);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ settings.data = $.extend( {
+ _ajax_nonce: settings.nonce,
+ action: settings.action,
+ id: settings.element.split( '-' ).pop(),
+ dimClass: settings.dimClass
+ }, wpAjax.unserialize( data[6] || '' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- s.data = $.extend(
- { action: s.action, id: s.element.split('-').pop(), dimClass: s.dimClass, _ajax_nonce : s.nonce },
- wpAjax.unserialize( data[6] || '' )
- );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $.isFunction( settings.dimBefore ) ) {
+ settings = settings.dimBefore( settings );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $.isFunction(s.dimBefore) ) {
- s = s.dimBefore( s );
- if ( !s )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! settings ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return true;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 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;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $eventTarget = $( '#' + settings.element );
+ isClass = $eventTarget.toggleClass( settings.dimClass ).is( '.' + settings.dimClass );
+ color = wpList.getColor( $eventTarget );
+ dimColor = isClass ? settings.dimAddColor : settings.dimDelColor;
+ $eventTarget.toggleClass( settings.dimClass );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'none' != dimColor ) {
- element
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'none' !== dimColor ) {
+ $eventTarget
</ins><span class="cx" style="display: block; padding: 0 10px"> .animate( { backgroundColor: dimColor }, 'fast' )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- .queue( function() { element.toggleClass(s.dimClass); $(this).dequeue(); } )
- .animate( { backgroundColor: color }, { complete: function() {
- $(this).css( 'backgroundColor', '' );
- $(list).trigger( 'wpListDimEnd', [ s, list.wpList ] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ .queue( function() {
+ $eventTarget.toggleClass( settings.dimClass );
+ $( this ).dequeue();
+ } )
+ .animate( { backgroundColor: color }, {
+ complete: function() {
+ $( this ).css( 'backgroundColor', '' );
+ $( list ).trigger( 'wpListDimEnd', [ settings, list.wpList ] );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- });
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } );
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $(list).trigger( 'wpListDimEnd', [ s, list.wpList ] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $( list ).trigger( 'wpListDimEnd', [ settings, list.wpList ] );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( !s.data._ajax_nonce )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! settings.data._ajax_nonce ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return true;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- s.success = function(r) {
- res = wpAjax.parseAjaxResponse(r, s.response, s.element);
- rres = r;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ settings.success = function( response ) {
+ parsedResponse = wpAjax.parseAjaxResponse( response, settings.response, settings.element );
+ returnedResponse = response;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( true === res ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( true === parsedResponse ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return true;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! res || res.errors ) {
- element.stop().stop().css( 'backgroundColor', '#FF3333' )[isClass?'removeClass':'addClass'](s.dimClass).show().queue( function() { list.wpList.recolor(); $(this).dequeue(); } );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! parsedResponse || parsedResponse.errors ) {
+ $eventTarget.stop().stop().css( 'backgroundColor', '#ff3333' )[isClass ? 'removeClass' : 'addClass']( settings.dimClass ).show().queue( function() {
+ list.wpList.recolor();
+ $( this ).dequeue();
+ } );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'undefined' !== typeof res.responses[0].supplemental.comment_link ) {
- var submittedOn = element.find( '.submitted-on' ),
- commentLink = submittedOn.find( 'a' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /** @property {string} comment_link Link of the comment to be dimmed. */
+ if ( 'undefined' !== typeof parsedResponse.responses[0].supplemental.comment_link ) {
+ var $submittedOn = $element.find( '.submitted-on' ),
+ $commentLink = $submittedOn.find( 'a' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Comment is approved; link the date field.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( '' !== res.responses[0].supplemental.comment_link ) {
- submittedOn.html( $('<a></a>').text( submittedOn.text() ).prop( 'href', res.responses[0].supplemental.comment_link ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '' !== parsedResponse.responses[0].supplemental.comment_link ) {
+ $submittedOn.html( $('<a></a>').text( $submittedOn.text() ).prop( 'href', parsedResponse.responses[0].supplemental.comment_link ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Comment is not approved; unlink the date field.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } else if ( commentLink.length ) {
- submittedOn.text( commentLink.text() );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } else if ( $commentLink.length ) {
+ $submittedOn.text( $commentLink.text() );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> };
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- s.complete = function(x, st) {
- if ( $.isFunction(s.dimAfter) ) {
- element.queue( function() {
- var _s = $.extend( { xml: x, status: st, parsed: res }, s );
- s.dimAfter( rres, _s );
- }).dequeue();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ settings.complete = function( jqXHR, status ) {
+ if ( $.isFunction( settings.dimAfter ) ) {
+ $eventTarget.queue( function() {
+ settings.dimAfter( returnedResponse, $.extend( {
+ xml: jqXHR,
+ status: status,
+ parsed: parsedResponse
+ }, settings ) );
+ } ).dequeue();
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> };
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $.ajax( s );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $.ajax( settings );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- getColor: function( el ) {
- var color = jQuery(el).css('backgroundColor');
-
- return color || '#ffffff';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * Returns the background color of the passed element.
+ *
+ * @param {jQuery|string} element Element to check.
+ * @returns {string} Background color value in HEX. Default: '#ffffff'.
+ */
+ getColor: function( element ) {
+ return $( element ).css( 'backgroundColor' ) || '#ffffff';
</ins><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- add: function( e, s ) {
- if ( 'string' == typeof e ) {
- e = $( $.trim( e ) ); // Trim leading whitespaces
- } else {
- e = $( e );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * Adds something.
+ *
+ * @param {HTMLElement} element A DOM element containing item data.
+ * @param {object} settings Settings for this list.
+ * @returns {boolean} Whether the item was added.
+ */
+ add: function( element, settings ) {
+ var $list = $( this ),
+ $element = $( element ),
+ old = false,
+ position, reference;
+
+ if ( 'string' === typeof settings ) {
+ settings = { what: settings };
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var list = $(this), old = false, _s = { pos: 0, id: 0, oldId: null }, ba, ref, color;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ settings = $.extend( { position: 0, id: 0, oldId: null }, this.wpList.settings, settings );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'string' == typeof s )
- s = { what: s };
-
- s = $.extend(_s, this.wpList.settings, s);
-
- if ( !e.length || !s.what )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! $element.length || ! settings.what ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( s.oldId )
- old = $('#' + s.what + '-' + s.oldId);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( settings.oldId ) {
+ old = $( '#' + settings.what + '-' + settings.oldId );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( s.id && ( s.id != s.oldId || !old || !old.length ) )
- $('#' + s.what + '-' + s.id).remove();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( settings.id && ( settings.id !== settings.oldId || ! old || ! old.length ) ) {
+ $( '#' + settings.what + '-' + settings.id ).remove();
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( old && old.length ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- old.before(e);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ old.before( $element );
</ins><span class="cx" style="display: block; padding: 0 10px"> old.remove();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } else if ( isNaN(s.pos) ) {
- ba = 'after';
</del><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( '-' == s.pos.substr(0,1) ) {
- s.pos = s.pos.substr(1);
- ba = 'before';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } else if ( isNaN( settings.position ) ) {
+ position = 'after';
+
+ if ( '-' === settings.position.substr( 0, 1 ) ) {
+ settings.position = settings.position.substr( 1 );
+ position = 'before';
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ref = list.find( '#' + s.pos );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ reference = $list.find( '#' + settings.position );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 1 === ref.length )
- ref[ba](e);
- else
- list.append(e);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 1 === reference.length ) {
+ reference[position]( $element );
+ } else {
+ $list.append( $element );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } else if ( 'comment' != s.what || 0 === $('#' + s.element).length ) {
- if ( s.pos < 0 ) {
- list.prepend(e);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } else if ( 'comment' !== settings.what || 0 === $( '#' + settings.element ).length ) {
+ if ( settings.position < 0 ) {
+ $list.prepend( $element );
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- list.append(e);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $list.append( $element );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( s.alt ) {
- if ( ( list.children(':visible').index( e[0] ) + s.altOffset ) % 2 ) { e.removeClass( s.alt ); }
- else { e.addClass( s.alt ); }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( settings.alt ) {
+ $element.toggleClass( settings.alt, ( $list.children( ':visible' ).index( $element[0] ) + settings.altOffset ) % 2 );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'none' != s.addColor ) {
- color = wpList.getColor( e );
- e.css( 'backgroundColor', s.addColor ).animate( { backgroundColor: color }, { complete: function() { $(this).css( 'backgroundColor', '' ); } } );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'none' !== settings.addColor ) {
+ $element.css( 'backgroundColor', settings.addColor ).animate( { backgroundColor: wpList.getColor( $element ) }, {
+ complete: function() {
+ $( this ).css( 'backgroundColor', '' );
+ }
+ } );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- list.each( function() { this.wpList.process( e ); } );
- return e;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ // Add event handlers.
+ $list.each( function( index, list ) {
+ list.wpList.process( $element );
+ } );
+
+ return $element;
</ins><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- clear: function(e) {
- var list = this, t, tag;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * Clears all input fields within the element passed.
+ *
+ * @param {string} elementId ID of the element to check, including leading #.
+ */
+ clear: function( elementId ) {
+ var list = this,
+ $element = $( elementId ),
+ type, tagName;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- e = $(e);
-
- if ( list.wpList && e.parents( '#' + list.id ).length )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Bail if we're within the list.
+ if ( list.wpList && $element.parents( '#' + list.id ).length ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- e.find(':input').each( function() {
- if ( $(this).parents('.form-no-clear').length )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Check each input field.
+ $element.find( ':input' ).each( function( index, input ) {
+
+ // Bail if the form was marked to not to be cleared.
+ if ( $( input ).parents( '.form-no-clear' ).length ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- t = this.type.toLowerCase();
- tag = this.tagName.toLowerCase();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ type = input.type.toLowerCase();
+ tagName = input.tagName.toLowerCase();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 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;
- });
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'text' === type || 'password' === type || 'textarea' === tagName ) {
+ input.value = '';
+
+ } else if ( 'checkbox' === type || 'radio' === type ) {
+ input.checked = false;
+
+ } else if ( 'select' === tagName ) {
+ input.selectedIndex = null;
+ }
+ } );
</ins><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- process: function(el) {
- var list = this,
- $el = $(el || document);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * Registers event handlers to add, delete, and dim items.
+ *
+ * @param {string} elementId
+ */
+ process: function( elementId ) {
+ var list = this,
+ $element = $( elementId || document );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $el.delegate( 'form[data-wp-lists^="add:' + list.id + ':"]', 'submit', function(){
- return list.wpList.add(this);
- });
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $element.on( 'submit', 'form[data-wp-lists^="add:' + list.id + ':"]', function() {
+ return list.wpList.add( this );
+ } );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $el.delegate( 'a[data-wp-lists^="add:' + list.id + ':"], input[data-wp-lists^="add:' + list.id + ':"]', 'click', function(){
- return list.wpList.add(this);
- });
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $element.on( 'click', 'a[data-wp-lists^="add:' + list.id + ':"], input[data-wp-lists^="add:' + list.id + ':"]', function() {
+ return list.wpList.add( this );
+ } );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $el.delegate( '[data-wp-lists^="delete:' + list.id + ':"]', 'click', function(){
- return list.wpList.del(this);
- });
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $element.on( 'click', '[data-wp-lists^="delete:' + list.id + ':"]', function() {
+ return list.wpList.del( this );
+ } );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $el.delegate( '[data-wp-lists^="dim:' + list.id + ':"]', 'click', function(){
- return list.wpList.dim(this);
- });
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $element.on( 'click', '[data-wp-lists^="dim:' + list.id + ':"]', function() {
+ return list.wpList.dim( this );
+ } );
</ins><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * Updates list item background colors.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> recolor: function() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var list = this, items, eo;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var list = this,
+ evenOdd = [':even', ':odd'],
+ items;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( !list.wpList.settings.alt )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Bail if there is no alternate class name specified.
+ if ( ! list.wpList.settings.alt ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- items = $('.list-item:visible', list);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ items = $( '.list-item:visible', list );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( !items.length )
- items = $(list).children(':visible');
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! items.length ) {
+ items = $( list ).children( ':visible' );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- eo = [':even',':odd'];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( list.wpList.settings.altOffset % 2 ) {
+ evenOdd.reverse();
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 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);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ items.filter( evenOdd[0] ).addClass( list.wpList.settings.alt ).end();
+ items.filter( evenOdd[1] ).removeClass( list.wpList.settings.alt );
</ins><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * Sets up `process()` and `recolor()` functions.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> init: function() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var lists = this;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var $list = this;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- lists.wpList.process = function(a) {
- lists.each( function() {
- this.wpList.process(a);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $list.wpList.process = function() {
+ $list.each( function( index, element ) {
+ this.wpList.process( element );
</ins><span class="cx" style="display: block; padding: 0 10px"> } );
</span><span class="cx" style="display: block; padding: 0 10px"> };
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- lists.wpList.recolor = function() {
- lists.each( function() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $list.wpList.recolor = function() {
+ $list.each( function() {
</ins><span class="cx" style="display: block; padding: 0 10px"> this.wpList.recolor();
</span><span class="cx" style="display: block; padding: 0 10px"> } );
</span><span class="cx" style="display: block; padding: 0 10px"> };
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> };
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/**
+ * Initializes wpList object.
+ *
+ * @param {Object} settings
+ * @param {string} settings.url URL for ajax calls. Default: ajaxurl.
+ * @param {string} settings.type The HTTP method to use for Ajax requests. Default: 'POST'.
+ * @param {string} settings.response ID of the element the parsed ajax response will be stored in.
+ * Default: 'ajax-response'.
+ *
+ * @param {string} settings.what Default: ''.
+ * @param {string} settings.alt CSS class name for alternate styling. Default: 'alternate'.
+ * @param {number} settings.altOffset Offset to start alternate styling from. Default: 0.
+ * @param {string} settings.addColor Hex code or 'none' to disable animation. Default: '#ffff33'.
+ * @param {string} settings.delColor Hex code or 'none' to disable animation. Default: '#faafaa'.
+ * @param {string} settings.dimAddColor Hex code or 'none' to disable animation. Default: '#ffff33'.
+ * @param {string} settings.dimDelColor Hex code or 'none' to disable animation. Default: '#ff3333'.
+ *
+ * @param {wpList~confirm} settings.confirm Callback that's run before a request is made. Default: null.
+ * @param {wpList~addBefore} settings.addBefore Callback that's run before an item gets added to the list.
+ * Default: null.
+ * @param {wpList~addAfter} settings.addAfter Callback that's run after an item got added to the list.
+ * Default: null.
+ * @param {wpList~delBefore} settings.delBefore Callback that's run before an item gets deleted from the list.
+ * Default: null.
+ * @param {wpList~delAfter} settings.delAfter Callback that's run after an item got deleted from the list.
+ * Default: null.
+ * @param {wpList~dimBefore} settings.dimBefore Callback that's run before an item gets dim'd. Default: null.
+ * @param {wpList~dimAfter} settings.dimAfter Callback that's run after an item got dim'd. Default: null.
+ * @returns {$.fn} wpList API function.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> $.fn.wpList = function( settings ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- this.each( function() {
- var _this = this;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ this.each( function( index, list ) {
+ list.wpList = {
+ settings: $.extend( {}, wpList.settings, { what: wpList.parseData( list, 'list' )[1] || '' }, settings )
+ };
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 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 ); }; } );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $.each( functions, function( func, callback ) {
+ list.wpList[func] = function( element, setting ) {
+ return wpList[callback].call( list, element, setting );
+ };
+ } );
</ins><span class="cx" style="display: block; padding: 0 10px"> } );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wpList.init.call(this);
-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wpList.init.call( this );
</ins><span class="cx" style="display: block; padding: 0 10px"> this.wpList.process();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return this;
</span><span class="cx" style="display: block; padding: 0 10px"> };
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
-})(jQuery);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+} ) ( jQuery );
</ins></span></pre>
</div>
</div>
</body>
</html>