Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DEV: Clean up keyTrapper prototype override (#18018)

This commit is contained in:
Jarek Radosz 2022-08-21 09:17:33 +02:00 committed by GitHub
parent dc5dc78309
commit cb49fcad63
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/assets/javascripts/discourse/app/lib/keyboard-shortcuts.js
View File

@ -151,6 +151,10 @@ export default {
},
teardown() {
const prototype = Object.getPrototypeOf(this.keyTrapper);
prototype.stopCallback = this.oldStopCallback;
this.oldStopCallback = null;
this.keyTrapper?.destroy();
this.keyTrapper = null;
this.container = null;
@ -819,7 +823,7 @@ export default {
_stopCallback() {
const prototype = Object.getPrototypeOf(this.keyTrapper);
const oldStopCallback = prototype.stopCallback;
const oldCallback = (this.oldStopCallback = prototype.stopCallback);
prototype.stopCallback = function (e, element, combo, sequence) {
if (this.paused) {
@ -833,7 +837,7 @@ export default {
return false;
}
return oldStopCallback.call(this, e, element, combo, sequence);
return oldCallback.call(this, e, element, combo, sequence);
};
},