diff options
| author | Marko Pušnik <marko.pusnik@guru.si> | 2015-10-13 15:43:10 +0200 |
|---|---|---|
| committer | Marko Pušnik <marko.pusnik@guru.si> | 2015-10-13 15:43:10 +0200 |
| commit | 6aabe80831ead5390aff3ae8e73691f0600ca880 (patch) | |
| tree | f506261cf064c6a518410c63e36b1bbbdbbe5544 /js/codeq/navigation.js | |
| parent | 8855c93594c4eca1d0c5d3e2f9f2b35cc7d420a1 (diff) | |
| parent | 81f79c04796ad2ba0d48fda0e0fcdc812c476817 (diff) | |
Merge branch 'master' of ssh://212.235.189.51:22122/codeq-web
Conflicts:
index.html
Diffstat (limited to 'js/codeq/navigation.js')
| -rw-r--r-- | js/codeq/navigation.js | 5 |
1 files changed, 3 insertions, 2 deletions
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){ |