thor/MinecraftChat
1
0
Fork 0
mirror of https://github.com/Threnklyn/MinecraftChat.git synced 2026-06-01 18:58:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Syntax stuff

Browse Source
This commit is contained in:
AlexKvazos
2015-04-29 12:49:26 -05:00
parent e58da2e71a
commit 1708df5bb4
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/client/controllers/chatController.js
+1 -1
View File
@@ -19,6 +19,6 @@ module.exports = function($scope, socket) {
$scope.chat = ''; $scope.chat = '';
} }
} };
}; };
app/client/controllers/connectController.js
+2 -2
View File
@@ -6,7 +6,7 @@ module.exports = function($scope, socket) {
// connect handler // connect handler
$scope.connect = function() { $scope.connect = function() {
$('#connectModal').modal('hide') $('#connectModal').modal('hide');
if (socket.connected) { if (socket.connected) {
@@ -22,6 +22,6 @@ module.exports = function($scope, socket) {
} else { } else {
alert('Server unreachable, please try again later...'); alert('Server unreachable, please try again later...');
} }
} };
}; };
app/client/controllers/navController.js
+1 -1
View File
@@ -19,7 +19,7 @@ module.exports = function($scope, socket) {
$scope.$apply(function() { $scope.$apply(function() {
$scope.connected = false; $scope.connected = false;
}); });
}) });
socket.on('disconnect', function() { socket.on('disconnect', function() {
$scope.$apply(function() { $scope.$apply(function() {
app/client/services/buffer.js
+5 -5
View File
@@ -28,7 +28,7 @@ module.exports = function(socket) {
break; break;
} }
} }
$('#buffer').append('<span style="color:#D62D18;">[i] Error: ' + error + '</span><br>') $('#buffer').append('<span style="color:#D62D18;">[i] Error: ' + error + '</span><br>');
$('#buffer').scrollTop($('#buffer').prop('scrollHeight')); $('#buffer').scrollTop($('#buffer').prop('scrollHeight'));
}); });
@@ -38,17 +38,17 @@ module.exports = function(socket) {
}); });
socket.on('reconnect', function() { socket.on('reconnect', function() {
$('#buffer').append('<span style="color:#4AA937;">&gt; Connected to chat server established</span><br>') $('#buffer').append('<span style="color:#4AA937;">&gt; Connected to chat server established</span><br>');
$('#buffer').scrollTop($('#buffer').prop('scrollHeight')); $('#buffer').scrollTop($('#buffer').prop('scrollHeight'));
}); });
socket.on('disconnect', function() { socket.on('disconnect', function() {
$('#buffer').append('<span style="color:#D62D18;">&gt; Connection to chat server has been lost. Reconnecting...</span><br>') $('#buffer').append('<span style="color:#D62D18;">&gt; Connection to chat server has been lost. Reconnecting...</span><br>');
$('#buffer').scrollTop($('#buffer').prop('scrollHeight')); $('#buffer').scrollTop($('#buffer').prop('scrollHeight'));
}); });
socket.on('bot:disconnect', function() { socket.on('bot:disconnect', function() {
$('#buffer').append('<span style="color:#D62D18;">&gt; You have been disconnected from the Minecraft server.</span><br>') $('#buffer').append('<span style="color:#D62D18;">&gt; You have been disconnected from the Minecraft server.</span><br>');
$('#buffer').scrollTop($('#buffer').prop('scrollHeight')); $('#buffer').scrollTop($('#buffer').prop('scrollHeight'));
}); });
@@ -58,5 +58,5 @@ module.exports = function(socket) {
$('#buffer').append(string + '<br>\n'); $('#buffer').append(string + '<br>\n');
$('#buffer').scrollTop($('#buffer').prop('scrollHeight')); $('#buffer').scrollTop($('#buffer').prop('scrollHeight'));
} }
} };
}; };