fixed recompile outside of page admin config

This commit is contained in:
Andy Miller
2020-05-07 22:44:55 -06:00
parent a46ad984ad
commit 4d32db02ec
3 changed files with 5 additions and 3 deletions

View File

@@ -2164,8 +2164,10 @@ class AdminController extends AdminBaseController
return false;
}
$default_scheme = $this->grav['config']->get('plugins.admin.whitelabel.color_scheme');
$preview = $this->post['preview'] ?? false;
$data = ['color_scheme' => $this->data['whitelabel']['color_scheme'] ?? null];
$data = ['color_scheme' => $this->data['whitelabel']['color_scheme'] ?? $default_scheme];
$output_file = $preview ? 'admin-preset.css' : 'admin-preset__tmp.css';
$options = [

View File

@@ -13,7 +13,7 @@ const compiler = (element, preview = false, exportScss = false, callback = () =>
Compile({
preview,
exportScss,
color_scheme: fields.filter((value, key) => key.match(/^data\[whitelabel]\[color_scheme]/)).toJS(),
color_scheme: !fields ? [] : fields.filter((value, key) => key.match(/^data\[whitelabel]\[color_scheme]/)).toJS(),
callback: (response) => {
callback.call(callback, response);
resetElement(element);

File diff suppressed because one or more lines are too long