From 044d0a79088791819787b550c5735a4bf60f2797 Mon Sep 17 00:00:00 2001 From: qsm-odoo Date: Tue, 23 Nov 2021 13:10:18 +0000 Subject: [PATCH] [FIX] website: change default scss file displayed in SCSS editor By default show the user_custom_rules.scss one as some people would write rules in user_custom_bootstrap_overridden.scss otherwise, not reading the comment inside explaining how that file should be used. task-2698641 X-original-commit: d465b333a403807f09cdd49078f87b102595994e Part-of: odoo/odoo#80499 --- addons/website/static/src/js/widgets/ace.js | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/addons/website/static/src/js/widgets/ace.js b/addons/website/static/src/js/widgets/ace.js index 177a4db3311..f43b695cff3 100644 --- a/addons/website/static/src/js/widgets/ace.js +++ b/addons/website/static/src/js/widgets/ace.js @@ -69,6 +69,22 @@ var WebsiteAceEditor = AceEditor.extend({ })); }).bind(this)); }, + /** + * @override + */ + _switchType(type) { + const ret = this._super(...arguments); + + if (type === 'scss') { + // By default show the user_custom_rules.scss one as some people + // would write rules in user_custom_bootstrap_overridden.scss + // otherwise, not reading the comment inside explaining how that + // file should be used. + this._displayResource('/website/static/src/scss/user_custom_rules.scss'); + } + + return ret; + }, /** * @override */