UI-1216: Fixed the logoutTimer references

Conflicts: js/lib/monster.util.js
2600hz · Feb 23, 2015 · f4d9546 · f4d9546
1 parent 905a8a0
commit f4d9546
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/js/lib/monster.util.js b/js/lib/monster.util.js
@@ -7,15 +7,15 @@ define(function(require){
 	var util = {
 
 		/*
-			This function will automatically logout the user after %wait% minutes (defaults to 15).
+			This function will automatically logout the user after %wait% minutes (defaults to 30).
 		   	This function will show a warning popup %alertBeforeLogout% minutes before logging out (defaults to 2). If the user moves his cursor, the timer will reset.
 		*/
 		autoLogout: function() {
-			if(!monster.config.hasOwnProperty('logoutTimer') || monster.config.logoutTimer > 0) {
+			if(!monster.config.whitelabel.hasOwnProperty('logoutTimer') || monster.config.whitelabel.logoutTimer > 0) {
 				var i18n = monster.apps['core'].i18n.active(),
 					timerAlert,
 					timerLogout,
-					wait = monster.config.logoutTimer || 15,
+					wait = monster.config.whitelabel.logoutTimer || 30,
 					alertBeforeLogout = 2,
 					alertTriggered = false,
 					alertDialog,