From 4cadad9a53e80a54b509fe59ec7cbda380e38699 Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Fri, 24 Feb 2023 09:34:56 +0000
Subject: [PATCH] FIX: Correct issues in admin-styles-editor (#20435) (#20437)

The save action clashed with the save component argument

Followup to a433b30650d125e6685fb13f679f613003f246aa
---
 app/assets/javascripts/admin/addon/components/ace-editor.js  | 2 +-
 .../admin/addon/components/email-styles-editor.hbs           | 2 +-
 .../admin/addon/components/email-styles-editor.js            | 5 -----
 3 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/app/assets/javascripts/admin/addon/components/ace-editor.js b/app/assets/javascripts/admin/addon/components/ace-editor.js
index bc324978333..fa464549a00 100644
--- a/app/assets/javascripts/admin/addon/components/ace-editor.js
+++ b/app/assets/javascripts/admin/addon/components/ace-editor.js
@@ -200,7 +200,7 @@ export default class AceEditor extends Component {
 
     this._editor.getSession().setAnnotations(warnings);
 
-    this.setWarning(
+    this.setWarning?.(
       warnings.length
         ? I18n.t("admin.customize.theme.scss_color_variables_warning")
         : false
diff --git a/app/assets/javascripts/admin/addon/components/email-styles-editor.hbs b/app/assets/javascripts/admin/addon/components/email-styles-editor.hbs
index 1ca8055f6b5..78b63780e11 100644
--- a/app/assets/javascripts/admin/addon/components/email-styles-editor.hbs
+++ b/app/assets/javascripts/admin/addon/components/email-styles-editor.hbs
@@ -29,7 +29,7 @@
   @content={{this.editorContents}}
   @mode={{this.currentEditorMode}}
   @editorId={{this.editorId}}
-  @save={{action "save"}}
+  @save={{@save}}
 />
 
 <div class="admin-footer">
diff --git a/app/assets/javascripts/admin/addon/components/email-styles-editor.js b/app/assets/javascripts/admin/addon/components/email-styles-editor.js
index a3d2fe55941..2e1fc059be1 100644
--- a/app/assets/javascripts/admin/addon/components/email-styles-editor.js
+++ b/app/assets/javascripts/admin/addon/components/email-styles-editor.js
@@ -48,9 +48,4 @@ export default class EmailStylesEditor extends Component {
       },
     });
   }
-
-  @action
-  save() {
-    this.attrs.save();
-  }
 }