From f4d95460f7e3d6ac9c092551b4917724542b77cd Mon Sep 17 00:00:00 2001 From: Jean-Roch Maitre Date: Mon, 23 Feb 2015 11:39:03 -0800 Subject: [PATCH] UI-1216: Fixed the logoutTimer references Conflicts: js/lib/monster.util.js --- js/lib/monster.util.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/js/lib/monster.util.js b/js/lib/monster.util.js index 94e0ccf8e..baa0d3e64 100644 --- 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,