diff options
author | Aleš Smodiš <aless@guru.si> | 2015-12-15 11:30:19 +0100 |
---|---|---|
committer | Aleš Smodiš <aless@guru.si> | 2015-12-15 11:30:19 +0100 |
commit | ed62d492323011741027c9d79973ccd30b4b0494 (patch) | |
tree | 26121de183f0f2019857581198b4e31a9ede5456 /js/codeq/navigation.js | |
parent | 13c8be3d82350082093df8cd65771f09fcb83c54 (diff) | |
parent | 7de6dca9112d292803b801e0d370c45b0ca0eb13 (diff) |
Merge branch 'master' of ssh://212.235.189.51:22122/codeq-web
Conflicts:
js/codeq/navigation.js
Diffstat (limited to 'js/codeq/navigation.js')
-rw-r--r-- | js/codeq/navigation.js | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/js/codeq/navigation.js b/js/codeq/navigation.js index cfff71b..d806eea 100644 --- a/js/codeq/navigation.js +++ b/js/codeq/navigation.js @@ -95,11 +95,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ name = 'login';//this will cause the following code to transition to the login state instead of the original one given } - var newState = def[name];//if the newState is not the same as the old or if it doesn't exist at all is already checked at this point -// if (currState) currState.exit(); -// currState = newState; -// currState.enter.apply(currState, Array.prototype.slice.apply(arguments, [1])); if (currState) { if (newState.isModal) { if (currState.isModal) currState.exit(); |