IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

Revert DEFAULT_SHORTCUTS plugin API-breaking change

Browse Source 
* this was done in previous commit
93c38cc175,
  unaware that addKeyboardShortcut in plugin-api.js imports
  bindings from KeyboardShortcuts
This commit is contained in:
Martin Brennan 2020-04-07 16:27:13 +10:00
parent 42c2678d8f
commit 34df9f7908
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,7 +6,7 @@ import { ajax } from "discourse/lib/ajax";
import { throttle } from "@ember/runloop"; import { throttle } from "@ember/runloop";
import { INPUT_DELAY } from "discourse-common/config/environment"; import { INPUT_DELAY } from "discourse-common/config/environment";
export let DEFAULT_BINDINGS = { export let bindings = {
"!": { postAction: "showFlags" }, "!": { postAction: "showFlags" },
"#": { handler: "goToPost", anonymous: true }, "#": { handler: "goToPost", anonymous: true },
"/": { handler: "toggleSearch", anonymous: true }, "/": { handler: "toggleSearch", anonymous: true },
@ -96,18 +96,18 @@ export default {
// Disable the shortcut if private messages are disabled // Disable the shortcut if private messages are disabled
if (!siteSettings.enable_personal_messages) { if (!siteSettings.enable_personal_messages) {
delete DEFAULT_BINDINGS["g m"]; delete bindings["g m"];
} }
}, },
bindEvents() { bindEvents() {
Object.keys(DEFAULT_BINDINGS).forEach(key => { Object.keys(bindings).forEach(key => {
this.bindKey(key); this.bindKey(key);
}); });
}, },
bindKey(key) { bindKey(key) {
const binding = DEFAULT_BINDINGS[key]; const binding = bindings[key];
if (!binding.anonymous && !this.currentUser) { if (!binding.anonymous && !this.currentUser) {
return; return;
} }
@ -158,8 +158,8 @@ export default {
// { // {
// 'c': createTopic // 'c': createTopic
// } // }
unbind(bindings) { unbind(combinations) {
this.pause(Object.keys(bindings)); this.pause(Object.keys(combinations));
}, },
toggleBookmark() { toggleBookmark() {