resolved merge conflicts

1 files changed, 10 insertions, 5 deletions

diff --git a/js/codeq/navigation.js b/js/codeq/navigation.js
index 4445a3d..80fd321 100644
--- a/js/codeq/navigation.js
+++ b/js/codeq/navigation.js
@@ -57,7 +57,7 @@
                     History.pushState({'state': name, 'params': Array.prototype.slice.apply(arguments, [1])}, null, '?s=' + name);
                 }
                 catch (e) {
-                    codeq.log.error('init: History.pushState() failed for new state ' + name+'. Error:'+e);
+                    codeq.log.error('init: History.pushState() failed for new state ' + name+'. Error:'+e, e);
                 }
             },
             'destroy': function () {
@@ -81,10 +81,6 @@
 
 
     //setup all the buttons in the banner
-    $('#navigation-login').on('click', function(e){
-        codeq.globalStateMachine.transition('login');
-        e.preventDefault();//prevent this since we'll trigger a page reload otherwise
-    });
     $('#navigation-language').on('click', function(e){
         codeq.globalStateMachine.transition('language');
         e.preventDefault();
@@ -101,4 +97,13 @@
         codeq.globalStateMachine.transition('prolog');
         e.preventDefault();
     });
+    $('#navigation-logout').on('click', function(e){
+        codeq.globalStateMachine.transition('login');
+        e.preventDefault();//prevent this since we'll trigger a page reload otherwise
+    });
+    $('#navigation-profile').on('click', function(e){
+        codeq.globalStateMachine.transition('profile');
+        e.preventDefault();//prevent this since we'll trigger a page reload otherwise
+    });
+
 })();
\ No newline at end of file