Author: jruchaud Date: 2015-05-22 14:33:05 +0000 (Fri, 22 May 2015) New Revision: 1446 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1446 Log: Add scope variable for the services Modified: wit/js/main.js wit/js/pages/Options.js wit/js/services/TimerService.js wit/js/services/UserActivityService.js Modified: wit/js/main.js =================================================================== --- wit/js/main.js 2015-05-22 14:25:34 UTC (rev 1445) +++ wit/js/main.js 2015-05-22 14:33:05 UTC (rev 1446) @@ -20,6 +20,7 @@ scope.user = user; var config = require("./js/services/ConfigurationService.js"); +scope.config = config; var React = require("react"); var Router = require("react-router"); Modified: wit/js/pages/Options.js =================================================================== --- wit/js/pages/Options.js 2015-05-22 14:25:34 UTC (rev 1445) +++ wit/js/pages/Options.js 2015-05-22 14:33:05 UTC (rev 1446) @@ -3,21 +3,21 @@ var Options = React.createClass({ setIdleTime: function(e) { - config.setIdleTime(e.target.value); + scope.config.setIdleTime(e.target.value); }, setActivityTime: function(e) { - config.setActivityTime(e.target.value); + scope.config.setActivityTime(e.target.value); }, setWeekDay: function(e) { - config.setWeekDay(e.target.value); + scope.config.setWeekDay(e.target.value); }, render: function() { - var idleTime = config.getIdleTime(); - var activityTime = config.getActivityTime(); - var weekDay = config.getWeekDay(); + var idleTime = scope.config.getIdleTime(); + var activityTime = scope.config.getActivityTime(); + var weekDay = scope.config.getWeekDay(); return <div className="form-horizontal"> Modified: wit/js/services/TimerService.js =================================================================== --- wit/js/services/TimerService.js 2015-05-22 14:25:34 UTC (rev 1445) +++ wit/js/services/TimerService.js 2015-05-22 14:33:05 UTC (rev 1446) @@ -30,7 +30,7 @@ // console.log('Idle time ' + info.idle + "ms"); if (time) { - var configIdleTime = config.getIdleTime(); + var configIdleTime = scope.config.getIdleTime(); var durationIdleTime = moment.duration(configIdleTime, "m"); if (info.idle >= durationIdleTime.asMilliseconds() && !idleTime) { Modified: wit/js/services/UserActivityService.js =================================================================== --- wit/js/services/UserActivityService.js 2015-05-22 14:25:34 UTC (rev 1445) +++ wit/js/services/UserActivityService.js 2015-05-22 14:33:05 UTC (rev 1446) @@ -5,7 +5,6 @@ var moment = require("moment"); var log = require("loglevel"); var db = require("./database.js"); -var config = require("./ConfigurationService.js"); var events = require("events"); var eventEmitter = new events.EventEmitter(); @@ -110,7 +109,7 @@ } else { var now = moment(); - if (now.diff(session.startDate, "m") >= config.getActivityTime()) { + if (now.diff(session.startDate, "m") >= scope.config.getActivityTime()) { // The user has stayed more than "config.getActivityTime()" minutes on a window // and now has just switched to another window. @@ -118,7 +117,7 @@ activityChangeTimer = setTimeout( eventEmitter.emit.bind(eventEmitter, "onActivityChange", now.toDate()), - moment.duration(config.getActivityTime(), "m").as("ms") + moment.duration(scope.config.getActivityTime(), "m").as("ms") ); activityChangeTimer.crtActivityName = session.name; activityChangeTimer.changeDetectedDate = now.toDate();