don't refresh page on channel creation and ignore case when sorting channels in sidebar
Этот коммит содержится в:
@@ -55,16 +55,17 @@ module.exports = React.createClass({
|
|||||||
channel.description = this.refs.channel_desc.getDOMNode().value.trim();
|
channel.description = this.refs.channel_desc.getDOMNode().value.trim();
|
||||||
channel.type = this.state.channelType;
|
channel.type = this.state.channelType;
|
||||||
|
|
||||||
var self = this;
|
|
||||||
client.createChannel(channel,
|
client.createChannel(channel,
|
||||||
function(data) {
|
function(data) {
|
||||||
|
$(this.refs.modal.getDOMNode()).modal('hide');
|
||||||
|
|
||||||
|
asyncClient.getChannel(data.id);
|
||||||
|
utils.updateTabTitle(channel.display_name);
|
||||||
|
utils.updateAddressBar(channel.name);
|
||||||
|
|
||||||
this.refs.display_name.getDOMNode().value = '';
|
this.refs.display_name.getDOMNode().value = '';
|
||||||
this.refs.channel_name.getDOMNode().value = '';
|
this.refs.channel_name.getDOMNode().value = '';
|
||||||
this.refs.channel_desc.getDOMNode().value = '';
|
this.refs.channel_desc.getDOMNode().value = '';
|
||||||
|
|
||||||
$(self.refs.modal.getDOMNode()).modal('hide');
|
|
||||||
window.location = TeamStore.getCurrentTeamUrl() + '/channels/' + channel.name;
|
|
||||||
asyncClient.getChannel(data.id);
|
|
||||||
}.bind(this),
|
}.bind(this),
|
||||||
function(err) {
|
function(err) {
|
||||||
state.serverError = err.message;
|
state.serverError = err.message;
|
||||||
|
|||||||
@@ -116,10 +116,10 @@ function getStateFromStores() {
|
|||||||
var channels = ChannelStore.getAll();
|
var channels = ChannelStore.getAll();
|
||||||
if (channels) {
|
if (channels) {
|
||||||
channels.sort(function chanSort(a, b) {
|
channels.sort(function chanSort(a, b) {
|
||||||
if (a.display_name < b.display_name) {
|
if (a.display_name.toLowerCase() < b.display_name.toLowerCase()) {
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
if (a.display_name > b.display_name) {
|
if (a.display_name.toLowerCase() > b.display_name.toLowerCase()) {
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
return 0;
|
return 0;
|
||||||
|
|||||||
Ссылка в новой задаче
Block a user