From 10de7241f22a10d65f53c891a8b07fe8650b4878 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marko=20Pu=C5=A1nik?= <marko.pusnik@guru.si>
Date: Tue, 29 Sep 2015 08:32:59 +0200
Subject: login removed from navbar

---
 js/codeq/login.js | 88 ++++++++++++++++++++++++++-----------------------------
 1 file changed, 41 insertions(+), 47 deletions(-)

(limited to 'js/codeq/login.js')

diff --git a/js/codeq/login.js b/js/codeq/login.js
index bb92325..c400f06 100644
--- a/js/codeq/login.js
+++ b/js/codeq/login.js
@@ -1,48 +1,42 @@
-/**
- * Created by robert on 9/17/15.
- */
-
-(function(){
-    var loginFun = function(){
-        $('#disabled').css('display', '');
-        $('#disabled').css('cursor', 'wait');
-        codeq.comms.connect()
-            .then(function () {
-                return codeq.comms.login($('#username').val(), $('#password').val());
-            })
-            .then(function (data) {
-                $('#disabled').css('display', 'none');
-                $('#disabled').css('cursor', '');
-                if (data.code !== 0) throw new Error('Login failed, code: ' + data.code + ', message: ' + data.message);
-                codeq.globalStateMachine.transition('language');
-                //codeq.activateState('language');
-            })
-            .fail(function (reason) {
-                $('#disabled').css('display', 'none');
-                $('#disabled').css('cursor', '');
-                codeq.log.error('Login failed: ' + reason, reason);
-                alert('Login request failed: ' + reason);
-                $('#disabled').css('display', 'none');
-            })
-            .done();
-    };
-    codeq.globalStateMachine.register('login',{
-        'enter': function(){
-            $("#submit").on('click', loginFun);
-
-            $("#navigation-login").addClass("active");
-            $('#navigation-login').css('display', '');
-
-            $("#screen_login").css('display', '');
-            $('#disabled').css('display', 'none');
-        },
-        'exit' : function(){
-            $("#submit").off('click', loginFun);
-            $("#screen_login").css('display', 'none');
-            $("#password").val('');
-
-            $('#navigation-login').css('display', 'none');
-            $("#navigation-login").removeClass("active");
-        }
-    });
+/**
+ * Created by robert on 9/17/15.
+ */
+
+(function(){
+    var loginFun = function(){
+        $('#disabled').css('display', '');
+        $('#disabled').css('cursor', 'wait');
+        codeq.comms.connect()
+            .then(function () {
+                return codeq.comms.login($('#username').val(), $('#password').val());
+            })
+            .then(function (data) {
+                $('#disabled').css('display', 'none');
+                $('#disabled').css('cursor', '');
+                if (data.code !== 0) throw new Error('Login failed, code: ' + data.code + ', message: ' + data.message);
+                codeq.globalStateMachine.transition('language');
+                //codeq.activateState('language');
+            })
+            .fail(function (reason) {
+                $('#disabled').css('display', 'none');
+                $('#disabled').css('cursor', '');
+                codeq.log.error('Login failed: ' + reason, reason);
+                alert('Login request failed: ' + reason);
+                $('#disabled').css('display', 'none');
+            })
+            .done();
+    };
+    codeq.globalStateMachine.register('login',{
+        'enter': function(){
+            $("#submit").on('click', loginFun);
+
+            $("#screen_login").css('display', '');
+            $('#disabled').css('display', 'none');
+        },
+        'exit' : function(){
+            $("#submit").off('click', loginFun);
+            $("#screen_login").css('display', 'none');
+            $("#password").val('');
+        }
+    });
 })();
\ No newline at end of file
-- 
cgit v1.2.1