mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-10-25 20:26:51 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2005 from matrix-org/t3chguy/fix_commands

Browse source 
slash got consumed in the consolidation
This commit is contained in:
David Baker 2018-06-22 17:59:27 +01:00 committed by GitHub
commit 60a9752e6e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/SlashCommands.js
View file

@ -27,14 +27,14 @@ import SettingsStore, {SettingLevel} from './settings/SettingsStore';
class Command { class Command {
constructor({name, args='', description, runFn}) { constructor({name, args='', description, runFn}) {
this.command = name; this.command = '/' + name;
this.args = args; this.args = args;
this.description = description; this.description = description;
this.runFn = runFn; this.runFn = runFn;
} }
getCommand() { getCommand() {
return "/" + this.command; return this.command;
} }
getCommandWithArgs() { getCommandWithArgs() {

13
src/autocomplete/CommandProvider.js
View file

@ -41,17 +41,14 @@ export default class CommandProvider extends AutocompleteProvider {
const {command, range} = this.getCurrentCommand(query, selection); const {command, range} = this.getCurrentCommand(query, selection);
if (!command) return []; if (!command) return [];
let matches; let matches = [];
if (command[0] !== command[1]) { if (command[0] !== command[1]) {
// The input looks like a command with arguments, perform exact match // The input looks like a command with arguments, perform exact match
const match = COMMANDS.find((o) => o.command === command[1]); const name = command[1].substr(1); // strip leading `/`
if (match) { if (CommandMap[name]) {
matches = [match]; matches = [CommandMap[name]];
} }
} } else {
// If we don't yet have matches
if (!matches) {
if (query === '/') { if (query === '/') {
// If they have just entered `/` show everything // If they have just entered `/` show everything
matches = COMMANDS; matches = COMMANDS;