wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-10-21 14:47:31 +09:00
Code Issues Projects Releases Packages Wiki Activity

moebius#221: WebExtensions - commands API does not support shortcuts with space or numbers

Browse source 
https://github.com/MoonchildProductions/moebius/pull/221
This commit is contained in:
janekptacijarabaci 2018-04-23 08:51:40 +02:00 • committed by Roy Tam
commit 08e2f9aaea
1 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
browser/components/webextensions/ext-commands.js
View file

@ -163,11 +163,12 @@ CommandList.prototype = {
// The modifiers are the remaining elements. // The modifiers are the remaining elements.
keyElement.setAttribute("modifiers", this.getModifiersAttribute(parts)); keyElement.setAttribute("modifiers", this.getModifiersAttribute(parts));
if (/^[A-Z0-9]$/.test(chromeKey)) { if (/^[A-Z]$/.test(chromeKey)) {
// We use the key attribute for all single digits and characters. // We use the key attribute for all single digits and characters.
keyElement.setAttribute("key", chromeKey); keyElement.setAttribute("key", chromeKey);
} else { } else {
keyElement.setAttribute("keycode", this.getKeycodeAttribute(chromeKey)); keyElement.setAttribute("keycode", this.getKeycodeAttribute(chromeKey));
keyElement.setAttribute("event", "keydown");
} }
return keyElement; return keyElement;
@ -187,6 +188,9 @@ CommandList.prototype = {
* @returns {string} The constructed value for the Key's 'keycode' attribute. * @returns {string} The constructed value for the Key's 'keycode' attribute.
*/ */
getKeycodeAttribute(chromeKey) { getKeycodeAttribute(chromeKey) {
if (/[0-9]/.test(chromeKey)) {
return `VK_${chromeKey}`;
}
return `VK${chromeKey.replace(/([A-Z])/g, "_$&").toUpperCase()}`; return `VK${chromeKey.replace(/([A-Z])/g, "_$&").toUpperCase()}`;
}, },