From 82bd7f96523e02fb520d45f80a88301b7055072d Mon Sep 17 00:00:00 2001
From: Pacien TRAN-GIRARD
Date: Tue, 13 May 2014 19:52:13 +0200
Subject: Replace connection alert() by javascript/css notifications

---
 js/slide-controller.js | 37 ++++++++++++++++++++++++++++++-------
 1 file changed, 30 insertions(+), 7 deletions(-)

(limited to 'js/slide-controller.js')

diff --git a/js/slide-controller.js b/js/slide-controller.js
index 416c17c..5a32d19 100644
--- a/js/slide-controller.js
+++ b/js/slide-controller.js
@@ -87,26 +87,49 @@
 				var password = prompt("Broadcaster password");
 
 			case 'remote':
+
 				var addr = this.deck.config_.settings.remoteSocket;
 				var channel = this.deck.config_.settings.remoteChannel;
 				var password = (password != null) ? password : '';
 
-				require([addr + 'socket.io/socket.io.js'], function(io) {
+				require(['humane-themed', addr + 'socket.io/socket.io.js'], function(humane, io) {
+
 					self.remoteSocket = io.connect(addr, {
 						'query' : 'channel=' + channel + '&password=' + password,
 						'force new connection' : true,
 					});
 
+					self.remoteSocket.on('connecting', function() {
+						console.log('Connecting to ' + channel + '@' + addr);
+						humane.log('Connecting...', {
+							timeout : 0
+						});
+					});
+
 					self.remoteSocket.on('connect', function() {
-						var message = 'Connected to ' + channel + '@' + addr;
-						console.log(message);
-						alert(message);
+						console.log('Connected to ' + channel + '@' + addr);
+						humane.remove();
+						humane.log('Connected');
+					});
+
+					self.remoteSocket.on('connect_failed', function() {
+						console.log('Error connecting to ' + channel + '@' + addr);
+						humane.log('Connection failed', {
+							timeout : 0
+						});
+					});
+
+					self.remoteSocket.on('error', function() {
+						console.log('Error on ' + channel + '@' + addr);
+						humane.log('Error', {
+							timeout : 0
+						});
 					});
 
 					self.remoteSocket.on('disconnect', function() {
-						var message = 'Diconnected from' + channel + '@' + addr;
-						console.log(message);
-						alert(message);
+						console.log('Diconnected from' + channel + '@' + addr);
+						humane.remove();
+						humane.log('Disconnected');
 					});
 
 					self.remoteSocket.on('message', function(message) {
-- 
cgit v1.2.3