From f76c7d74d076b53d2f17ef4d234d4fa894bbf611 Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Tue, 27 Sep 2022 20:17:59 -0400
Subject: Cleanup and refactoring (#2239)

* Remove unused ignoreSelectors

* Remove unused isMouseButtonPressed

* Update getWritingMode to use the immediate element if possible

* Move static functions to DocumentUtil

* Fix documentation
---
 ext/js/pages/settings/generic-setting-controller.js    | 3 ++-
 ext/js/pages/settings/keyboard-shortcuts-controller.js | 4 ++--
 ext/js/pages/settings/nested-popups-controller.js      | 4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'ext/js/pages')

diff --git a/ext/js/pages/settings/generic-setting-controller.js b/ext/js/pages/settings/generic-setting-controller.js
index 58f472a2..68cb1155 100644
--- a/ext/js/pages/settings/generic-setting-controller.js
+++ b/ext/js/pages/settings/generic-setting-controller.js
@@ -17,6 +17,7 @@
 
 /* globals
  * DOMDataBinder
+ * DocumentUtil
  */
 
 class GenericSettingController {
@@ -218,7 +219,7 @@ class GenericSettingController {
     _toNumber(value, data) {
         let {constraints} = data;
         if (!isObject(constraints)) { constraints = {}; }
-        return DOMDataBinder.convertToNumber(value, constraints);
+        return DocumentUtil.convertElementValueToNumber(value, constraints);
     }
 
     _toBoolean(value) {
diff --git a/ext/js/pages/settings/keyboard-shortcuts-controller.js b/ext/js/pages/settings/keyboard-shortcuts-controller.js
index 69acf275..5a3b94a6 100644
--- a/ext/js/pages/settings/keyboard-shortcuts-controller.js
+++ b/ext/js/pages/settings/keyboard-shortcuts-controller.js
@@ -16,7 +16,7 @@
  */
 
 /* global
- * DOMDataBinder
+ * DocumentUtil
  * KeyboardMouseInputField
  * ObjectPropertyAccessor
  */
@@ -322,7 +322,7 @@ class KeyboardShortcutHotkeyEntry {
         let value = this._getArgumentInputValue(node);
         switch (template) {
             case 'hotkey-argument-move-offset':
-                value = `${DOMDataBinder.convertToNumber(value, node)}`;
+                value = `${DocumentUtil.convertElementValueToNumber(value, node)}`;
                 break;
         }
         this._setArgument(value);
diff --git a/ext/js/pages/settings/nested-popups-controller.js b/ext/js/pages/settings/nested-popups-controller.js
index 8b6f02c5..cbee4e0e 100644
--- a/ext/js/pages/settings/nested-popups-controller.js
+++ b/ext/js/pages/settings/nested-popups-controller.js
@@ -16,7 +16,7 @@
  */
 
 /* global
- * DOMDataBinder
+ * DocumentUtil
  */
 
 class NestedPopupsController {
@@ -52,7 +52,7 @@ class NestedPopupsController {
 
     _onNestedPopupsCountChange(e) {
         const node = e.currentTarget;
-        const value = Math.max(1, DOMDataBinder.convertToNumber(node.value, node));
+        const value = Math.max(1, DocumentUtil.convertElementValueToNumber(node.value, node));
         this._setPopupNestingMaxDepth(value);
     }
 
-- 
cgit v1.2.3