diff options
| author | toasted-nutbread <toasted-nutbread@users.noreply.github.com> | 2020-09-26 17:51:52 -0400 | 
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-26 17:51:52 -0400 | 
| commit | c1b59763941a74367b81e9b8329319f1ede72317 (patch) | |
| tree | 959a0dbaaa6682bfd5bc5430fcfb77b21c5e97d3 /ext/mixed/js | |
| parent | f18c28e519e86cb0bd240fbf20b907ef1a9e7f14 (diff) | |
Scanning mouse button fixes (#866)
* Move mouse0 blocking during mousemove into options
* Update primary button detection
Diffstat (limited to 'ext/mixed/js')
| -rw-r--r-- | ext/mixed/js/document-util.js | 10 | ||||
| -rw-r--r-- | ext/mixed/js/text-scanner.js | 6 | 
2 files changed, 1 insertions, 15 deletions
| diff --git a/ext/mixed/js/document-util.js b/ext/mixed/js/document-util.js index d448fc3c..90add8f9 100644 --- a/ext/mixed/js/document-util.js +++ b/ext/mixed/js/document-util.js @@ -169,16 +169,6 @@ class DocumentUtil {          }      } -    static isMouseButtonDown(mouseEvent, button) { -        const mouseEventButtons = mouseEvent.buttons; -        switch (button) { -            case 'primary': return (mouseEventButtons & 0x1) !== 0x0; -            case 'secondary': return (mouseEventButtons & 0x2) !== 0x0; -            case 'auxiliary': return (mouseEventButtons & 0x4) !== 0x0; -            default: return false; -        } -    } -      static getActiveModifiers(event) {          const modifiers = new Set();          if (event.altKey) { modifiers.add('alt'); } diff --git a/ext/mixed/js/text-scanner.js b/ext/mixed/js/text-scanner.js index f38ca1de..aacc683a 100644 --- a/ext/mixed/js/text-scanner.js +++ b/ext/mixed/js/text-scanner.js @@ -267,10 +267,6 @@ class TextScanner extends EventDispatcher {      _onMouseMove(e) {          this._scanTimerClear(); -        if (DocumentUtil.isMouseButtonDown(e, 'primary')) { -            return; -        } -          const inputInfo = this._getMatchingInputGroupFromEvent(e, 'mouse');          if (inputInfo === null) { return; } @@ -286,7 +282,7 @@ class TextScanner extends EventDispatcher {              return false;          } -        if (DocumentUtil.isMouseButtonDown(e, 'primary')) { +        if (e.button === 0) { // Primary              this._scanTimerClear();              this.clearSelection(false);          } |