Ticket #31006: 31006.diff

src/wp-admin/css/common.css

@@ -637 +637 @@
         border-right-color: #99d;
 }
 
+/* Action colors for wp-lists */
+.wp-core-ui #wpwrap .is-working {
+        background-color: #ceb;
+}
+
+.wp-core-ui #wpwrap .is-deleted,
+.wp-core-ui #wpwrap .is-unsuccessful {
+        background-color: #faa;
+}
+
 .media-upload-form label.form-help,
 td.help {
         color: #9a9a9a;

src/wp-admin/js/edit-comments.js

@@ -83 +83 @@
 
                         a.click(function(){
                                 list.wpList.del(this);
-                                $('#undo-' + id).css( {backgroundColor:'#ceb'} ).fadeOut(350, function(){
+                                $('#undo-' + id).addClass('is-working').fadeOut(350, function(){
                                         $(this).remove();
-                                        $('#comment-' + id).css('backgroundColor', '').fadeIn(300, function(){ $(this).show(); });
+                                        $('#comment-' + id).removeClass('is-deleted').fadeIn(300, function(){ $(this).show(); });
                                 });
                                 return false;
                         });
@@ -338 +338 @@
 
                 if ( this.cid && this.act == 'edit-comment' ) {
                         c = $('#comment-' + this.cid);
-                        c.fadeIn(300, function(){ c.show(); }).css('backgroundColor', '');
+                        c.fadeIn(300, function(){ c.show(); });
                 }
 
                 // reset the Quicktags buttons
@@ -469 +469 @@
         },
 
         show : function(xml) {
-                var t = this, r, c, id, bg, pid;
+                var t = this, r, c, id, pid;
 
                 if ( typeof(xml) == 'string' ) {
                         t.error({'responseText': xml});
@@ -495 +495 @@
                         updatePending( -1 );
 
                         if ( this.comments_listing == 'moderated' ) {
-                                pid.animate( { 'backgroundColor':'#CCEEBB' }, 400, function(){
-                                        pid.fadeOut();
-                                });
+                                pid.addClass('is-working').fadeOut();
                                 return;
                         }
                 }
@@ -508 +506 @@
 
                 id = $(id);
                 t.addEvents(id);
-                bg = id.hasClass('unapproved') ? '#FFFFE0' : id.closest('.widefat, .postbox').css('backgroundColor');
+                t.addEvents(id);
 
-                id.animate( { 'backgroundColor':'#CCEEBB' }, 300 )
-                        .animate( { 'backgroundColor': bg }, 300, function() {
-                                if ( pid && pid.length ) {
-                                        pid.animate( { 'backgroundColor':'#CCEEBB' }, 300 )
-                                                .animate( { 'backgroundColor': bg }, 300 )
-                                                .removeClass('unapproved').addClass('approved')
-                                                .find('div.comment_status').html('1');
-                                }
-                        });
+                id.addClass('is-working', 300).removeClass('is-working', 300);
 
+                if ( pid && pid.length ) {
+                        pid.addClass('is-working').switchClass('unapproved', 'approved').removeClass('is-working', 400).find('div.comment_status').html('1');
+                }
         },
 
         error : function(r) {

src/wp-includes/js/wp-lists.js

@@ -9 +9 @@
 
                 what: '',
                 alt: 'alternate', altOffset: 0,
-                addColor: null, delColor: null, dimAddColor: null, dimDelColor: null,
+                addColor: null, delColor: null, dimAddColor: null, dimDelColor: null, // Deprecated in favor of classes
 
                 confirm: null,
                 addBefore: null, addAfter: null,
@@ -154 +154 @@
 
                 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;
 
@@ -182 +177 @@
 
                 element = $('#' + s.element);
 
-                if ( 'none' != s.delColor ) {
-                        element.css( 'backgroundColor', s.delColor ).fadeOut( 350, function(){
-                                list.wpList.recolor();
-                                $(list).trigger( 'wpListDelEnd', [ s, list.wpList ] );
-                        });
-                } else {
+                element.addClass('is-deleted').fadeOut( 350, function(){
                         list.wpList.recolor();
                         $(list).trigger( 'wpListDelEnd', [ s, list.wpList ] );
-                }
+                });
 
                 s.success = function(r) {
                         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(); } );
+                                element.stop().stop().addClass('is-unsuccessful').show().queue( function() { list.wpList.recolor(); $(this).dequeue(); } );
                                 return false;
                         }
                 };

src/wp-includes/script-loader.php

@@ -144 +144 @@
                 'interval' => apply_filters( 'wp_auth_check_interval', 3 * MINUTE_IN_SECONDS ),
         ) );
 
-        $scripts->add( 'wp-lists', "/wp-includes/js/wp-lists$suffix.js", array( 'wp-ajax-response', 'jquery-color' ), false, 1 );
+        $scripts->add( 'wp-lists', "/wp-includes/js/wp-lists$suffix.js", array( 'wp-ajax-response', 'jquery-ui-core', 'jquery-effects-core' ), false, 1 );
 
         // WordPress no longer uses or bundles Prototype or script.aculo.us. These are now pulled from an external source.
         $scripts->add( 'prototype', '//ajax.googleapis.com/ajax/libs/prototype/1.7.1.0/prototype.js', array(), '1.7.1');