From 5e2596598f97e318f1e4e8bd835b08a011fa0b60 Mon Sep 17 00:00:00 2001
From: Nicolas Clerc <kernicPanel@nclerc.fr>
Date: Mon, 15 Feb 2016 09:11:35 +0100
Subject: add external slashcommands management

---
 webapp/utils/async_client.jsx | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'webapp/utils/async_client.jsx')

diff --git a/webapp/utils/async_client.jsx b/webapp/utils/async_client.jsx
index 9c40311cf..3e2a706d4 100644
--- a/webapp/utils/async_client.jsx
+++ b/webapp/utils/async_client.jsx
@@ -755,12 +755,15 @@ export function savePreferences(preferences, success, error) {
     );
 }
 
-export function getSuggestedCommands(command, suggestionId, component) {
-    client.listCommands(
+export function getSuggestedCommands(command, channelId, suggestionId, component) {
+    client.listCommands({
+            command: command,
+            channelId: channelId
+        },
         (data) => {
             var matches = [];
             data.forEach((cmd) => {
-                if (('/' + cmd.trigger).indexOf(command) === 0) {
+                if (('/' + cmd.trigger).indexOf(command) === 0 || cmd.external_management) {
                     let s = '/' + cmd.trigger;
                     let hint = '';
                     if (cmd.auto_complete_hint && cmd.auto_complete_hint.length !== 0) {
-- 
cgit v1.2.3-1-g7c22


From 55a054ab0a55a269965f6baf227a4b4029459d0f Mon Sep 17 00:00:00 2001
From: Nicolas Clerc <kernicPanel@nclerc.fr>
Date: Mon, 15 Feb 2016 09:15:31 +0100
Subject: fix eslint errors

---
 webapp/utils/async_client.jsx | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'webapp/utils/async_client.jsx')

diff --git a/webapp/utils/async_client.jsx b/webapp/utils/async_client.jsx
index 3e2a706d4..9a5869f9a 100644
--- a/webapp/utils/async_client.jsx
+++ b/webapp/utils/async_client.jsx
@@ -756,10 +756,7 @@ export function savePreferences(preferences, success, error) {
 }
 
 export function getSuggestedCommands(command, channelId, suggestionId, component) {
-    client.listCommands({
-            command: command,
-            channelId: channelId
-        },
+    client.listCommands({command: command, channelId: channelId},
         (data) => {
             var matches = [];
             data.forEach((cmd) => {
-- 
cgit v1.2.3-1-g7c22

