summaryrefslogtreecommitdiffstats
path: root/webapp/actions
diff options
context:
space:
mode:
Diffstat (limited to 'webapp/actions')
-rw-r--r--webapp/actions/global_actions.jsx7
-rw-r--r--webapp/actions/team_actions.jsx18
-rw-r--r--webapp/actions/user_actions.jsx18
-rw-r--r--webapp/actions/websocket_actions.jsx2
4 files changed, 44 insertions, 1 deletions
diff --git a/webapp/actions/global_actions.jsx b/webapp/actions/global_actions.jsx
index a70462295..9337595af 100644
--- a/webapp/actions/global_actions.jsx
+++ b/webapp/actions/global_actions.jsx
@@ -535,3 +535,10 @@ export function toggleSideBarAction(visible) {
});
}
}
+
+export function emitBrowserFocus(focus) {
+ AppDispatcher.handleViewAction({
+ type: ActionTypes.BROWSER_CHANGE_FOCUS,
+ focus
+ });
+}
diff --git a/webapp/actions/team_actions.jsx b/webapp/actions/team_actions.jsx
index e0403529e..6a5cccb81 100644
--- a/webapp/actions/team_actions.jsx
+++ b/webapp/actions/team_actions.jsx
@@ -36,6 +36,24 @@ export function createTeam(team, onSuccess, onError) {
);
}
+export function updateTeam(team, onSuccess, onError) {
+ Client.updateTeam(team,
+ (rteam) => {
+ AppDispatcher.handleServerAction({
+ type: ActionTypes.UPDATE_TEAM,
+ team: rteam
+ });
+
+ browserHistory.push('/' + rteam.name + '/channels/town-square');
+
+ if (onSuccess) {
+ onSuccess(rteam);
+ }
+ },
+ onError
+ );
+}
+
export function removeUserFromTeam(teamId, userId, success, error) {
Client.removeUserFromTeam(
teamId,
diff --git a/webapp/actions/user_actions.jsx b/webapp/actions/user_actions.jsx
index 9b5bc985c..fefca79f7 100644
--- a/webapp/actions/user_actions.jsx
+++ b/webapp/actions/user_actions.jsx
@@ -318,6 +318,24 @@ export function autocompleteUsersInTeam(username, success, error) {
);
}
+export function updateUser(username, success, error) {
+ Client.updateUser(
+ username,
+ (data) => {
+ if (success) {
+ success(data);
+ }
+ },
+ (err) => {
+ AsyncClient.dispatchError(err, 'updateUser');
+
+ if (error) {
+ error(err);
+ }
+ }
+ );
+}
+
export function generateMfaSecret(success, error) {
Client.generateMfaSecret(
(data) => {
diff --git a/webapp/actions/websocket_actions.jsx b/webapp/actions/websocket_actions.jsx
index 60ed44fc9..bf56a148a 100644
--- a/webapp/actions/websocket_actions.jsx
+++ b/webapp/actions/websocket_actions.jsx
@@ -184,7 +184,7 @@ function handleNewPostEvent(msg) {
function handlePostEditEvent(msg) {
// Store post
const post = JSON.parse(msg.data.post);
- PostStore.storePost(post);
+ PostStore.storePost(post, false);
PostStore.emitChange();
// Update channel state