From 4fc9bf2d59f58eb268c623716613c8ec5dc9acc2 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Fri, 1 Oct 2021 19:09:37 -0700
Subject: [PATCH] (REF) crmMsgadmEditContent - Extract parameter 'token-list'

---
 ext/message_admin/ang/crmMsgadm/Edit.html        | 5 ++---
 ext/message_admin/ang/crmMsgadm/EditContent.html | 6 +++---
 ext/message_admin/ang/crmMsgadm/EditContent.js   | 3 ++-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/ext/message_admin/ang/crmMsgadm/Edit.html b/ext/message_admin/ang/crmMsgadm/Edit.html
index f7782aebcd..3d4ba7770d 100644
--- a/ext/message_admin/ang/crmMsgadm/Edit.html
+++ b/ext/message_admin/ang/crmMsgadm/Edit.html
@@ -66,9 +66,8 @@
           </li>
         </ul>
       </div>
-      <div class="panel-body">
-        <crm-msgadm-edit-content options="{record: $ctrl.records[$ctrl.tab], tokenList: $ctrl.tokenList, disabled: true}" ng-if="$ctrl.tab==='original'"></crm-msgadm-edit-content>
-        <crm-msgadm-edit-content options="{record: $ctrl.records[$ctrl.tab], tokenList: $ctrl.tokenList}" ng-if="$ctrl.tab!=='original'"></crm-msgadm-edit-content>
+      <div class="panel-body" ng-hide="$ctrl.loading">
+        <crm-msgadm-edit-content options="{record: $ctrl.records[$ctrl.tab], disabled: ($ctrl.tab==='original')}" token-list="$ctrl.tokenList"></crm-msgadm-edit-content>
       </div>
     </div>
 
diff --git a/ext/message_admin/ang/crmMsgadm/EditContent.html b/ext/message_admin/ang/crmMsgadm/EditContent.html
index 221c1c27ed..a6736605c8 100644
--- a/ext/message_admin/ang/crmMsgadm/EditContent.html
+++ b/ext/message_admin/ang/crmMsgadm/EditContent.html
@@ -8,7 +8,7 @@
       <input class="form-control pull-right crm-action-menu fa-code"
              tabindex="-1"
              style="z-index:1"
-             crm-ui-select="{placeholder: ts('Token'), data: $ctrl.options.tokenList, width: '12em', dropdownAutoWidth: true}"
+             crm-ui-select="{placeholder: ts('Token'), data: $ctrl.tokenList, width: '12em', dropdownAutoWidth: true}"
              on-crm-ui-select="$broadcast('insert:msg_subject', selection)"
              ng-show="accordions.msg_subject && !$ctrl.isDisabled()"
       />
@@ -30,7 +30,7 @@
       <input class="form-control pull-right crm-action-menu fa-code"
              tabindex="-1"
              style="z-index:1"
-             crm-ui-select="{placeholder: ts('Token'), data: $ctrl.options.tokenList, width: '12em', dropdownAutoWidth: true}"
+             crm-ui-select="{placeholder: ts('Token'), data: $ctrl.tokenList, width: '12em', dropdownAutoWidth: true}"
              on-crm-ui-select="$broadcast('insert:msg_html', selection)"
              ng-show="accordions.msg_html && !$ctrl.isDisabled()"
       />
@@ -59,7 +59,7 @@
       <input class="form-control pull-right crm-action-menu fa-code"
              tabindex="-1"
              style="z-index:1"
-             crm-ui-select="{placeholder: ts('Token'), data: $ctrl.options.tokenList, width: '12em', dropdownAutoWidth: true}"
+             crm-ui-select="{placeholder: ts('Token'), data: $ctrl.tokenList, width: '12em', dropdownAutoWidth: true}"
              on-crm-ui-select="$broadcast('insert:msg_text', selection)"
              ng-show="accordions.msg_text && !$ctrl.isDisabled()"
       />
diff --git a/ext/message_admin/ang/crmMsgadm/EditContent.js b/ext/message_admin/ang/crmMsgadm/EditContent.js
index 33294d7f1a..b469772bf1 100644
--- a/ext/message_admin/ang/crmMsgadm/EditContent.js
+++ b/ext/message_admin/ang/crmMsgadm/EditContent.js
@@ -2,6 +2,7 @@
   angular.module('crmMsgadm').component('crmMsgadmEditContent', {
     bindings: {
       onPreview: '&',
+      tokenList: '<',
       options: '='
     },
     templateUrl: '~/crmMsgadm/EditContent.html',
@@ -31,7 +32,7 @@
           },
           record: $ctrl.options.record,
           field: fld,
-          tokenList: $ctrl.options.tokenList
+          tokenList: $ctrl.tokenList
         };
         var options = CRM.utils.adjustDialogDefaults({
           // show: {effect: 'slideDown'},
-- 
2.25.1