github-mirror/discourse
github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-21 20:51:12 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: Correct issues in admin-styles-editor (#20435) (#20437)

Browse Source 
The save action clashed with the save component argument

Followup to a433b30650d125e6685fb13f679f613003f246aa
This commit is contained in:
David Taylor 2023-02-24 09:34:56 +00:00 committed by GitHub
parent ba5e0924db
commit 4cadad9a53
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/admin/addon/components/ace-editor.js
View File

@ -200,7 +200,7 @@ export default class AceEditor extends Component {
this._editor.getSession().setAnnotations(warnings); this._editor.getSession().setAnnotations(warnings);
this.setWarning( this.setWarning?.(
warnings.length warnings.length
? I18n.t("admin.customize.theme.scss_color_variables_warning") ? I18n.t("admin.customize.theme.scss_color_variables_warning")
: false : false

2
app/assets/javascripts/admin/addon/components/email-styles-editor.hbs
View File

@ -29,7 +29,7 @@
@content={{this.editorContents}} @content={{this.editorContents}}
@mode={{this.currentEditorMode}} @mode={{this.currentEditorMode}}
@editorId={{this.editorId}} @editorId={{this.editorId}}
@save={{action "save"}} @save={{@save}}
/> />
<div class="admin-footer"> <div class="admin-footer">

5
app/assets/javascripts/admin/addon/components/email-styles-editor.js
View File

@ -48,9 +48,4 @@ export default class EmailStylesEditor extends Component {
}, },
}); });
} }
@action
save() {
this.attrs.save();
}
} }