From d668b653a623d58f82be8a87ea69368533293966 Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Wed, 20 Jan 2021 20:15:41 -0500
Subject: [PATCH] Move popup-menu.js (#1280)

---
 ext/bg/settings2.html                          | 2 +-
 ext/bg/welcome.html                            | 2 +-
 ext/{bg/js/settings => mixed/js}/popup-menu.js | 0
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename ext/{bg/js/settings => mixed/js}/popup-menu.js (100%)

diff --git a/ext/bg/settings2.html b/ext/bg/settings2.html
index 500810f6..700d4bd5 100644
--- a/ext/bg/settings2.html
+++ b/ext/bg/settings2.html
@@ -3067,6 +3067,7 @@
 <script src="/mixed/js/html-template-collection.js"></script>
 <script src="/mixed/js/object-property-accessor.js"></script>
 <script src="/mixed/js/panel-element.js"></script>
+<script src="/mixed/js/popup-menu.js"></script>
 <script src="/mixed/js/selector-observer.js"></script>
 <script src="/mixed/js/task-accumulator.js"></script>
 <script src="/mixed/js/text-to-speech-audio.js"></script>
@@ -3094,7 +3095,6 @@
 <script src="/bg/js/settings/generic-setting-controller.js"></script>
 <script src="/bg/js/settings/modal.js"></script>
 <script src="/bg/js/settings/modal-controller.js"></script>
-<script src="/bg/js/settings/popup-menu.js"></script>
 <script src="/bg/js/settings/popup-preview-controller.js"></script>
 <script src="/bg/js/settings/profile-controller.js"></script>
 <script src="/bg/js/settings/scan-inputs-controller.js"></script>
diff --git a/ext/bg/welcome.html b/ext/bg/welcome.html
index ee651a1f..a4a725be 100644
--- a/ext/bg/welcome.html
+++ b/ext/bg/welcome.html
@@ -348,6 +348,7 @@
 <script src="/mixed/js/html-template-collection.js"></script>
 <script src="/mixed/js/object-property-accessor.js"></script>
 <script src="/mixed/js/panel-element.js"></script>
+<script src="/mixed/js/popup-menu.js"></script>
 <script src="/mixed/js/selector-observer.js"></script>
 <script src="/mixed/js/task-accumulator.js"></script>
 
@@ -362,7 +363,6 @@
 <script src="/bg/js/settings/generic-setting-controller.js"></script>
 <script src="/bg/js/settings/modal.js"></script>
 <script src="/bg/js/settings/modal-controller.js"></script>
-<script src="/bg/js/settings/popup-menu.js"></script>
 <script src="/bg/js/settings/scan-inputs-simple-controller.js"></script>
 <script src="/bg/js/settings/settings-controller.js"></script>
 <script src="/bg/js/settings/status-footer.js"></script>
diff --git a/ext/bg/js/settings/popup-menu.js b/ext/mixed/js/popup-menu.js
similarity index 100%
rename from ext/bg/js/settings/popup-menu.js
rename to ext/mixed/js/popup-menu.js