lightcordwarez
/
BetterDiscordApp-v2
mirror of https://github.com/JsSucks/BetterDiscordApp
1
0
Fork 0
Code Issues 3 Releases Wiki Activity

Fix leaks in keybind settings

This commit is contained in:
Samuel Elliott 2018-07-18 20:55:57 +01:00
parent da627f71e5
commit df471161a7
No known key found for this signature in database
GPG Key ID: 8420C7CDE43DC4D6
1 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
client/src/structs/settings/types/keybind.js
View File

@ -8,10 +8,12 @@
* LICENSE file in the root directory of this source tree. * LICENSE file in the root directory of this source tree.
*/ */
import Setting from './basesetting'; import { IterableWeakSet } from 'common';
import Combokeys from 'combokeys'; import Combokeys from 'combokeys';
import CombokeysGlobalBind from 'combokeys/plugins/global-bind'; import CombokeysGlobalBind from 'combokeys/plugins/global-bind';
import Setting from './basesetting';
const instances = new IterableWeakSet();
let keybindsPaused = false; let keybindsPaused = false;
export default class KeybindSetting extends Setting { export default class KeybindSetting extends Setting {
@ -19,9 +21,11 @@ export default class KeybindSetting extends Setting {
constructor(args, ...merge) { constructor(args, ...merge) {
super(args, ...merge); super(args, ...merge);
instances.add(this);
this.__keybind_activated = this.__keybind_activated.bind(this); this.__keybind_activated = this.__keybind_activated.bind(this);
this.combokeys = new Combokeys(document); this.combokeys = new Combokeys(this);
CombokeysGlobalBind(this.combokeys); CombokeysGlobalBind(this.combokeys);
this.combokeys.bindGlobal(this.value, this.__keybind_activated); this.combokeys.bindGlobal(this.value, this.__keybind_activated);
} }
@ -43,6 +47,22 @@ export default class KeybindSetting extends Setting {
this.emit('keybind-activated', event); this.emit('keybind-activated', event);
} }
// Event function aliases for Combokeys
get addEventListener() { return this.on }
get removeEventListener() { return this.removeListener }
static _setup() {
document.addEventListener('keydown', this.__event_handler.bind(this, 'keydown'));
document.addEventListener('keyup', this.__event_handler.bind(this, 'keyup'));
document.addEventListener('keypress', this.__event_handler.bind(this, 'keypress'));
}
static __event_handler(event, data) {
for (let keybindSetting of instances) {
keybindSetting.emit(event, data);
}
}
static get paused() { static get paused() {
return keybindsPaused; return keybindsPaused;
} }
@ -52,3 +72,5 @@ export default class KeybindSetting extends Setting {
} }
} }
KeybindSetting._setup();