Remove touchInputEnabled and pointerEventsEnabled (#1585)

* Remove touchInputEnabled and pointerEventsEnabled * Revert small change * Missed change * Forgot to save * Restore _getPointerEventListeners * Remove unused code * Add touchEnd and contextMenu * Refactor MouseEvent into PointerEvent * typing * Restore 'mousedown' * touch tap invalidation when touch move * remove return for void functions --------- Co-authored-by: jamesmaa <[email protected]>
yomidevs · Nov 25, 2024 · 095160e · 095160e
1 parent 6278812
commit 095160e
Show file tree

Hide file tree

Showing 9 changed files with 68 additions and 239 deletions.
diff --git a/ext/data/schemas/options-schema.json b/ext/data/schemas/options-schema.json
@@ -453,8 +453,6 @@
                                 "required": [
                                     "inputs",
                                     "preventMiddleMouse",
-                                    "touchInputEnabled",
-                                    "pointerEventsEnabled",
                                     "selectText",
                                     "alphanumeric",
                                     "autoHideResults",
@@ -676,14 +674,6 @@
                                             }
                                         }
                                     },
-                                    "touchInputEnabled": {
-                                        "type": "boolean",
-                                        "default": true
-                                    },
-                                    "pointerEventsEnabled": {
-                                        "type": "boolean",
-                                        "default": false
-                                    },
                                     "selectText": {
                                         "type": "boolean",
                                         "default": true

diff --git a/ext/js/app/frontend.js b/ext/js/app/frontend.js
@@ -506,8 +506,6 @@ export class Frontend {
             normalizeCssZoom: scanningOptions.normalizeCssZoom,
             selectText: scanningOptions.selectText,
             delay: scanningOptions.delay,
-            touchInputEnabled: scanningOptions.touchInputEnabled,
-            pointerEventsEnabled: scanningOptions.pointerEventsEnabled,
             scanLength: scanningOptions.length,
             layoutAwareScan: scanningOptions.layoutAwareScan,
             matchTypePrefix: scanningOptions.matchTypePrefix,

diff --git a/ext/js/data/options-util.js b/ext/js/data/options-util.js
@@ -566,6 +566,7 @@ export class OptionsUtil {
             this._updateVersion52,
             this._updateVersion53,
             this._updateVersion54,
+            this._updateVersion55,
         ];
         /* eslint-enable @typescript-eslint/unbound-method */
         if (typeof targetVersion === 'number' && targetVersion < result.length) {
@@ -1521,6 +1522,18 @@ export class OptionsUtil {
         }
     }
 
+    /**
+     * - Remove scanning.touchInputEnabled
+     * - Remove scanning.pointerEventsEnabled
+     * @type {import('options-util').UpdateFunction}
+     */
+    async _updateVersion55(options) {
+        for (const profile of options.profiles) {
+            delete profile.options.scanning.touchInputEnabled;
+            delete profile.options.scanning.pointerEventsEnabled;
+        }
+    }
+
     /**
      * @param {string} url
      * @returns {Promise<chrome.tabs.Tab>}

diff --git a/ext/js/display/display.js b/ext/js/display/display.js
@@ -457,8 +457,6 @@ export class Display extends EventDispatcher {
                 normalizeCssZoom: scanningOptions.normalizeCssZoom,
                 selectText: scanningOptions.selectText,
                 delay: scanningOptions.delay,
-                touchInputEnabled: scanningOptions.touchInputEnabled,
-                pointerEventsEnabled: scanningOptions.pointerEventsEnabled,
                 scanLength: scanningOptions.length,
                 layoutAwareScan: scanningOptions.layoutAwareScan,
                 preventMiddleMouse: scanningOptions.preventMiddleMouse.onSearchQuery,
@@ -2054,8 +2052,6 @@ export class Display extends EventDispatcher {
             normalizeCssZoom: scanningOptions.normalizeCssZoom,
             selectText: false,
             delay: scanningOptions.delay,
-            touchInputEnabled: false,
-            pointerEventsEnabled: false,
             scanLength: scanningOptions.length,
             layoutAwareScan: scanningOptions.layoutAwareScan,
             preventMiddleMouse: false,