From e824642a6640edb2c382787934b161d887359a17 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Wed, 16 Jun 2021 02:36:01 -0700
Subject: [PATCH] msgtplui - Fixup msg_subject. Extract <msgtplui-monaco>

---
 ext/msgtplui/ang/msgtpluiEditContent.aff.html | 33 ++++++-------------
 ext/msgtplui/ang/msgtpluiMonaco.aff.html      |  9 +++++
 2 files changed, 19 insertions(+), 23 deletions(-)
 create mode 100644 ext/msgtplui/ang/msgtpluiMonaco.aff.html

diff --git a/ext/msgtplui/ang/msgtpluiEditContent.aff.html b/ext/msgtplui/ang/msgtpluiEditContent.aff.html
index 9656d840cd..c305d506e6 100644
--- a/ext/msgtplui/ang/msgtpluiEditContent.aff.html
+++ b/ext/msgtplui/ang/msgtpluiEditContent.aff.html
@@ -2,40 +2,27 @@
 
 <ng-form name="content_form">
 
-  <div class="form-group">
-    <label for="msgtpl_subject">
-      {{:: ts('Subject') }} <span class="crm-marker">*</span>
-    </label>
+  <div crm-ui-accordion="{title: ts('Subject'), collapsed: false}">
     <input
-      ng-model="options.record.msg_title"
+      ng-if="options.record.msg_subject.search('\n') < 0"
+      ng-model="options.record.msg_subject"
       class="form-control" id="msgtpl_subject"
       required
       title="{{:: ts('Required') }}"
       ng-disabled="options.disabled" />
+
+    <msgtplui-monaco
+      ng-if="options.record.msg_subject.search('\n') >= 0"
+      options="{disabled: options.disabled, record: options.record, field: 'msg_subject', language: 'smarty'}">
+    </msgtplui-monaco>
   </div>
 
   <div crm-ui-accordion="{title: ts('HTML Content'), collapsed: false}">
-    <!-- At time of writing, changes to disabled/readOnly don't propagate dynamically. So use separate widgets. -->
-    <div ng-if="options.disabled"
-      crm-monaco="{language: 'html', wordWrap: 'wordWrapColumn', wordWrapColumn: 100, wordWrapMinified: false, wrappingIndent: 'indent', readOnly: true}"
-      ng-model="options.record.msg_html">
-    </div>
-    <div ng-if="!options.disabled"
-       crm-monaco="{language: 'html', wordWrap: 'wordWrapColumn', wordWrapColumn: 100, wordWrapMinified: false, wrappingIndent: 'indent'}"
-       ng-model="options.record.msg_html">
-    </div>
+    <msgtplui-monaco options="{disabled: options.disabled, record: options.record, field: 'msg_html', language: 'html'}"></msgtplui-monaco>
   </div>
 
   <div crm-ui-accordion="{title: ts('Text Content'), collapsed: true}">
-    <!-- At time of writing, changes to disabled/readOnly don't propagate dynamically. So use separate widgets. -->
-    <div ng-if="options.disabled"
-       crm-monaco="{language: 'smarty', wordWrap: 'wordWrapColumn', wordWrapColumn: 100, wordWrapMinified: false, wrappingIndent: 'indent', readOnly: true}"
-       ng-model="options.record.msg_text">
-    </div>
-    <div ng-if="!options.disabled"
-       crm-monaco="{language: 'smarty', wordWrap: 'wordWrapColumn', wordWrapColumn: 100, wordWrapMinified: false, wrappingIndent: 'indent'}"
-       ng-model="options.record.msg_text">
-    </div>
+    <msgtplui-monaco options="{disabled: options.disabled, record: options.record, field: 'msg_text', language: 'smarty'}"></msgtplui-monaco>
   </div>
 
 </ng-form>
diff --git a/ext/msgtplui/ang/msgtpluiMonaco.aff.html b/ext/msgtplui/ang/msgtpluiMonaco.aff.html
new file mode 100644
index 0000000000..efa13d273f
--- /dev/null
+++ b/ext/msgtplui/ang/msgtpluiMonaco.aff.html
@@ -0,0 +1,9 @@
+<!-- (1) Encapsulate some common options. (2) Work-around issues with propagating updates to 'readOnly'/'disabled' property. -->
+<div ng-if="options.disabled"
+   crm-monaco="{language: options.language, wordWrap: 'wordWrapColumn', wordWrapColumn: 100, wordWrapMinified: false, wrappingIndent: 'indent', readOnly: true}"
+     ng-model="options.record[options.field]">
+</div>
+<div ng-if="!options.disabled"
+   crm-monaco="{language: options.language, wordWrap: 'wordWrapColumn', wordWrapColumn: 100, wordWrapMinified: false, wrappingIndent: 'indent'}"
+   ng-model="options.record[options.field]">
+</div>
-- 
2.25.1