Changeset 21004

Timestamp:

06/05/2012 06:57:49 PM (13 years ago)

Author:

nacin

Message:

Custom background color: Show the 'Default' link when the input is empty and there is a default color registered. fixes #20448. see #20734.

File:

• trunk/wp-admin/js/custom-background.dev.js (modified) (3 diffs)

trunk/wp-admin/js/custom-background.dev.js

@@ -3 +3 @@
 (function($) {
 
-    pickColor = function(color, cleared) {
+    var defaultColor = '';
+
+    pickColor = function(color) {
         farbtastic.setColor(color);
         $('#background-color').val(color);
         $('#custom-background-image').css('background-color', color);
-        console.log( color );
-        if ( typeof cleared === 'undefined' )
-            cleared = ! color || color === '#';
-        if ( cleared )
+        // If we have a default color, and they match, then we need to hide the 'Default' link.
+        // Otherwise, we hide the 'Clear' link when it is empty.
+        if ( ( defaultColor && color === defaultColor ) || ( ! defaultColor && ( '' === color || '#' === color ) ) )
             $('#clearcolor').hide();
         else
@@ -18 +19 @@
     $(document).ready(function() {
 
+        defaultColor = $('#defaultcolor').val();
+
         $('#pickcolor').click(function() {
             $('#colorPickerDiv').show();
@@ -24 +27 @@
 
         $('#clearcolor a').click( function(e) {
-            pickColor( $('#defaultcolor').val(), true );
+            pickColor( defaultColor );
             e.preventDefault();
         });