Author: jruchaud Date: 2015-05-22 09:59:56 +0000 (Fri, 22 May 2015) New Revision: 1427 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1427 Log: Setup eslint Modified: wit/js/services/TimerService.js Modified: wit/js/services/TimerService.js =================================================================== --- wit/js/services/TimerService.js 2015-05-22 09:56:32 UTC (rev 1426) +++ wit/js/services/TimerService.js 2015-05-22 09:59:56 UTC (rev 1427) @@ -15,17 +15,17 @@ var historyIndex = -1; -x11.createClient(function(err, display) { - if (err) { - console.log(err); +x11.createClient(function(err0, display) { + if (err0) { + console.log(err0); return; } var X = display.client; - X.require("screen-saver", function(err, SS) { + X.require("screen-saver", function(err1, SS) { var queryIdle = function() { - SS.QueryInfo(display.screen[0].root, function(err, info) { + SS.QueryInfo(display.screen[0].root, function(err2, info) { // console.log('Idle time ' + info.idle + "ms"); if (time) { @@ -48,9 +48,20 @@ X.on("error", console.error); }); -var insertLog = function(tags, start, end) { +var timeChangeTimer = null; + +var timeChange = function() { + clearTimeout(timeChangeTimer); + + eventEmitter.emit("onTimeChanged"); + if (time) { + timeChangeTimer = setTimeout(timeChange.bind(), 1000); + } +}; + +var insertLog = function(t, start, end) { dayTime += moment(end).diff(moment(start)); - db.insertLog(tags, start, end); + db.insertLog(t, start, end); }; exports.start = function() { @@ -105,42 +116,32 @@ exports.removeTag = function(index) { tags.splice(index, 1); - eventEmitter.emit('onTagsChanged'); + eventEmitter.emit("onTagsChanged"); }; -var timeChangeTimer = null; -var timeChange = function() { - clearTimeout(timeChangeTimer); - - eventEmitter.emit('onTimeChanged'); - if (time) { - timeChangeTimer = setTimeout(timeChange.bind(), 1000); - } -}; - exports.subscribeTagsChanged = function(callback) { - eventEmitter.on('onTagsChanged', callback); + eventEmitter.on("onTagsChanged", callback); }; exports.subscribeTimeChanged = function(callback) { - eventEmitter.on('onTimeChanged', callback); + eventEmitter.on("onTimeChanged", callback); }; exports.subscribeIdle = function(callback) { - eventEmitter.on('onIdle', callback); + eventEmitter.on("onIdle", callback); }; exports.unsubscribeTagsChanged = function(callback) { - eventEmitter.removeListener('onTagsChanged', callback); + eventEmitter.removeListener("onTagsChanged", callback); }; exports.unsubscribeTimeChanged = function(callback) { - eventEmitter.removeListener('onTimeChanged', callback); + eventEmitter.removeListener("onTimeChanged", callback); }; exports.unsubscribeIdle = function(callback) { - eventEmitter.removeListener('onIdle', callback); + eventEmitter.removeListener("onIdle", callback); }; exports.keepIdle = function() { @@ -170,13 +171,13 @@ exports.reassignTimeFrom(idleTime); }; -exports.reassignTimeFrom = function (newStartTime) { +exports.reassignTimeFrom = function(newStartTime) { insertLog(tags, time, newStartTime); time = newStartTime; idleTime = new Date(); clearTimeout(timeChangeTimer); - eventEmitter.emit('onTimeChanged'); + eventEmitter.emit("onTimeChanged"); }; var setTagsFromHistory = function() { @@ -190,7 +191,7 @@ } else { tags = []; } - eventEmitter.emit('onTagsChanged'); + eventEmitter.emit("onTagsChanged"); }); }; @@ -201,7 +202,7 @@ }; exports.nextHistory = function() { - if (historyIndex == -1) { + if (historyIndex === -1) { return; }