Changeset 22030 for trunk/wp-includes/class-wp-customize-control.php

Timestamp:

09/27/2012 01:57:38 AM (14 years ago)

Author:

nacin

Message:

New color picker, props mattwiebe. see #21206.

Replaces Farbtastic. May change further in response to user testing.

File:

• trunk/wp-includes/class-wp-customize-control.php (modified) (2 diffs)

trunk/wp-includes/class-wp-customize-control.php

@@ -352 +352 @@
          */
         public function enqueue() {
-                wp_enqueue_script( 'farbtastic' );
-                wp_enqueue_style( 'farbtastic' );
+                wp_enqueue_script( 'wp-color-picker' );
+                wp_enqueue_style( 'wp-color-picker' );
         }
 
@@ -373 +373 @@
          */
         public function render_content() {
+                $this_default = $this->setting->default;
+                $default_attr = '';
+                if ( $this_default ) {
+                        if ( false === strpos( $this_default, '#' ) )
+                                $this_default = '#' . $this_default;
+                        $default_attr = ' data-default-color="' . esc_attr( $this_default ) . '"';
+                }
+                // The input's value gets set by JS. Don't fill it.
                 ?>
                 <label>
                         <span class="customize-control-title"><?php echo esc_html( $this->label ); ?></span>
                         <div class="customize-control-content">
-                                <div class="dropdown">
-                                        <div class="dropdown-content">
-                                                <div class="dropdown-status"></div>
-                                        </div>
-                                        <div class="dropdown-arrow"></div>
-                                </div>
-                                <input class="color-picker-hex" type="text" maxlength="7" placeholder="<?php esc_attr_e('Hex Value'); ?>" />
+                                <input class="color-picker-hex" type="text" maxlength="7" placeholder="<?php esc_attr_e( 'Hex Value' ); ?>"<?php echo $default_attr ?> />
                         </div>
-                        <div class="farbtastic-placeholder"></div>
                 </label>
                 <?php