e2m/dispatch
4
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Added multiserver messaging support to the client

Browse Source
This commit is contained in:
khlieng 2015-01-22 01:26:23 +01:00
parent 9012e4dee5
commit 0c2250b268
2 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
client/src/js/components/MessageBox.jsx
View File

@ -31,17 +31,22 @@ var MessageBox = React.createClass({
}, },
render: function() { render: function() {
var tab = this.state.selectedTab.channel || this.state.selectedTab.server; var tab = this.state.selectedTab;
var messages = _.map(this.state.messages[tab], function(message) { var dest = tab.channel || tab.server;
var messageClass = 'message'; var messages;
switch (message.type) {
case 'info':
messageClass += ' message-info';
break;
}
return <p className={messageClass}>{message.from ? message.from + ': ' : null}{message.message}</p>;
});
if (this.state.messages[tab.server] && dest) {
messages = _.map(this.state.messages[tab.server][dest], function(message) {
var messageClass = 'message';
switch (message.type) {
case 'info':
messageClass += ' message-info';
break;
}
return <p className={messageClass}>{message.from ? message.from + ': ' : null}{message.message}</p>;
});
}
return ( return (
<div className="messagebox">{messages}</div> <div className="messagebox">{messages}</div>
); );

9
client/src/js/stores/message.js
View File

@ -6,10 +6,13 @@ var actions = require('../actions/message');
var messages = {}; var messages = {};
function addMessage(message, dest) { function addMessage(message, dest) {
if (!(dest in messages)) { if (!(message.server in messages)) {
messages[dest] = [message]; messages[message.server] = {};
messages[message.server][dest] = [message];
} else if (!(dest in messages[message.server])) {
messages[message.server][dest] = [message];
} else { } else {
messages[dest].push(message); messages[message.server][dest].push(message);
} }
} }