Move js/settings (#1397)

* Move js/settings to js/pages/settings

* Fix script ordering

.eslintrc.json

@@ -140,7 +140,7 @@
             }
         },
         {
-            "files": ["ext/js/settings/modal-jquery.js"],
+            "files": ["ext/js/pages/settings/modal-jquery.js"],
             "env": {
                 "jquery": true
             }

ext/info.html

@@ -67,8 +67,8 @@
 <script src="/js/data/permissions-util.js"></script>
 <script src="/js/dom/document-focus-controller.js"></script>
 <script src="/js/dom/html-template-collection.js"></script>
-<script src="/js/settings/backup-controller.js"></script>
+<script src="/js/pages/settings/backup-controller.js"></script>
-<script src="/js/settings/settings-controller.js"></script>
+<script src="/js/pages/settings/settings-controller.js"></script>
 
 <script src="/js/pages/info-main.js"></script>
 

ext/permissions.html

@@ -170,8 +170,8 @@
 <script src="/js/data/permissions-util.js"></script>
 <script src="/js/dom/document-focus-controller.js"></script>
 <script src="/js/dom/html-template-collection.js"></script>
-<script src="/js/settings/permissions-toggle-controller.js"></script>
+<script src="/js/pages/settings/permissions-toggle-controller.js"></script>
-<script src="/js/settings/settings-controller.js"></script>
+<script src="/js/pages/settings/settings-controller.js"></script>
 
 <script src="/js/pages/permissions-main.js"></script>
 

ext/pitch-accents-preview.html

@@ -58,7 +58,7 @@
 <script src="/js/display/display-generator.js"></script>
 <script src="/js/dom/html-template-collection.js"></script>
 
-<script src="/js/settings/pitch-accents-preview-main.js"></script>
+<script src="/js/pages/settings/pitch-accents-preview-main.js"></script>
 
 </body>
 </html>

ext/popup-preview.html

@@ -54,10 +54,10 @@
 <script src="/js/dom/text-source-range.js"></script>
 <script src="/js/input/hotkey-handler.js"></script>
 <script src="/js/language/text-scanner.js"></script>
+<script src="/js/pages/settings/popup-preview-frame.js"></script>
 <script src="/js/script/dynamic-loader.js"></script>
-<script src="/js/settings/popup-preview-frame.js"></script>
 
-<script src="/js/settings/popup-preview-frame-main.js"></script>
+<script src="/js/pages/settings/popup-preview-frame-main.js"></script>
 
 </body>
 </html>

ext/settings-old.html

@@ -1307,27 +1307,27 @@
         <script src="/js/media/audio-system.js"></script>
         <script src="/js/media/media-util.js"></script>
         <script src="/js/media/text-to-speech-audio.js"></script>
-        <script src="/js/settings/anki-controller.js"></script>
+        <script src="/js/pages/settings/anki-controller.js"></script>
-        <script src="/js/settings/anki-templates-controller.js"></script>
+        <script src="/js/pages/settings/anki-templates-controller.js"></script>
-        <script src="/js/settings/audio-controller.js"></script>
+        <script src="/js/pages/settings/audio-controller.js"></script>
-        <script src="/js/settings/backup-controller.js"></script>
+        <script src="/js/pages/settings/backup-controller.js"></script>
-        <script src="/js/settings/dictionary-controller.js"></script>
+        <script src="/js/pages/settings/dictionary-controller.js"></script>
-        <script src="/js/settings/dictionary-import-controller.js"></script>
+        <script src="/js/pages/settings/dictionary-import-controller.js"></script>
-        <script src="/js/settings/generic-setting-controller.js"></script>
+        <script src="/js/pages/settings/generic-setting-controller.js"></script>
-        <script src="/js/settings/keyboard-mouse-input-field.js"></script>
+        <script src="/js/pages/settings/keyboard-mouse-input-field.js"></script>
-        <script src="/js/settings/modal-controller.js"></script>
+        <script src="/js/pages/settings/modal-controller.js"></script>
-        <script src="/js/settings/modal-jquery.js"></script>
+        <script src="/js/pages/settings/modal-jquery.js"></script>
-        <script src="/js/settings/permissions-toggle-controller.js"></script>
+        <script src="/js/pages/settings/permissions-toggle-controller.js"></script>
-        <script src="/js/settings/popup-preview-controller.js"></script>
+        <script src="/js/pages/settings/popup-preview-controller.js"></script>
-        <script src="/js/settings/profile-conditions-ui.js"></script>
+        <script src="/js/pages/settings/profile-conditions-ui.js"></script>
-        <script src="/js/settings/profile-controller.js"></script>
+        <script src="/js/pages/settings/profile-controller.js"></script>
-        <script src="/js/settings/scan-inputs-controller.js"></script>
+        <script src="/js/pages/settings/scan-inputs-controller.js"></script>
-        <script src="/js/settings/scan-inputs-simple-controller.js"></script>
+        <script src="/js/pages/settings/scan-inputs-simple-controller.js"></script>
-        <script src="/js/settings/settings-controller.js"></script>
+        <script src="/js/pages/settings/settings-controller.js"></script>
-        <script src="/js/settings/storage-controller.js"></script>
+        <script src="/js/pages/settings/storage-controller.js"></script>
         <script src="/js/templates/template-patcher.js"></script>
         <script src="/js/templates/template-renderer-proxy.js"></script>
 
-        <script src="/js/settings/main.js"></script>
+        <script src="/js/pages/settings/main.js"></script>
     </body>
 </html>

ext/settings.html

@@ -3220,38 +3220,38 @@
 <script src="/js/media/audio-system.js"></script>
 <script src="/js/media/media-util.js"></script>
 <script src="/js/media/text-to-speech-audio.js"></script>
-<script src="/js/settings/anki-controller.js"></script>
+<script src="/js/pages/settings/anki-controller.js"></script>
-<script src="/js/settings/anki-templates-controller.js"></script>
+<script src="/js/pages/settings/anki-templates-controller.js"></script>
-<script src="/js/settings/audio-controller.js"></script>
+<script src="/js/pages/settings/audio-controller.js"></script>
-<script src="/js/settings/backup-controller.js"></script>
+<script src="/js/pages/settings/backup-controller.js"></script>
-<script src="/js/settings/dictionary-controller.js"></script>
+<script src="/js/pages/settings/dictionary-controller.js"></script>
-<script src="/js/settings/dictionary-import-controller.js"></script>
+<script src="/js/pages/settings/dictionary-import-controller.js"></script>
-<script src="/js/settings/extension-keyboard-shortcuts-controller.js"></script>
+<script src="/js/pages/settings/extension-keyboard-shortcuts-controller.js"></script>
-<script src="/js/settings/generic-setting-controller.js"></script>
+<script src="/js/pages/settings/generic-setting-controller.js"></script>
-<script src="/js/settings/keyboard-mouse-input-field.js"></script>
+<script src="/js/pages/settings/keyboard-mouse-input-field.js"></script>
-<script src="/js/settings/keyboard-shortcuts-controller.js"></script>
+<script src="/js/pages/settings/keyboard-shortcuts-controller.js"></script>
-<script src="/js/settings/mecab-controller.js"></script>
+<script src="/js/pages/settings/mecab-controller.js"></script>
-<script src="/js/settings/modal.js"></script>
+<script src="/js/pages/settings/modal.js"></script>
-<script src="/js/settings/modal-controller.js"></script>
+<script src="/js/pages/settings/modal-controller.js"></script>
-<script src="/js/settings/nested-popups-controller.js"></script>
+<script src="/js/pages/settings/nested-popups-controller.js"></script>
-<script src="/js/settings/permissions-toggle-controller.js"></script>
+<script src="/js/pages/settings/permissions-toggle-controller.js"></script>
-<script src="/js/settings/popup-preview-controller.js"></script>
+<script src="/js/pages/settings/popup-preview-controller.js"></script>
-<script src="/js/settings/popup-window-controller.js"></script>
+<script src="/js/pages/settings/popup-window-controller.js"></script>
-<script src="/js/settings/profile-conditions-ui.js"></script>
+<script src="/js/pages/settings/profile-conditions-ui.js"></script>
-<script src="/js/settings/profile-controller.js"></script>
+<script src="/js/pages/settings/profile-controller.js"></script>
-<script src="/js/settings/scan-inputs-controller.js"></script>
+<script src="/js/pages/settings/scan-inputs-controller.js"></script>
-<script src="/js/settings/scan-inputs-simple-controller.js"></script>
+<script src="/js/pages/settings/scan-inputs-simple-controller.js"></script>
-<script src="/js/settings/secondary-search-dictionary-controller.js"></script>
+<script src="/js/pages/settings/secondary-search-dictionary-controller.js"></script>
-<script src="/js/settings/sentence-termination-characters-controller.js"></script>
+<script src="/js/pages/settings/sentence-termination-characters-controller.js"></script>
-<script src="/js/settings/settings-controller.js"></script>
+<script src="/js/pages/settings/settings-controller.js"></script>
-<script src="/js/settings/settings-display-controller.js"></script>
+<script src="/js/pages/settings/settings-display-controller.js"></script>
-<script src="/js/settings/status-footer.js"></script>
+<script src="/js/pages/settings/status-footer.js"></script>
-<script src="/js/settings/storage-controller.js"></script>
+<script src="/js/pages/settings/storage-controller.js"></script>
-<script src="/js/settings/translation-text-replacements-controller.js"></script>
+<script src="/js/pages/settings/translation-text-replacements-controller.js"></script>
 <script src="/js/templates/template-patcher.js"></script>
 <script src="/js/templates/template-renderer-proxy.js"></script>
 
-<script src="/js/settings/settings-main.js"></script>
+<script src="/js/pages/settings/settings-main.js"></script>
 
 </body>
 </html>

ext/welcome.html

@@ -337,15 +337,15 @@
 <script src="/js/language/dictionary-database.js"></script>
 <script src="/js/language/dictionary-importer.js"></script>
 <script src="/js/media/media-util.js"></script>
-<script src="/js/settings/dictionary-controller.js"></script>
+<script src="/js/pages/settings/dictionary-controller.js"></script>
-<script src="/js/settings/dictionary-import-controller.js"></script>
+<script src="/js/pages/settings/dictionary-import-controller.js"></script>
-<script src="/js/settings/generic-setting-controller.js"></script>
+<script src="/js/pages/settings/generic-setting-controller.js"></script>
-<script src="/js/settings/modal.js"></script>
+<script src="/js/pages/settings/modal.js"></script>
-<script src="/js/settings/modal-controller.js"></script>
+<script src="/js/pages/settings/modal-controller.js"></script>
-<script src="/js/settings/scan-inputs-simple-controller.js"></script>
+<script src="/js/pages/settings/scan-inputs-simple-controller.js"></script>
-<script src="/js/settings/settings-controller.js"></script>
+<script src="/js/pages/settings/settings-controller.js"></script>
-<script src="/js/settings/settings-display-controller.js"></script>
+<script src="/js/pages/settings/settings-display-controller.js"></script>
-<script src="/js/settings/status-footer.js"></script>
+<script src="/js/pages/settings/status-footer.js"></script>
 
 <script src="/js/pages/welcome-main.js"></script>