|
@@ -227,7 +227,7 @@ App.MainController = Em.Controller.extend({
|
|
checkActiveness: function() {
|
|
checkActiveness: function() {
|
|
var scope = App.router.get('mainController');
|
|
var scope = App.router.get('mainController');
|
|
//console.error("checkActiveness " + scope.get('lastUserActiveTime') + " : " + Date.now());
|
|
//console.error("checkActiveness " + scope.get('lastUserActiveTime') + " : " + Date.now());
|
|
- if (Date.now() - scope.get('lastUserActiveTime') > scope.get('userTimeOut')) {
|
|
|
|
|
|
+ if (Date.now() - scope.get('lastUserActiveTime') > scope.get('userTimeOut') && !scope.isOnWizard()) {
|
|
scope.set('isUserActive', false);
|
|
scope.set('isUserActive', false);
|
|
//console.error("LOGOUT!");
|
|
//console.error("LOGOUT!");
|
|
scope.unbindActivityEventMonitors();
|
|
scope.unbindActivityEventMonitors();
|
|
@@ -241,6 +241,12 @@ App.MainController = Em.Controller.extend({
|
|
this.bindActivityEventMonitors();
|
|
this.bindActivityEventMonitors();
|
|
},
|
|
},
|
|
|
|
|
|
|
|
+ isOnWizard: function() {
|
|
|
|
+ var isWizard = window.location.href.indexOf('/step') != -1;
|
|
|
|
+ var isUpgrade = window.location.href.indexOf('/stack/upgrade') != -1;
|
|
|
|
+ return isWizard || isUpgrade;
|
|
|
|
+ },
|
|
|
|
+
|
|
bindActivityEventMonitors: function() {
|
|
bindActivityEventMonitors: function() {
|
|
$(window).bind('mousemove', this.keepActive);
|
|
$(window).bind('mousemove', this.keepActive);
|
|
$(window).bind('keypress', this.keepActive);
|
|
$(window).bind('keypress', this.keepActive);
|