1 files changed, 13 insertions, 14 deletions

diff --git a/js/codeq/login.js b/js/codeq/login.js
index b2c39dd..9d899c6 100644
--- a/js/codeq/login.js
+++ b/js/codeq/login.js
@@ -3,17 +3,18 @@
  */
 
 (function(){
-    var jqNavBarRight = $('.nav.navbar-nav.navbar-right'),
+    var jqScreen = $("#screen_login"),
+        jqNavBarRight = $('.nav.navbar-nav.navbar-right'),
         jqNavigationHomeBtn = $('#navigation-home'),
         jqAAILoginBtn = $('#aai_login_button'),
         jqSignupBtn = $('#signup_button'),
         jqSubmitLoginBtn = $("#submit"),
-        jqDisabled = $('#disabled');
+        jqDisabledOverlay = $('#disabled');
 
     //the loginCallbackFunction is used here and in the AAI login as well
     codeq.loginCallbackFunction = function (data) {
-        jqDisabled.css('display', 'none');
-        jqDisabled.css('cursor', '');
+        jqDisabledOverlay.css('display', 'none');
+        jqDisabledOverlay.css('cursor', '');
         if (data.code !== 0) throw new Error('Login failed, code: ' + data.code + ', message: ' + data.message);
 
         //nav signed in...
@@ -39,23 +40,21 @@
         }
 
         codeq.globalStateMachine.transition('language');
-        //codeq.activateState('language');
     };
 
     var loginFun = function(){
-            jqDisabled.css('display', '');
-            jqDisabled.css('cursor', 'wait');
+            jqDisabledOverlay.css('display', '');
+            jqDisabledOverlay.css('cursor', 'wait');
             codeq.comms.connect()
                 .then(function () {
                     return codeq.comms.login($('#username').val(), $('#password').val());
                 })
                 .then(codeq.loginCallbackFunction)
                 .fail(function (reason) {
-                    jqDisabled.css('display', 'none');
-                    jqDisabled.css('cursor', '');
-                    codeq.log.error('Login failed: ' + reason, reason);
+                    jqDisabledOverlay.css('display', 'none');
+                    jqDisabledOverlay.css('cursor', '');
+                    codeq.log.error('Login failed: ' + reason);
                     alert('Login request failed: ' + reason);
-                    jqDisabled.css('display', 'none');
                 })
                 .done();
         },
@@ -88,8 +87,8 @@
                 }
             });
             //$('#modalLogIn').modal();
-            $("#screen_login").css('display', '');
-            jqDisabled.css('display', 'none');
+            jqScreen.css('display', '');
+            jqDisabledOverlay.css('display', 'none');
         },
         'exit' : function(){
             //remove the listener from the buttons specific to this page
@@ -98,7 +97,7 @@
             jqSignupBtn.off('click');
             jqAAILoginBtn.off('click');
 
-            $("#screen_login").css('display', 'none');
+            jqScreen.css('display', 'none');
             $("#password").val('');
             //re-enable the click listener
             jqNavigationHomeBtn.on('click', function(e){