From 0977874bac2a1ec5a7fee0c276b1da74ce2e1c90 Mon Sep 17 00:00:00 2001 From: Robert Zorko Date: Tue, 13 Oct 2015 15:27:01 +0200 Subject: moved login from a popup to its own page and made some changes to the logout button --- js/codeq/navigation.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'js/codeq/navigation.js') diff --git a/js/codeq/navigation.js b/js/codeq/navigation.js index eafa5cc..af1d250 100644 --- a/js/codeq/navigation.js +++ b/js/codeq/navigation.js @@ -105,14 +105,15 @@ codeq.comms.logout() .then(function (data) { console.log(data); - //codeq.globalStateMachine.transition('login'); + codeq.comms.disconnect(); + codeq.globalStateMachine.transition('login'); }) .fail(function (reason) { console.log(reason); }) .done(); - codeq.globalStateMachine.transition('login'); + //codeq.globalStateMachine.transition('login'); e.preventDefault();//prevent this since we'll trigger a page reload otherwise }); $('#navigation-profile').on('click', function(e){ -- cgit v1.2.1