From 1883015d851faac07d27138199b2f2fc75e2e90c Mon Sep 17 00:00:00 2001 From: Milan Ricoul Date: Tue, 5 Nov 2019 16:15:31 +0100 Subject: [PATCH 1/4] feat (theme) : get minified editor-style if production env --- inc/services/theme.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/inc/services/theme.php b/inc/services/theme.php index b961c10c..28e836ea 100644 --- a/inc/services/theme.php +++ b/inc/services/theme.php @@ -1,6 +1,7 @@ get_service('assets')->get_min_file( 'editor-style.css' ); + } + + add_editor_style( 'dist/assets/' . $file); } } From 32bc8a63185fdb6ed2e579983d00ae595f6aabf1 Mon Sep 17 00:00:00 2001 From: Milan Ricoul Date: Mon, 2 Dec 2019 11:16:12 +0100 Subject: [PATCH 2/4] feat : add case editor-style in get_min_file function #83 --- inc/services/assets.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/inc/services/assets.php b/inc/services/assets.php index 6ab29067..68972a8a 100644 --- a/inc/services/assets.php +++ b/inc/services/assets.php @@ -145,6 +145,9 @@ public function get_min_file( $type ) { case 'css': $file = $assets['app.css']; break; + case 'editor-style.css': + $file = $assets['editor-style.css']; + break; case 'js': $file = $assets['app.js']; break; From 22ef6ee97b01cddf224ffc8ea3abc93a86d4af93 Mon Sep 17 00:00:00 2001 From: Nicolas Juen Date: Tue, 3 Dec 2019 14:19:46 +0100 Subject: [PATCH 3/4] Use a slug for the style name --- inc/services/assets.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inc/services/assets.php b/inc/services/assets.php index 68972a8a..0f47a05c 100644 --- a/inc/services/assets.php +++ b/inc/services/assets.php @@ -145,7 +145,7 @@ public function get_min_file( $type ) { case 'css': $file = $assets['app.css']; break; - case 'editor-style.css': + case 'editor-style': $file = $assets['editor-style.css']; break; case 'js': From 8225cca0a0134cfe031daaaf1cfcc27f5b2f487b Mon Sep 17 00:00:00 2001 From: Nicolas Juen Date: Tue, 3 Dec 2019 15:43:43 +0100 Subject: [PATCH 4/4] Change for the file slug, use yoda condition --- inc/services/theme.php | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/inc/services/theme.php b/inc/services/theme.php index 28e836ea..64156ab8 100644 --- a/inc/services/theme.php +++ b/inc/services/theme.php @@ -72,12 +72,22 @@ private function i18n() { * editor style */ private function editor_style() { + /** + * Default file + **/ $file = 'editor-style.css'; - if ( ! defined( 'SCRIPT_DEBUG' ) || SCRIPT_DEBUG === false ) { - $file = Framework::get_container()->get_service('assets')->get_min_file( 'editor-style.css' ); + if ( ! defined( 'SCRIPT_DEBUG' ) || false === SCRIPT_DEBUG ) { + $file = Framework::get_container()->get_service( 'assets' )->get_min_file( 'editor-style' ); + } + + /** + * Do not enqueue a inexistant file on admin + */ + if ( ! is_file( get_theme_file_path( 'dist/assets/' . $file ) ) ) { + return; } - add_editor_style( 'dist/assets/' . $file); + add_editor_style( 'dist/assets/' . $file ); } }