From: Luigi Pinca <luigipinca@gmail.com>
Date: Fri, 28 Dec 2012 21:01:32 +0000 (+0100)
Subject: reduced indentation levels of the "joinAnonymously" function
X-Git-Url: https://git.saalbach.dev/?a=commitdiff_plain;h=3d24381ef9d39c31e1030dae92b34d7c4bbe239e;p=binbsis50.git

reduced indentation levels of the "joinAnonymously" function
---

diff --git a/package.json b/package.json
index f2e491d..4c94b7e 100644
--- a/package.json
+++ b/package.json
@@ -22,5 +22,5 @@
     "start": "app.js"
   },
   "subdomain": "binb",
-  "version": "0.3.5-3"
+  "version": "0.3.5-4"
 }
diff --git a/public/js/app.js b/public/js/app.js
index 252da32..ebb4bf0 100644
--- a/public/js/app.js
+++ b/public/js/app.js
@@ -468,54 +468,52 @@
         if (/nickname\s*\=/.test(document.cookie) && !msg) {
             var encodednickname = document.cookie.replace(/.*nickname\s*\=\s*([^;]*);?.*/, '$1');
             nickname = decodeURIComponent(encodednickname);
-            socket.emit('joinanonymously', nickname, roomname);
+            return socket.emit('joinanonymously', nickname, roomname);
         }
-        else {
-            if (!DOM.modal.hasClass('in')) {
-                var html = '<div class="modal-header">';
-                html += '<h3>You are joining the '+roomname+' room</h3></div>';
-                html += '<div class="modal-body"><p>'+(msg || "What's your name?")+'</p></div>';
-                html += '<div class="modal-footer relative">';
-                html += '<input id="login" class="" type="text" name="nickname" />';
-                html += '<button id="join" class="btn btn-success">';
-                html += '<i class="icon-user icon-white"></i> Join the game</button>';
-                html += '<span class="divider"><span>or</span></span>';
-                html += '<a class="btn btn-primary" href="/login?followup=/'+roomname+'">';
-                html += '<i class="icon-lock icon-white"></i> Login</a></div>';
-
-                $(html).appendTo(DOM.modal);
-                var login = $('#login');
-                var button = $('#join');
-
-                button.click(function() {
-                    var val = $.trim(login.val());
-                    if (val !== '') {
-                        nickname = val;
-                        socket.emit('joinanonymously', nickname, roomname);
-                    }
-                    else {
-                        var txt = 'Nickname can\'t be empty.';
-                        invalidNickName('<span class="label label-important">'+txt+'</span>');
-                    }
-                    login.val('');
-                });
 
-                login.keyup(function(event) {
-                    if (event.keyCode === 13) {
-                        button.click();
-                    }
-                });
+        if (DOM.modal.hasClass('in')) {
+            $('.modal-body p').html(msg);
+            return $('#login').focus();
+        }
 
-                DOM.modal.modal('show');
-                DOM.modal.on('shown', function() {
-                    login.focus();
-                });
+        var html = '<div class="modal-header">';
+        html += '<h3>You are joining the '+roomname+' room</h3></div>';
+        html += '<div class="modal-body"><p>'+(msg || "What's your name?")+'</p></div>';
+        html += '<div class="modal-footer relative">';
+        html += '<input id="login" class="" type="text" name="nickname" />';
+        html += '<button id="join" class="btn btn-success">';
+        html += '<i class="icon-user icon-white"></i> Join the game</button>';
+        html += '<span class="divider"><span>or</span></span>';
+        html += '<a class="btn btn-primary" href="/login?followup=/'+roomname+'">';
+        html += '<i class="icon-lock icon-white"></i> Login</a></div>';
+
+        $(html).appendTo(DOM.modal);
+        var login = $('#login');
+        var button = $('#join');
+
+        button.click(function() {
+            var val = $.trim(login.val());
+            if (val !== '') {
+                nickname = val;
+                socket.emit('joinanonymously', nickname, roomname);
             }
             else {
-                $('.modal-body p').html(msg);
-                $('#login').focus();
+                var txt = 'Nickname can\'t be empty.';
+                invalidNickName('<span class="label label-important">'+txt+'</span>');
             }
-        }
+            login.val('');
+        });
+
+        login.keyup(function(event) {
+            if (event.keyCode === 13) {
+                button.click();
+            }
+        });
+
+        DOM.modal.modal('show');
+        DOM.modal.on('shown', function() {
+            login.focus();
+        });
     };
 
     var jplayerReady = function() {