Added more options to the connect form, added support for more IRC commands on the server, added Font Awesome
This commit is contained in:
parent
e942924c15
commit
c15feaa310
10 changed files with 128 additions and 39 deletions
|
@ -9,13 +9,15 @@ var serverActions = Reflux.createActions([
|
|||
'load'
|
||||
]);
|
||||
|
||||
serverActions.connect.preEmit = function(server, nick, username, tls, name) {
|
||||
serverActions.connect.preEmit = function(server, nick, opts) {
|
||||
socket.send('connect', {
|
||||
server: server,
|
||||
nick: nick,
|
||||
username: username,
|
||||
tls: tls || false,
|
||||
name: name || server
|
||||
username: opts.username || nick,
|
||||
password: opts.password,
|
||||
realname: opts.realname || nick,
|
||||
tls: opts.tls || false,
|
||||
name: opts.name || server
|
||||
});
|
||||
};
|
||||
|
||||
|
|
|
@ -5,18 +5,31 @@ var serverActions = require('../actions/server');
|
|||
var channelActions = require('../actions/channel');
|
||||
|
||||
var Connect = React.createClass({
|
||||
getInitialState: function() {
|
||||
return {
|
||||
showOptionals: false
|
||||
};
|
||||
},
|
||||
|
||||
handleSubmit: function(e) {
|
||||
e.preventDefault();
|
||||
|
||||
var name = e.target.name.value.trim();
|
||||
var address = e.target.address.value.trim();
|
||||
var ssl = e.target.ssl.checked;
|
||||
var nick = e.target.nick.value.trim();
|
||||
var username = e.target.username.value.trim();
|
||||
var channels = _.filter(_.map(e.target.channels.value.split(','), _.trim));
|
||||
var opts = {
|
||||
name: e.target.name.value.trim(),
|
||||
ssl: e.target.ssl.checked
|
||||
};
|
||||
|
||||
if (address.indexOf('.') > 0 && nick && username) {
|
||||
serverActions.connect(address, nick, username, ssl, name);
|
||||
if (this.state.showOptionals) {
|
||||
opts.realname = e.target.realname.value.trim();
|
||||
opts.username = e.target.username.value.trim();
|
||||
opts.password = e.target.password.value.trim();
|
||||
}
|
||||
|
||||
if (address.indexOf('.') > 0 && nick) {
|
||||
serverActions.connect(address, nick, opts);
|
||||
|
||||
if (channels.length > 0) {
|
||||
channelActions.join(channels, address);
|
||||
|
@ -24,17 +37,36 @@ var Connect = React.createClass({
|
|||
}
|
||||
},
|
||||
|
||||
handleShowClick: function() {
|
||||
this.setState({ showOptionals: !this.state.showOptionals});
|
||||
},
|
||||
|
||||
render: function() {
|
||||
var optionals = null;
|
||||
|
||||
if (this.state.showOptionals) {
|
||||
optionals = (
|
||||
<div>
|
||||
<input name="username" type="text" placeholder="Username" />
|
||||
<input name="password" type="text" placeholder="Password" />
|
||||
<input name="realname" type="text" placeholder="Realname" />
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
return (
|
||||
<div className="connect">
|
||||
<form ref="form" className="connect-form" onSubmit={this.handleSubmit}>
|
||||
<h1>Connect</h1>
|
||||
<input name="name" type="text" placeholder="Name" defaultValue="Freenode" />
|
||||
<input name="address" type="text" placeholder="Address" defaultValue="irc.freenode.net" />
|
||||
<label><input name="ssl" type="checkbox" />SSL</label>
|
||||
<input name="nick" type="text" placeholder="Nick" onChange={this.handleNickChange} />
|
||||
<input name="username" type="text" placeholder="Username" />
|
||||
<input name="nick" type="text" placeholder="Nick" />
|
||||
<input name="channels" type="text" placeholder="Channels" />
|
||||
{optionals}
|
||||
<p>
|
||||
<label><input name="ssl" type="checkbox" />SSL</label>
|
||||
<i className="fa fa-ellipsis-h" onClick={this.handleShowClick}></i>
|
||||
</p>
|
||||
<input type="submit" value="Connect" />
|
||||
</form>
|
||||
</div>
|
||||
|
|
|
@ -34,6 +34,7 @@ var MessageBox = React.createClass({
|
|||
render: function() {
|
||||
var tab = this.state.selectedTab;
|
||||
var dest = tab.channel || tab.server;
|
||||
var style = {}
|
||||
|
||||
var messages = _.map(messageStore.getMessages(tab.server, dest), function(message) {
|
||||
var messageClass = 'message';
|
||||
|
@ -50,9 +51,13 @@ var MessageBox = React.createClass({
|
|||
</p>
|
||||
);
|
||||
});
|
||||
|
||||
|
||||
if (!tab.channel || tab.channel[0] !== '#') {
|
||||
style.right = 0;
|
||||
}
|
||||
|
||||
return (
|
||||
<div className="messagebox">{messages}</div>
|
||||
<div className="messagebox" style={style}>{messages}</div>
|
||||
);
|
||||
}
|
||||
});
|
||||
|
|
|
@ -71,7 +71,7 @@ var TabList = React.createClass({
|
|||
<button className="button-connect" onClick={this.handleConnectClick}>Connect</button>
|
||||
{tabs}
|
||||
<div className="side-buttons">
|
||||
<button onClick={this.handleSettingsClick}>Settings</button>
|
||||
<i className="fa fa-cog" onClick={this.handleSettingsClick}></i>
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue