`;
- for (let click of this.clicks) {
- settingshtml += `
${click}:
${BDFDB.createSelectMenu(this.createSelectChoice(bindings[action][click]), bindings[action][click], action + " " + click)}`;
- }
+ settingshtml += `
Click:
${BDFDB.createSelectMenu(this.createSelectChoice(bindings[action].click), bindings[action].click, action + " click")}`;
for (let key of this.keys) {
settingshtml += `
`;
}
@@ -135,20 +136,14 @@ class MessageUtilities {
if (this.started) return;
BDFDB.loadMessage(this);
- let clickTimeout;
BDFDB.addEventListener(this, document, "click", BDFDB.dotCN.messagegroup + "> [aria-disabled]," + BDFDB.dotCN.messagegroup + "> * > [aria-disabled]," + BDFDB.dotCN.messagesystem, e => {
- clearTimeout(clickTimeout);
- let keys = [].concat(BDFDB.pressedKeys);
- clickTimeout = setTimeout(() => {
- this.onClick(e, 0, keys, "onSglClick");
- }, 500);
+ this.onClick(e, 0, "onSglClick");
})
BDFDB.addEventListener(this, document, "dblclick", BDFDB.dotCN.messagegroup + "> [aria-disabled]," + BDFDB.dotCN.messagegroup + "> * > [aria-disabled]," + BDFDB.dotCN.messagesystem, e => {
- clearTimeout(clickTimeout);
- this.onClick(e, 1, BDFDB.pressedKeys, "onDblClick");
+ this.onClick(e, 1, "onDblClick");
});
BDFDB.addEventListener(this, document, "keydown", BDFDB.dotCN.textareawrapchat, e => {
- this.onKeyDown(e, e.which, BDFDB.pressedKeys, "onKeyDown");
+ this.onKeyDown(e, e.which, "onKeyDown");
});
}
else {
@@ -164,6 +159,39 @@ class MessageUtilities {
//begin of own functions
+
+ processMessageContextMenu (instance, menu, returnvalue) {
+ if (instance.props && instance.props.message && instance.props.channel && instance.props.target) {
+ let changed = false;
+ for (let itemlabel of menu.querySelectorAll(BDFDB.dotCN.contextmenulabel)) {
+ let action = null;
+ switch (itemlabel.innerText) {
+ case BDFDB.LanguageStrings.COPY_MESSAGE_LINK:
+ action = "Copy_Link";
+ break;
+ case BDFDB.LanguageStrings.EDIT_MESSAGE:
+ action = "Edit_Message";
+ break;
+ case BDFDB.LanguageStrings.PIN_MESSAGE:
+ case BDFDB.LanguageStrings.UNPIN_MESSAGE:
+ action = "Pin/Unpin_Message";
+ break;
+ case BDFDB.LanguageStrings.DELETE_MESSAGE:
+ action = "Delete_Message";
+ break;
+ }
+ if (action) {
+ let hintlabel = this.getActiveShortcutString(action);
+ if (hintlabel) {
+ changed = true;
+ BDFDB.addClass(itemlabel.nextElementSibling, "BDFDB-contextMenuItemHint");
+ BDFDB.setInnerText(itemlabel.nextElementSibling, hintlabel);
+ }
+ }
+ }
+ if (changed) BDFDB.initElements(menu);
+ }
+ }
resetAll (settingspanel) {
BDFDB.openConfirmModal(this, "Are you sure you want to delete all key bindings?", () => {
@@ -246,7 +274,7 @@ class MessageUtilities {
BDFDB.saveData(action, binding, this, "bindings");
}
- onClick (e, click, keys, name) {
+ onClick (e, click, name) {
if (!this.isEventFired(name)) {
this.fireEvent(name);
let settings = BDFDB.getAllData(this, "settings");
@@ -255,26 +283,44 @@ class MessageUtilities {
for (let action in bindings) {
let binding = bindings[action];
let prioritybinding = bindings[priorityaction];
- if (this.checkIfBindingIsValid(binding, click, keys) && (!bindings[priorityaction] || binding.click > prioritybinding.click || binding.key2 != 0 && prioritybinding.key2 == 0)) priorityaction = action;
+ if (this.checkIfBindingIsValid(binding, click) && (!bindings[priorityaction] || binding.click > prioritybinding.click || binding.key2 != 0 && prioritybinding.key2 == 0)) priorityaction = action;
}
if (priorityaction) {
let {messagediv, pos, message} = this.getMessageData(e.currentTarget);
if (messagediv && pos > -1 && message) {
BDFDB.stopEvent(e);
- this.defaults.bindings[priorityaction].func.bind(this)({messagediv, pos, message}, priorityaction);
+ clearTimeout(this.clickTimeout);
+ if (!this.hasDoubleClickOverwrite(bindings, bindings[priorityaction])) {
+ this.defaults.bindings[priorityaction].func.bind(this)({messagediv, pos, message}, priorityaction);
+ }
+ else this.clickTimeout = setTimeout(() => {
+ this.defaults.bindings[priorityaction].func.bind(this)({messagediv, pos, message}, priorityaction);
+ }, 500);
}
}
this.cancelEvent(name);
}
}
- checkIfBindingIsValid (binding, doneclick, keys) {
+ checkIfBindingIsValid (binding, doneclick) {
let valid = true;
- for (let click of this.clicks) if (binding[click] != doneclick) valid = false;
- for (let key of this.keys) if (!keys.includes(binding[key]) && binding[key] != 0) valid = false;
+ if (binding.click != doneclick) valid = false;
+ for (let key of this.keys) if (!BDFDB.pressedKeys.includes(binding[key]) && binding[key] != 0) valid = false;
return valid;
}
+ hasDoubleClickOverwrite (bindings, binding) {
+ if (binding.click == 1) return false;
+ let dblbindings = BDFDB.filterObject(bindings, bndg => {return bndg.click == 1});
+ for (let dblaction in dblbindings) {
+ let dblbndg = dblbindings[dblaction];
+ let overwrite = true;
+ for (let key of this.keys) if (binding[key] != dblbndg[key]) overwrite = false;
+ if (overwrite) return true;
+ }
+ return false;
+ }
+
doDelete ({messagediv, pos, message}, action) {
let deletelink = messagediv.parentElement.querySelector(BDFDB.dotCNS.messagelocalbotmessage + BDFDB.dotCN.anchor);
if (deletelink) deletelink.click();
@@ -356,7 +402,6 @@ class MessageUtilities {
doCitate ({messagediv, pos, message}, action) {
if (BDFDB.isPluginEnabled(this.defaults.bindings.__Citate_Message.plugin)) {
- console.log(messagediv.parentElement);
let citarButton = messagediv.parentElement.querySelector(".citar-btn");
if (citarButton) citarButton.click();
}
@@ -380,11 +425,12 @@ class MessageUtilities {
}
getActiveShortcutString (action) {
- let str = "";
- if (BDFDB.getData(action, this, "settings")) {
+ if (!action) return null;
+ let str = "", settings = BDFDB.getAllData(this, "settings");
+ if (settings.addHints && settings[action]) {
let binding = BDFDB.getData(action, this, "bindings");
if (binding) for (let type in binding) {
- let typename = type.indexOf("click") == 0 ? this.clickMap[binding[type]] : this.keyboardMap[binding[type]];
+ let typename = type == "click" ? this.clickMap[binding[type]] : this.keyboardMap[binding[type]];
if (typename && typename != "NONE") str += typename + "+";
}
}
@@ -408,6 +454,6 @@ class MessageUtilities {
}
cancelEvent (name) {
- setTimeout(() => {BDFDB.removeFromArray(this.firedEvents, name)}, 1000);
+ setImmediate(() => {BDFDB.removeFromArray(this.firedEvents, name)});
}
}