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

Handle characters getting added to the channelname when joining, throw more ES6 at everything

Browse Source
This commit is contained in:
khlieng 2015-02-21 11:36:10 +01:00
parent fca2985d9b
commit ed9a1c3216
8 changed files with 25 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
client/src/js/actions/channel.js
View File

@ -18,34 +18,20 @@ var channelActions = Reflux.createActions([
'load' 'load'
]); ]);
channelActions.join.preEmit = function(channels, server) { channelActions.join.preEmit = (channels, server) => {
socket.send('join', { socket.send('join', { server, channels });
server: server,
channels: channels
});
}; };
channelActions.part.preEmit = function(channels, server) { channelActions.part.preEmit = (channels, server) => {
socket.send('part', { socket.send('part', { server, channels });
server: server,
channels: channels
});
}; };
channelActions.invite.preEmit = function(user, channel, server) { channelActions.invite.preEmit = (user, channel, server) => {
socket.send('invite', { socket.send('invite', { server, channel, user });
server: server,
channel: channel,
user: user
});
}; };
channelActions.kick.preEmit = function(user, channel, server) { channelActions.kick.preEmit = (user, channel, server) => {
socket.send('kick', { socket.send('kick', { server, channel, user });
server: server,
channel: channel,
user: user
});
}; };
module.exports = channelActions; module.exports = channelActions;

8
client/src/js/actions/message.js
View File

@ -12,12 +12,8 @@ var messageActions = Reflux.createActions([
'setWrapWidth' 'setWrapWidth'
]); ]);
messageActions.send.preEmit = function(message, to, server) { messageActions.send.preEmit = (message, to, server) => {
socket.send('chat', { socket.send('chat', { server, to, message });
server: server,
to: to,
message: message
});
}; };
module.exports = messageActions; module.exports = messageActions;

21
client/src/js/actions/server.js
View File

@ -10,10 +10,10 @@ var serverActions = Reflux.createActions([
'load' 'load'
]); ]);
serverActions.connect.preEmit = function(server, nick, opts) { serverActions.connect.preEmit = (server, nick, opts) => {
socket.send('connect', { socket.send('connect', {
server: server, server,
nick: nick, nick,
username: opts.username || nick, username: opts.username || nick,
password: opts.password, password: opts.password,
realname: opts.realname || nick, realname: opts.realname || nick,
@ -22,20 +22,17 @@ serverActions.connect.preEmit = function(server, nick, opts) {
}); });
}; };
serverActions.disconnect.preEmit = function(server) { serverActions.disconnect.preEmit = (server) => {
socket.send('quit', { server: server }); socket.send('quit', { server });
}; };
serverActions.whois.preEmit = function(user, server) { serverActions.whois.preEmit = (user, server) => {
socket.send('whois', { socket.send('whois', { server, user });
server: server,
user: user
});
}; };
serverActions.setNick.preEmit = function(nick, server) { serverActions.setNick.preEmit = (nick, server) => {
socket.send('nick', { socket.send('nick', {
server: server, server,
new: nick new: nick
}); });
}; };

4
client/src/js/actions/tab.js
View File

@ -6,8 +6,6 @@ var tabActions = Reflux.createActions([
'select' 'select'
]); ]);
tabActions.select.preEmit = function() { tabActions.select.preEmit = () => routeActions.navigate('app');
routeActions.navigate('app');
};
module.exports = tabActions; module.exports = tabActions;

9
client/src/js/app.js
View File

@ -19,13 +19,8 @@ if (!uuid) {
localStorage.uuid = uuid = util.UUID(); localStorage.uuid = uuid = util.UUID();
} }
socket.on('connect', function() { socket.on('connect', () => socket.send('uuid', uuid));
socket.send('uuid', uuid); socket.on('error', (error) => console.log(error.server + ': ' + error.message));
});
socket.on('error', function(error) {
console.log(error.server + ': ' + error.message);
});
var routes = ( var routes = (
<Route name="app" path="/" handler={App}> <Route name="app" path="/" handler={App}>

2
client/src/js/components/UserList.jsx
View File

@ -41,7 +41,7 @@ var UserList = React.createClass({
if (!tab.channel || tab.channel[0] !== '#') { if (!tab.channel || tab.channel[0] !== '#') {
style.display = 'none'; style.display = 'none';
} else { } else {
users = _.map(channelStore.getUsers(tab.server, tab.channel), function(user) { users = _.map(channelStore.getUsers(tab.server, tab.channel), (user) => {
return <UserListItem key={user.nick} user={user} />; return <UserListItem key={user.nick} user={user} />;
}); });
} }

2
client/src/js/socket.js
View File

@ -14,7 +14,7 @@ class Socket extends EventEmitter {
} }
send(type, data) { send(type, data) {
this.ws.send(JSON.stringify({ type: type, request: data })); this.ws.send(JSON.stringify({ type, request: data }));
} }
} }

2
client/src/js/stores/selectedTab.js
View File

@ -57,7 +57,7 @@ var selectedTabStore = Reflux.createStore({
if (selectedTab.channel && if (selectedTab.channel &&
server === selectedTab.server && server === selectedTab.server &&
user === serverStore.getNick(server) && user === serverStore.getNick(server) &&
channel.toLowerCase() === selectedTab.channel.toLowerCase()) { channel.toLowerCase().indexOf(selectedTab.channel.toLowerCase()) !== -1) {
selectedTab.channel = channel; selectedTab.channel = channel;
selectedTab.name = channel; selectedTab.name = channel;
this.trigger(selectedTab); this.trigger(selectedTab);