Changeset 18229

Timestamp:

06/10/2011 01:41:51 PM (14 years ago)

Author:

dd32

Message:

• Don't clear link colour when switching layouts
• Update "default colour" link when a custom colour has been selected

Fixes #17746

Location:

trunk/wp-content/themes/twentyeleven/inc

Files:

• theme-options.js (modified) (1 diff)
• theme-options.php (modified) (3 diffs)

trunk/wp-content/themes/twentyeleven/inc/theme-options.js

@@ -40 +40 @@
         });
 
-        $('.image-radio-option input:radio').change( function() {
+        $('.image-radio-option.color-scheme input:radio').change( function() {
             var currentDefault = $('#default-color a'),
-                newDefault;
-            if ( $('#link-color').val() !== currentDefault.text() )
-                return;
-            newDefault = $(this).next().val();
+                newDefault = $(this).next().val();
+
+            if ( $('#link-color').val() == currentDefault.text() )
+                pickColor( newDefault );
+
             currentDefault.text( newDefault );
-            pickColor( newDefault );
         });
     });

trunk/wp-content/themes/twentyeleven/inc/theme-options.php

@@ -23 +23 @@
 
     wp_enqueue_style( 'twentyeleven-theme-options', get_template_directory_uri() . '/inc/theme-options.css', false, '2011-04-28' );
-    wp_enqueue_script( 'twentyeleven-theme-options', get_template_directory_uri() . '/inc/theme-options.js', array( 'farbtastic' ), '2011-04-28' );
+    wp_enqueue_script( 'twentyeleven-theme-options', get_template_directory_uri() . '/inc/theme-options.js', array( 'farbtastic' ), '2011-06-10' );
     wp_enqueue_style( 'farbtastic' );
 }
@@ -225 +225 @@
             <table class="form-table">
 
-                <tr valign="top" class="image-radio-option"><th scope="row"><?php _e( 'Color Scheme', 'twentyeleven' ); ?></th>
+                <tr valign="top" class="image-radio-option color-scheme"><th scope="row"><?php _e( 'Color Scheme', 'twentyeleven' ); ?></th>
                     <td>
                         <fieldset><legend class="screen-reader-text"><span><?php _e( 'Color Scheme', 'twentyeleven' ); ?></span></legend>
@@ -261 +261 @@
                 </tr>
 
-                <tr valign="top" class="image-radio-option"><th scope="row"><?php _e( 'Default Layout', 'twentyeleven' ); ?></th>
+                <tr valign="top" class="image-radio-option theme-layout"><th scope="row"><?php _e( 'Default Layout', 'twentyeleven' ); ?></th>
                     <td>
                         <fieldset><legend class="screen-reader-text"><span><?php _e( 'Color Scheme', 'twentyeleven' ); ?></span></legend>