From f10fd3172e46702fc3b14cd2631d609df516d280 Mon Sep 17 00:00:00 2001
From: antelle <dmitryvit@gmail.com>
Date: Sun, 31 Jul 2016 08:58:35 +0300
Subject: [PATCH] fix #290: idle timer on computer sleep

---
 app/scripts/comp/idle-tracker.js | 25 +++++++++++++++----------
 release-notes.md                 |  3 ++-
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/app/scripts/comp/idle-tracker.js b/app/scripts/comp/idle-tracker.js
index 3ba14aa8..2a0a8200 100644
--- a/app/scripts/comp/idle-tracker.js
+++ b/app/scripts/comp/idle-tracker.js
@@ -1,20 +1,25 @@
 'use strict';
 
-var Backbone = require('backbone'),
-    AppSettingsModel = require('../models/app-settings-model');
+const Backbone = require('backbone');
+const AppSettingsModel = require('../models/app-settings-model');
 
-var IdleTracker = {
-    idleMinutes: 0,
+let IdleTracker = {
+    idleTimeout: 0,
     init: function() {
-        setInterval(this.minuteTick.bind(this), 1000 * 60);
+        this.scheduleLock();
     },
-    minuteTick: function() {
-        if (++this.idleMinutes === AppSettingsModel.instance.get('idleMinutes')) {
-            Backbone.trigger('user-idle');
+    scheduleLock() {
+        let idleMinutes = AppSettingsModel.instance.get('idleMinutes');
+        if (this.idleTimeout) {
+            clearTimeout(this.idleTimeout);
         }
+        this.idleTimeout = setTimeout(this.triggerIdle, idleMinutes * 60 * 1000);
     },
-    regUserAction: function() {
-        this.idleMinutes = 0;
+    triggerIdle() {
+        Backbone.trigger('user-idle');
+    },
+    regUserAction() {
+        this.scheduleLock();
     }
 };
 
diff --git a/release-notes.md b/release-notes.md
index d3ec3a47..60642330 100644
--- a/release-notes.md
+++ b/release-notes.md
@@ -9,7 +9,8 @@ Release notes
 `+` option to preload default config and file  
 `+` save displayed table columns  
 `-` fix app redraw in background  
-`-` fix unicode auto-type on mac and linux   
+`-` fix unicode auto-type on mac and linux  
+`-` fix idle timer on computer sleep  
 
 ##### v1.2.4 (2016-07-20)
 `+` digital signature in installer