Changeset 1928984

Timestamp:

08/23/2018 08:43:10 AM (8 years ago)

Author:

vlad.olaru

Message:

Fixed color pickers

Location:

customify/trunk

Files:

• css/customizer.css (modified) (1 diff)
• customify.php (modified) (2 diffs)
• includes/class-customify-color-palettes.php (modified) (1 diff)
• js/customizer/color-palettes.js (modified) (8 diffs)
• readme.txt (modified) (1 diff)
• scss/customizer.scss (modified) (1 diff)

customify/trunk/css/customizer.css

@@ -1515 +1515 @@
 }.sm_color_matrix
 {
-    display: -ms-flexbox                                        ;display: flex;display: none;margin-left: -15px;-ms-flex-wrap: wrap;flex-wrap: wrap;
+    display: -ms-flexbox                                ;display: flex;margin-left: -15px;-ms-flex-wrap: wrap;flex-wrap: wrap;
 }.sm_color_matrix > *
 {

customify/trunk/customify.php

@@ -4 +4 @@
 Plugin URI:  https://wordpress.org/plugins/customify/
 Description: A Theme Customizer Booster
-Version: 2.0.0
+Version: 2.0.1
 Author: Pixelgrade
 Author URI: https://pixelgrade.com
@@ -62 +62 @@
     require_once plugin_dir_path( __FILE__ ) . 'class-pixcustomify.php';
 
-    $instance = PixCustomifyPlugin::instance( __FILE__, '2.0.0' );
+    $instance = PixCustomifyPlugin::instance( __FILE__, '2.0.1' );
 
     return $instance;

customify/trunk/includes/class-customify-color-palettes.php

@@ -576 +576 @@
         '</div>'  . PHP_EOL;
         foreach ( $master_color_controls_ids as $setting_id ) {
-            $current_palette .= '<input id="current-palette-' . $setting_id . '" class="c-color-palette__input ' . $setting_id . '" type="text">';
+            $current_palette .= '<input id="current-palette-' . $setting_id . '" class="c-color-palette__input ' . $setting_id . '" type="text" value="' . get_option( $setting_id ) . '">';
         }
         $current_palette .= '</div>';

customify/trunk/js/customizer/color-palettes.js

@@ -442 +442 @@
 
                     $obj.css( 'color', filterColor( currentColor ) );
+
+                    filteredColors[setting_id] = filterColor( currentColor );
                     setting.set( currentColor );
-                    setPalettesOnConnectedFields();
 
                     if ( event.originalEvent.type !== 'external' ) {
                         $palette.find( '.color.' + setting_id ).removeClass( 'altered' );
                     }
+
+                    setPalettesOnConnectedFields();
+                    // buildColorMatrix();
                 },
             } );
@@ -486 +490 @@
 
             $input.on( 'focus', ( e ) => {
-
-                $colors.each( ( i, obj ) => {
-                    $( obj ).data( 'target' ).not( $input ).iris( 'hide' );
-                } );
-
                 $colors.not( $obj ).addClass( 'inactive' ).removeClass( 'active' );
                 $obj.addClass( 'active' ).removeClass( 'inactive' );
@@ -536 +535 @@
             const setting = wp.customize( id );
             const initialColor = setting();
-            $( '.c-color-palette' ).find( '.c-color-palette__fields' ).find( 'input.' + id ).iris( 'color', initialColor );
             $( '.c-color-palette' ).find( '.color.' + id ).css( 'color', initialColor );
         });
@@ -596 +594 @@
 
                 if ( ! $bucket.children( '.' + fieldClassName ).length ) {
-                    $( '<div title="' + field_id + '" class="' + fieldClassName + '">' ).appendTo( $bucket );
+                    $( '<div title="' + field_id + '" class="' + fieldClassName + '">' ).appendTo( $bucket );
                 }
             } );
@@ -633 +631 @@
                         let connectedFieldValue = connectedSetting();
 
-                        if ( connectedFieldValue.toLowerCase() !== filterColor( masterSettingValue ).toLowerCase() ) {
+                        if ( typeof connectedFieldValue === "string" && connectedFieldValue.toLowerCase() !== filterColor( masterSettingValue ).toLowerCase() ) {
                             connectedFieldsWereAltered = true;
                         }
@@ -676 +674 @@
         toggleAlteredClassOnMasterControls();
         toggleHiddenClassOnMasterControls();
-        // setPalettesOnConnectedFields();
+        setPalettesOnConnectedFields();
         showNewColors();
     };
@@ -840 +838 @@
     const reinitializeConnectedFields = () => {
         reloadConnectedFields();
-        buildColorMatrix();
+//        buildColorMatrix();
         unbindConnectedFields();
         bindConnectedFields();
@@ -921 +919 @@
         bindConnectedFields();
         refreshCurrentPaletteControl();
-        buildColorMatrix();
+//      buildColorMatrix();
 
         bindEvents();

customify/trunk/readme.txt

@@ -46 +46 @@
 == Changelog ==
 
+= 2.0.1 =
+* Minor fix for the color pickers.
+
 = 2.0.0 =
 * Added the much improved and overall awesome **Color Palettes v2.0 styling system** (all modesty aside).

customify/trunk/scss/customizer.scss

@@ -2378 +2378 @@
 .sm_color_matrix {
     display: flex;
-    display: none;
     flex-wrap: wrap;
     margin-left: -15px;