From: Conny Sjöblom Date: Thu, 18 Oct 2012 06:28:52 +0000 (+0300) Subject: Fixed loadDefaults() X-Git-Url: https://jfr.im/git/z_archive/KronOS.git/commitdiff_plain/f8fb5549be1f35a23376ba661d57022338463e33 Fixed loadDefaults() --- diff --git a/public/js/application.js b/public/js/application.js index 0514799..fd7db58 100644 --- a/public/js/application.js +++ b/public/js/application.js @@ -11,14 +11,15 @@ var wos } this.loadDefaults = function() { + var self = this; $.getJSON("/backend/logged_in", function(resp) { if (!resp.contents) { - wos.hideMenu(); - wos.hideBackground(); - wos.loadLogin(); + self.hideMenu(); + self.hideBackground(); + self.loadLogin(); } else { - wos.loadUsername(); - wos.loadBackground(); + self.loadUsername(); + self.loadBackground(); } }); } @@ -105,15 +106,15 @@ var wos for (key in resp.data) { state[key] = resp.data[key] } - wos.loadUsername(); - wos.loadMenuItems(); - wos.loadBackground(); + this.loadUsername(); + this.loadMenuItems(); + this.loadBackground(); $('#loginModal').modal('hide'); $('#inputUsername').val("") $(".alert").remove(); } else { - wos.showError(resp.error, 'error', '.messagebody'); + this.showError(resp.error, 'error', '.messagebody'); } $('#inputPassword').val("") @@ -130,7 +131,7 @@ var wos })( jQuery ); $(function () { - wos = $(document.body).pageConstruct(); + wos = $('document.body').pageConstruct(); wos.buildPage(); wos.loadDefaults();