Skip to content

Commit aa1d9a0

Browse files
committed
fix color schemes if empty
1 parent 9e18783 commit aa1d9a0

File tree

2 files changed

+28
-26
lines changed

2 files changed

+28
-26
lines changed

src/plugins/global-settings/color-schemes/index.php

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ class Stackable_Global_Color_Schemes {
3030
function __construct() {
3131
// Register our settings.
3232
add_action( 'register_stackable_global_settings', array( $this, 'register_color_schemes' ) );
33-
add_action( 'stackable_early_version_upgraded', array( $this, 'set_global_color_scheme_default_values' ), 10, 2 );
3433
if ( is_frontend() ) {
3534

3635
/**
@@ -158,30 +157,6 @@ public static function get_color_scheme_properties( $values = null ) {
158157
return $_properties;
159158
}
160159

161-
/**
162-
* When upgrading, make sure that there are default global color schemes.
163-
*/
164-
function set_global_color_scheme_default_values( $old_version, $new_version ) {
165-
if ( ! get_option( 'stackable_global_color_schemes' ) ) {
166-
$empty_color_scheme = Stackable_Global_Color_Schemes::get_color_scheme_properties( array( 'desktop' => '' ) );
167-
168-
$default = array(
169-
array(
170-
'name' => 'Default Scheme',
171-
'key' => 'scheme-default-1',
172-
'colorScheme' => $empty_color_scheme
173-
),
174-
array(
175-
'name' => 'Color Scheme 2',
176-
'key' => 'scheme-default-2',
177-
'colorScheme' => $empty_color_scheme
178-
),
179-
);
180-
181-
update_option( 'stackable_global_color_schemes', $default );
182-
}
183-
}
184-
185160
/**-----------------------------------------------------------------------------
186161
* Global Color Scheme functions
187162
*-----------------------------------------------------------------------------*/

src/plugins/global-settings/color-schemes/store.js

Lines changed: 28 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,34 @@ domReady( () => {
7474
stackable_global_background_mode_color_scheme: backgroundModeColorScheme,
7575
stackable_global_container_mode_color_scheme: containerModeColorScheme,
7676
} = response
77-
const colorSchemes = _colorSchemes || []
77+
const colorSchemes = Array.isArray( _colorSchemes ) && _colorSchemes.length > 0 ? _colorSchemes : [ {
78+
name: 'Default Scheme',
79+
key: 'scheme-default-1',
80+
colorScheme: {
81+
backgroundColor: { desktop: '' },
82+
headingColor: { desktop: '' },
83+
textColor: { desktop: '' },
84+
linkColor: { desktop: '' },
85+
accentColor: { desktop: '' },
86+
buttonBackgroundColor: { desktop: '' },
87+
buttonTextColor: { desktop: '' },
88+
buttonOutlineColor: { desktop: '' },
89+
},
90+
}, {
91+
name: 'Color Scheme 2',
92+
key: 'scheme-default-2',
93+
colorScheme: {
94+
backgroundColor: { desktop: '' },
95+
headingColor: { desktop: '' },
96+
textColor: { desktop: '' },
97+
linkColor: { desktop: '' },
98+
accentColor: { desktop: '' },
99+
buttonBackgroundColor: { desktop: '' },
100+
buttonTextColor: { desktop: '' },
101+
buttonOutlineColor: { desktop: '' },
102+
},
103+
} ]
104+
78105
const defaultColorScheme = {
79106
baseColorScheme,
80107
backgroundModeColorScheme,

0 commit comments

Comments
 (0)