ensl/ensl_gathers
0
0
Fork 0
mirror of https://github.com/ENSL/ensl_gathers.git synced 2024-11-10 15:21:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix teamspeak links

Browse source
This commit is contained in:
Chris Blanchard 2015-08-27 15:00:10 +01:00
parent f4d77893c9
commit aeb0910829
3 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
config/socketio.js
View file

@ -57,7 +57,6 @@ module.exports = io => {
return next(new Error("Authentication Failed"))
};
socket._user = new User(body);
console.log(socket._user)
if (socket._user.bans.gather) {
return next(new Error("Gather Banned"));
}

6
lib/react/gather.jsx
View file

@ -280,10 +280,10 @@ var TeamSpeakButton = React.createClass({
};
},
marineUrl() {
this.teamSpeakUrl(this.props.marine);
return this.teamSpeakUrl(this.props.marine);
},
alienUrl() {
this.teamSpeakUrl(this.props.alien);
return this.teamSpeakUrl(this.props.alien);
},
teamSpeakUrl(conn) {
let params = `channel=${encodeURIComponent(conn.channel)}&channelpassword=${encodeURIComponent(conn.password)}`;
@ -300,7 +300,7 @@ var TeamSpeakButton = React.createClass({
<li><a href={this.marineUrl()}>Join Marine Teamspeak</a></li>
<li><a href={this.alienUrl()}>Join Alien Teamspeak</a></li>
<li role="separator" className="divider"></li>
<li><a href="#" data-toggle="modal" data-target="#teamspeakmodal">Get Teamspeak Info</a></li>
<li><a href="#" data-toggle="modal" data-target="#teamspeakmodal">Teamspeak Details</a></li>
</ul>
<div className="modal fade text-left" id="teamspeakmodal">
<div className="modal-dialog">

6
public/js/app.js
View file

@ -347,10 +347,10 @@ var TeamSpeakButton = React.createClass({
};
},
marineUrl: function marineUrl() {
this.teamSpeakUrl(this.props.marine);
return this.teamSpeakUrl(this.props.marine);
},
alienUrl: function alienUrl() {
this.teamSpeakUrl(this.props.alien);
return this.teamSpeakUrl(this.props.alien);
},
teamSpeakUrl: function teamSpeakUrl(conn) {
var params = "channel=" + encodeURIComponent(conn.channel) + "&channelpassword=" + encodeURIComponent(conn.password);
@ -403,7 +403,7 @@ var TeamSpeakButton = React.createClass({
React.createElement(
"a",
{ href: "#", "data-toggle": "modal", "data-target": "#teamspeakmodal" },
"Get Teamspeak Info"
"Teamspeak Details"
)
)
),