From 138b573379151444139ae6d15f1691f5b98fb4d2 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Wed, 8 Dec 2021 11:07:28 -0500
Subject: [PATCH] Move crmDialog angular utility from message_admin extension
 to core for reusability

---
 Civi/Angular/Manager.php                    |  1 +
 ang/crmDialog.ang.php                       | 12 ++++++++++++
 {ext/message_admin/ang => ang}/crmDialog.js |  6 +++---
 {ext/message_admin/ang => ang}/crmDialog.md |  0
 ext/message_admin/ang/crmDialog.ang.php     | 16 ----------------
 5 files changed, 16 insertions(+), 19 deletions(-)
 create mode 100644 ang/crmDialog.ang.php
 rename {ext/message_admin/ang => ang}/crmDialog.js (93%)
 rename {ext/message_admin/ang => ang}/crmDialog.md (100%)
 delete mode 100644 ext/message_admin/ang/crmDialog.ang.php

diff --git a/Civi/Angular/Manager.php b/Civi/Angular/Manager.php
index dacd8f3062..6c7cde0b2a 100644
--- a/Civi/Angular/Manager.php
+++ b/Civi/Angular/Manager.php
@@ -107,6 +107,7 @@ class Manager {
       $angularModules['crmAttachment'] = include "$civicrm_root/ang/crmAttachment.ang.php";
       $angularModules['crmAutosave'] = include "$civicrm_root/ang/crmAutosave.ang.php";
       $angularModules['crmCxn'] = include "$civicrm_root/ang/crmCxn.ang.php";
+      $angularModules['crmDialog'] = include "$civicrm_root/ang/crmDialog.ang.php";
       $angularModules['crmMonaco'] = include "$civicrm_root/ang/crmMonaco.ang.php";
       $angularModules['crmResource'] = include "$civicrm_root/ang/crmResource.ang.php";
       $angularModules['crmRouteBinder'] = include "$civicrm_root/ang/crmRouteBinder.ang.php";
diff --git a/ang/crmDialog.ang.php b/ang/crmDialog.ang.php
new file mode 100644
index 0000000000..1f6e1265f2
--- /dev/null
+++ b/ang/crmDialog.ang.php
@@ -0,0 +1,12 @@
+<?php
+// @see crmDialog.md
+return [
+  'ext' => 'civicrm',
+  'js' => [
+    'ang/crmDialog.js',
+  ],
+  'requires' => [
+    'dialogService',
+  ],
+  'basePages' => [],
+];
diff --git a/ext/message_admin/ang/crmDialog.js b/ang/crmDialog.js
similarity index 93%
rename from ext/message_admin/ang/crmDialog.js
rename to ang/crmDialog.js
index f5a33f97d3..13162a8e7a 100644
--- a/ext/message_admin/ang/crmDialog.js
+++ b/ang/crmDialog.js
@@ -67,14 +67,14 @@
     require: {
       crmDialog: '?^^crmDialog'
     },
-    controller: function($scope, $element, dialogService, $timeout) {
-      var ts = $scope.ts = CRM.ts('crmDialog'), $ctrl = this;
+    controller: function($scope) {
+      var $ctrl = this;
       $ctrl.$onInit = function() {
         $ctrl.crmDialog.buttons.push(this);
       };
       $ctrl.id = 'crmDialogButton_' + (idNum++);
 
-      $scope.$watch('$ctrl.disabled', function(){
+      $scope.$watch('$ctrl.disabled', function() {
         $ctrl.crmDialog.toggleButtons();
       });
     }
diff --git a/ext/message_admin/ang/crmDialog.md b/ang/crmDialog.md
similarity index 100%
rename from ext/message_admin/ang/crmDialog.md
rename to ang/crmDialog.md
diff --git a/ext/message_admin/ang/crmDialog.ang.php b/ext/message_admin/ang/crmDialog.ang.php
deleted file mode 100644
index fec3ee3414..0000000000
--- a/ext/message_admin/ang/crmDialog.ang.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-// This file declares an Angular module which can be autoloaded
-// in CiviCRM. See also:
-// \https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_angularModules/n
-return [
-  'js' => [
-    'ang/crmDialog.js',
-  ],
-  'requires' => [
-    //'crmUi',
-    //'crmUtil',
-    'dialogService',
-  ],
-  'settings' => [],
-  'basePages' => [],
-];
-- 
2.25.1