From 7c107c85c15d1ae364867dbdd7dfaf7b597f67b1 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Wed, 11 Dec 2019 09:44:23 -0500
Subject: [PATCH] Remove redundant afformStandalone file

---
 ext/afform/core/ang/afformStandalone.ang.php     |  5 -----
 ext/afform/core/ang/afformStandalone.js          | 12 ++++++++++++
 ext/afform/core/ang/afformStandalone/PageCtrl.js | 12 ------------
 3 files changed, 12 insertions(+), 17 deletions(-)
 delete mode 100644 ext/afform/core/ang/afformStandalone/PageCtrl.js

diff --git a/ext/afform/core/ang/afformStandalone.ang.php b/ext/afform/core/ang/afformStandalone.ang.php
index 3b145af59c..6f5f89f8a0 100644
--- a/ext/afform/core/ang/afformStandalone.ang.php
+++ b/ext/afform/core/ang/afformStandalone.ang.php
@@ -6,13 +6,8 @@
 return [
   'js' => [
     'ang/afformStandalone.js',
-    'ang/afformStandalone/*.js',
-    'ang/afformStandalone/*/*.js',
   ],
   'css' => [],
-  'partials' => [
-    'ang/afformStandalone',
-  ],
   'settings' => [],
   'requires' => ['ngRoute'],
 ];
diff --git a/ext/afform/core/ang/afformStandalone.js b/ext/afform/core/ang/afformStandalone.js
index c7b03a2a86..4d65f38090 100644
--- a/ext/afform/core/ang/afformStandalone.js
+++ b/ext/afform/core/ang/afformStandalone.js
@@ -1,4 +1,16 @@
 (function(angular, $, _) {
   // Declare a list of dependencies.
   angular.module('afformStandalone', CRM.angRequires('afformStandalone'));
+
+  angular.module('afformStandalone', CRM.angular.modules)
+    .config(function($routeProvider) {
+      $routeProvider.when('/', {
+        controller: 'AfformStandalonePageCtrl',
+        template: function() {
+          return '<div ' + CRM.afform.open + '="{}"></div>';
+        }
+      });
+    })
+    .controller('AfformStandalonePageCtrl', function($scope) {});
+
 })(angular, CRM.$, CRM._);
diff --git a/ext/afform/core/ang/afformStandalone/PageCtrl.js b/ext/afform/core/ang/afformStandalone/PageCtrl.js
deleted file mode 100644
index 7f597b0223..0000000000
--- a/ext/afform/core/ang/afformStandalone/PageCtrl.js
+++ /dev/null
@@ -1,12 +0,0 @@
-(function(angular, $, _) {
-
-  angular.module('afformStandalone', CRM.angular.modules)
-    .config(function($routeProvider) {
-      $routeProvider.when('/', {
-        controller: 'AfformStandalonePageCtrl',
-        template: function() {return '<div ' + CRM.afform.open + '="{}"></div>'; }
-      });
-    })
-    .controller('AfformStandalonePageCtrl', function($scope) {});
-
-})(angular, CRM.$, CRM._);
-- 
2.25.1