From a3cbe598fb6732be92bdd7e54cedc7737a513c34 Mon Sep 17 00:00:00 2001 From: hmhealey Date: Mon, 27 Jul 2015 10:44:53 -0400 Subject: Replaced instance of String.prototype.startsWith which only works in browsers that support ES6 --- web/react/components/create_post.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'web') diff --git a/web/react/components/create_post.jsx b/web/react/components/create_post.jsx index 87895588e..327520210 100644 --- a/web/react/components/create_post.jsx +++ b/web/react/components/create_post.jsx @@ -32,7 +32,7 @@ module.exports = React.createClass({ post.message = this.state.messageText; // if this is a reply, trim off any carets from the beginning of a message - if (this.state.rootId && post.message.startsWith("^")) { + if (this.state.rootId && post.message[0] === "^") { post.message = post.message.replace(/^\^+\s*/g, ""); } -- cgit v1.2.3-1-g7c22 From c9459feb59a3dc05de229aea7652b0a726ac98bf Mon Sep 17 00:00:00 2001 From: nickago Date: Mon, 13 Jul 2015 13:18:50 -0700 Subject: When removed from a channel, user is sent back to town square and that channel is removed from their sidebar --- web/react/components/sidebar.jsx | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'web') diff --git a/web/react/components/sidebar.jsx b/web/react/components/sidebar.jsx index 3cf67e410..ed75e51cf 100644 --- a/web/react/components/sidebar.jsx +++ b/web/react/components/sidebar.jsx @@ -197,6 +197,14 @@ module.exports = React.createClass({ if (UserStore.getCurrentId() === msg.user_id) { AsyncClient.getChannels(true); } + } else if(msg.action === "user_removed") { + if(msg.user_id === UserStore.getCurrentId()) { + AsyncClient.getChannels(true); + + if(msg.props.channel_id === ChannelStore.getCurrentId()) { + window.location.reload(); + } + } } }, updateTitle: function() { -- cgit v1.2.3-1-g7c22 From ed70db18611331de99b2a86b580947e56d0cb7e5 Mon Sep 17 00:00:00 2001 From: nickago Date: Wed, 22 Jul 2015 15:12:50 -0700 Subject: When user is removed, a modal appears, which on closing redirects the user to town square. --- .../components/removed_from_channel_modal.jsx | 45 ++++++++++++++++++++++ web/react/components/sidebar.jsx | 9 ++++- web/react/pages/channel.jsx | 6 +++ web/templates/channel.html | 1 + 4 files changed, 59 insertions(+), 2 deletions(-) create mode 100644 web/react/components/removed_from_channel_modal.jsx (limited to 'web') diff --git a/web/react/components/removed_from_channel_modal.jsx b/web/react/components/removed_from_channel_modal.jsx new file mode 100644 index 000000000..3a5a58d5e --- /dev/null +++ b/web/react/components/removed_from_channel_modal.jsx @@ -0,0 +1,45 @@ +// Copyright (c) 2015 Spinpunch, Inc. All Rights Reserved. +// See License.txt for license information. + +var ChannelStore = require('../stores/channel_store.jsx'); +var UserStore = require('../stores/user_store.jsx'); +var utils = require('../utils/utils.jsx'); + +module.exports = React.createClass({ + handleClose: function() { + var townSquare = ChannelStore.getByName("town-square"); + utils.switchChannel(townSquare); + }, + componentDidMount: function() { + $(this.getDOMNode()).on('hidden.bs.modal',this.handleClose); + }, + componentWillUnmount: function() { + $(this.getDOMNode()).off('hidden.bs.modal',this.handleClose); + }, + render: function() { + currentUser = UserStore.getCurrentUser(); + + if (currentUser != null) { + return ( + + ); + } else { + return
; + } + } +}); \ No newline at end of file diff --git a/web/react/components/sidebar.jsx b/web/react/components/sidebar.jsx index ed75e51cf..a29c6a903 100644 --- a/web/react/components/sidebar.jsx +++ b/web/react/components/sidebar.jsx @@ -201,8 +201,13 @@ module.exports = React.createClass({ if(msg.user_id === UserStore.getCurrentId()) { AsyncClient.getChannels(true); - if(msg.props.channel_id === ChannelStore.getCurrentId()) { - window.location.reload(); + if(msg.props.channel_id === ChannelStore.getCurrentId() && $('#removed_from_channel').length > 0) { + var channelName = ChannelStore.getCurrent().display_name; + var curUser = UserStore.getProfile(msg.props.remover).username; + $('#removed_from_channel').find('.modal-title').text("Removed from " + channelName); + $('#removed_from_channel').find('.modal-body').children().text(curUser + " removed you from " + channelName); + + $('#removed_from_channel').modal('show'); } } } diff --git a/web/react/pages/channel.jsx b/web/react/pages/channel.jsx index cc78df120..90d90b29f 100644 --- a/web/react/pages/channel.jsx +++ b/web/react/pages/channel.jsx @@ -34,6 +34,7 @@ var MentionList = require('../components/mention_list.jsx'); var ChannelInfoModal = require('../components/channel_info_modal.jsx'); var AccessHistoryModal = require('../components/access_history_modal.jsx'); var ActivityLogModal = require('../components/activity_log_modal.jsx'); +var RemovedFromChannelModal = require('../components/removed_from_channel_modal.jsx') var Constants = require('../utils/constants.jsx'); @@ -217,4 +218,9 @@ global.window.setup_channel_page = function(team_name, team_type, team_id, chann document.getElementById('activity_log_modal') ); + React.render( + , + document.getElementById('removed_from_channel_modal') + ); + }; diff --git a/web/templates/channel.html b/web/templates/channel.html index 8e856032d..6325069ee 100644 --- a/web/templates/channel.html +++ b/web/templates/channel.html @@ -47,6 +47,7 @@
+
-- cgit v1.2.3-1-g7c22 From 2d8b81170ba80a68865dc6305186a66099d418a2 Mon Sep 17 00:00:00 2001 From: nickago Date: Fri, 24 Jul 2015 09:03:43 -0700 Subject: Added precautions to avoid incorrect data display to the user by clearing modal after every close --- web/react/components/removed_from_channel_modal.jsx | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'web') diff --git a/web/react/components/removed_from_channel_modal.jsx b/web/react/components/removed_from_channel_modal.jsx index 3a5a58d5e..b815e5d1d 100644 --- a/web/react/components/removed_from_channel_modal.jsx +++ b/web/react/components/removed_from_channel_modal.jsx @@ -9,6 +9,9 @@ module.exports = React.createClass({ handleClose: function() { var townSquare = ChannelStore.getByName("town-square"); utils.switchChannel(townSquare); + + $(this.refs.title.getDOMNode()).text("") + $(this.refs.body.getDOMNode()).text(""); }, componentDidMount: function() { $(this.getDOMNode()).on('hidden.bs.modal',this.handleClose); @@ -26,10 +29,10 @@ module.exports = React.createClass({
-

+

-

+

-- cgit v1.2.3-1-g7c22 From da6d3556e83b54472f1caa7777ce223988c0655c Mon Sep 17 00:00:00 2001 From: nickago Date: Mon, 27 Jul 2015 13:44:54 -0700 Subject: Changed from Jquery style modal modification to using browserStore --- .../components/removed_from_channel_modal.jsx | 26 +++++++++++++++++----- web/react/components/sidebar.jsx | 9 ++++---- 2 files changed, 26 insertions(+), 9 deletions(-) (limited to 'web') diff --git a/web/react/components/removed_from_channel_modal.jsx b/web/react/components/removed_from_channel_modal.jsx index b815e5d1d..a8889a92a 100644 --- a/web/react/components/removed_from_channel_modal.jsx +++ b/web/react/components/removed_from_channel_modal.jsx @@ -3,24 +3,40 @@ var ChannelStore = require('../stores/channel_store.jsx'); var UserStore = require('../stores/user_store.jsx'); +var BrowserStore = require('../stores/browser_store.jsx') var utils = require('../utils/utils.jsx'); module.exports = React.createClass({ + handleShow: function() { + var newState = {}; + if(BrowserStore.getItem("channel-removed-state")) { + newState = BrowserStore.getItem("channel-removed-state"); + BrowserStore.removeItem("channel-removed-state"); + } + + this.setState(newState); + }, handleClose: function() { var townSquare = ChannelStore.getByName("town-square"); utils.switchChannel(townSquare); - $(this.refs.title.getDOMNode()).text("") - $(this.refs.body.getDOMNode()).text(""); + this.setState({channelName: "", remover: ""}) }, componentDidMount: function() { + $(this.getDOMNode()).on('show.bs.modal',this.handleShow); $(this.getDOMNode()).on('hidden.bs.modal',this.handleClose); }, componentWillUnmount: function() { + $(this.getDOMNode()).off('show.bs.modal',this.handleShow); $(this.getDOMNode()).off('hidden.bs.modal',this.handleClose); }, + getInitialState: function() { + return {channelName: "", remover: ""} + }, render: function() { - currentUser = UserStore.getCurrentUser(); + var currentUser = UserStore.getCurrentUser(); + var channelName = this.state.channelName ? this.state.channelName : "the channel" + var remover = this.state.remover ? this.state.remover : "Someone" if (currentUser != null) { return ( @@ -29,10 +45,10 @@ module.exports = React.createClass({
-

+

Removed from {channelName}

-

+

{remover} removed you from {channelName}

diff --git a/web/react/components/sidebar.jsx b/web/react/components/sidebar.jsx index a29c6a903..5b8d6c542 100644 --- a/web/react/components/sidebar.jsx +++ b/web/react/components/sidebar.jsx @@ -7,6 +7,7 @@ var AsyncClient = require('../utils/async_client.jsx'); var SocketStore = require('../stores/socket_store.jsx'); var UserStore = require('../stores/user_store.jsx'); var TeamStore = require('../stores/team_store.jsx'); +var BrowserStore = require('../stores/browser_store.jsx') var utils = require('../utils/utils.jsx'); var SidebarHeader = require('./sidebar_header.jsx'); var SearchBox = require('./search_bar.jsx'); @@ -202,11 +203,11 @@ module.exports = React.createClass({ AsyncClient.getChannels(true); if(msg.props.channel_id === ChannelStore.getCurrentId() && $('#removed_from_channel').length > 0) { - var channelName = ChannelStore.getCurrent().display_name; - var curUser = UserStore.getProfile(msg.props.remover).username; - $('#removed_from_channel').find('.modal-title').text("Removed from " + channelName); - $('#removed_from_channel').find('.modal-body').children().text(curUser + " removed you from " + channelName); + var sentState = {}; + sentState.channelName = ChannelStore.getCurrent().display_name; + sentState.remover = UserStore.getProfile(msg.props.remover).username; + BrowserStore.setItem('channel-removed-state',sentState); $('#removed_from_channel').modal('show'); } } -- cgit v1.2.3-1-g7c22