May 2015 - Sandbox-commits - mailman.cloud.codelutin.com

r1444 - in wit/js: components services
by smaisonneuve＠users.nuiton.org 22 May '15

22 May '15

Author: smaisonneuve Date: 2015-05-22 14:24:47 +0000 (Fri, 22 May 2015) New Revision: 1444 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1444 Log: [Logger] - adding loglevel library to replace console.log Modified: wit/js/components/FilterLogs.js wit/js/components/Timeline.js wit/js/services/TimerService.js Modified: wit/js/components/FilterLogs.js =================================================================== --- wit/js/components/FilterLogs.js 2015-05-22 14:17:35 UTC (rev 1443) +++ wit/js/components/FilterLogs.js 2015-05-22 14:24:47 UTC (rev 1444) @@ -193,7 +193,7 @@ ); r.push( <tr ref={key} className="hidden"> - <td colSpan="4"><Timeline data={tagObject} key={key}/></td> + <td colSpan="4"></td> </tr> ); } Modified: wit/js/components/Timeline.js =================================================================== --- wit/js/components/Timeline.js 2015-05-22 14:17:35 UTC (rev 1443) +++ wit/js/components/Timeline.js 2015-05-22 14:24:47 UTC (rev 1444) @@ -23,7 +23,7 @@ if (startDate && endDate) { var setState = this.setState.bind(this); - +console.log(sessions); scope.user.getSessions(startDate, endDate, true) .then(function(sessions) { setState({ Modified: wit/js/services/TimerService.js =================================================================== --- wit/js/services/TimerService.js 2015-05-22 14:17:35 UTC (rev 1443) +++ wit/js/services/TimerService.js 2015-05-22 14:24:47 UTC (rev 1444) @@ -4,6 +4,7 @@ var db = require("./database.js"); var config = require("./ConfigurationService.js"); var x11 = require("x11"); +var log = require("loglevel"); var events = require("events"); var eventEmitter = new events.EventEmitter();

1 0

r1443 - wit/js/services
by smaisonneuve＠users.nuiton.org 22 May '15

22 May '15

Author: smaisonneuve Date: 2015-05-22 14:17:35 +0000 (Fri, 22 May 2015) New Revision: 1443 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1443 Log: [Doc] - Fix bas comment Modified: wit/js/services/UserActivityService.js Modified: wit/js/services/UserActivityService.js =================================================================== --- wit/js/services/UserActivityService.js 2015-05-22 14:14:54 UTC (rev 1442) +++ wit/js/services/UserActivityService.js 2015-05-22 14:17:35 UTC (rev 1443) @@ -203,7 +203,7 @@ // Exports // /////////////// /** - * Retrieve window activity sessions for the peridio [startDAte; endDate] + * Retrieve window activity sessions for the period [startDAte; endDate] * If withEmptySession parameter equals true, then if there is a gap between 2 sessions in the results, * it will be filled with a fake session */

1 0

r1442 - wit/js/services
by smaisonneuve＠users.nuiton.org 22 May '15

22 May '15

Author: smaisonneuve Date: 2015-05-22 14:14:54 +0000 (Fri, 22 May 2015) New Revision: 1442 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1442 Log: [EsLint] - Fixing syntax Modified: wit/js/services/UserActivityService.js Modified: wit/js/services/UserActivityService.js =================================================================== --- wit/js/services/UserActivityService.js 2015-05-22 14:11:44 UTC (rev 1441) +++ wit/js/services/UserActivityService.js 2015-05-22 14:14:54 UTC (rev 1442) @@ -79,7 +79,7 @@ } else { - xprop({prop:'_NET_WM_NAME', id:windowId}, function(err, properties) { + xprop({prop: "_NET_WM_NAME", id: windowId}, function(err, properties) { if (err) { log.warn("Couldn't retrieve window name for id :", windowId); @@ -103,7 +103,7 @@ }; var setupActivityDetection = function(session) { - if (disableActivityDetection || !session || !timer.getTime()) { + if (disableActivityDetection || !session || !scope.timer.getTime()) { clearTimeout(activityChangeTimer); // stop activity detection @@ -207,7 +207,7 @@ * If withEmptySession parameter equals true, then if there is a gap between 2 sessions in the results, * it will be filled with a fake session */ -exports.getSessions = function (startDate, endDate, withEmptySession) { +exports.getSessions = function(startDate, endDate, withEmptySession) { var rst; if (!startDate || !endDate) { @@ -217,13 +217,13 @@ var d1 = moment(startDate), d2 = moment(endDate); rst = db.getSessions(d1.toDate(), d2.toDate()) - .then(function (sessions) { + .then(function(sessions) { // Append the current active session to the sessions list return crtSession ? sessions.concat([crtSession]) : sessions; }) - .then(function (sessions) { + .then(function(sessions) { var result = JSON.parse(JSON.stringify(sessions)); // Convert results @@ -262,19 +262,19 @@ * Offers an api for services interesting in activity change detection */ exports.subscribeActivityChange = function(callback) { - eventEmitter.on('onActivityChange', callback); + eventEmitter.on("onActivityChange", callback); }; -exports.getActivityChangeDetectedDate = function () { +exports.getActivityChangeDetectedDate = function() { return activityChangeTimer && activityChangeTimer.changeDetectedDate; }; -exports.suspendActivityDetection = function () { +exports.suspendActivityDetection = function() { disableActivityDetection = true; clearTimeout(activityChangeTimer); }; -exports.resumeActivityDetection = function () { +exports.resumeActivityDetection = function() { disableActivityDetection = false; };

1 0

r1441 - oipf/js/impl
by ygrego＠users.nuiton.org 22 May '15

22 May '15

Author: ygrego Date: 2015-05-22 14:11:44 +0000 (Fri, 22 May 2015) New Revision: 1441 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1441 Log: Modification of method "isObjectSupported". Modified: oipf/js/impl/OipfObjectFactory.js Modified: oipf/js/impl/OipfObjectFactory.js =================================================================== --- oipf/js/impl/OipfObjectFactory.js 2015-05-22 14:10:56 UTC (rev 1440) +++ oipf/js/impl/OipfObjectFactory.js 2015-05-22 14:11:44 UTC (rev 1441) @@ -126,7 +126,7 @@ var mimeType_method = { "channelConfig" : true, "application/notifsocket" : false, - "application/oipfApplicationManager" : false, + "application/oipfApplicationManager" : true, "application/oipfCapabilities" : true, "application/oipfCodManager" : false, "application/oipfCommunicationServices" : false,

1 0

r1440 - wit/js/services
by smaisonneuve＠users.nuiton.org 22 May '15

22 May '15

Author: smaisonneuve Date: 2015-05-22 14:10:56 +0000 (Fri, 22 May 2015) New Revision: 1440 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1440 Log: [Logger] - removing console.log instances Modified: wit/js/services/TimerService.js Modified: wit/js/services/TimerService.js =================================================================== --- wit/js/services/TimerService.js 2015-05-22 14:09:51 UTC (rev 1439) +++ wit/js/services/TimerService.js 2015-05-22 14:10:56 UTC (rev 1440) @@ -17,7 +17,7 @@ x11.createClient(function(err0, display) { if (err0) { - console.log(err0); + log.error(err0); return; } @@ -45,7 +45,7 @@ queryIdle(); }); - X.on("error", console.error); + X.on("error", log.error); }); var timeChangeTimer = null;

1 0

r1439 - oipf/js/impl
by ygrego＠users.nuiton.org 22 May '15

22 May '15

Author: ygrego Date: 2015-05-22 14:09:51 +0000 (Fri, 22 May 2015) New Revision: 1439 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1439 Log: The property "applicationManagerObject" is created in method "init". Modified: oipf/js/impl/OipfObjectFactory.js Modified: oipf/js/impl/OipfObjectFactory.js =================================================================== --- oipf/js/impl/OipfObjectFactory.js 2015-05-22 14:09:17 UTC (rev 1438) +++ oipf/js/impl/OipfObjectFactory.js 2015-05-22 14:09:51 UTC (rev 1439) @@ -8,7 +8,7 @@ init: function(modelFactory, dateUtils) { console.log("[INFO] constructor of OipfObjectFactory class called."); - //this.applicationManagerObject = new ApplicationManagerObject(); + this.applicationManagerObject = new ApplicationManagerObject(); this.capabilitiesObject = new CapabilitiesObject(modelFactory); //this.codManagerObject = new CodManagerObject(); this.channelConfig = new ChannelConfig();

1 0

r1438 - in wit: . js/services
by smaisonneuve＠users.nuiton.org 22 May '15

22 May '15

Author: smaisonneuve Date: 2015-05-22 14:09:17 +0000 (Fri, 22 May 2015) New Revision: 1438 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1438 Log: [Logger] - adding loglevel library to replace console.log Modified: wit/js/services/UserActivityService.js wit/package.json Modified: wit/js/services/UserActivityService.js =================================================================== --- wit/js/services/UserActivityService.js 2015-05-22 14:07:13 UTC (rev 1437) +++ wit/js/services/UserActivityService.js 2015-05-22 14:09:17 UTC (rev 1438) @@ -1,12 +1,13 @@ "use strict"; -var x11 = require('x11'); -var xprop = require('xprop'); -var moment = require('moment'); +var x11 = require("x11"); +var xprop = require("xprop"); +var moment = require("moment"); +var log = require("loglevel"); var db = require("./database.js"); var config = require("./ConfigurationService.js"); -var events = require('events'); +var events = require("events"); var eventEmitter = new events.EventEmitter(); var crtSession; @@ -49,7 +50,7 @@ xClient.GetProperty(0, ev.wid, ev.atom, xClient.atoms.WINDOW, 0, 4, function(err, prop) { if (err || !prop.data.length) { - console.log("Couldn't retrieve active window property"); + log.warn("Couldn't retrieve active window property"); reject(); } else { @@ -59,7 +60,7 @@ resolve(wid); } else { - console.log("Couldn't retrieve active window property"); + log.warn("Couldn't retrieve active window property"); reject(); } } @@ -81,7 +82,7 @@ xprop({prop:'_NET_WM_NAME', id:windowId}, function(err, properties) { if (err) { - console.log("Couldn't retrieve window name for id :", windowId); + log.warn("Couldn't retrieve window name for id :", windowId); reject(); } else { @@ -210,7 +211,7 @@ var rst; if (!startDate || !endDate) { - console.error("[UserActivityService] getSessions : parameter missing !"); + log.error("[UserActivityService] getSessions : parameter missing !"); } else { var d1 = moment(startDate), d2 = moment(endDate); Modified: wit/package.json =================================================================== --- wit/package.json 2015-05-22 14:07:13 UTC (rev 1437) +++ wit/package.json 2015-05-22 14:09:17 UTC (rev 1438) @@ -33,7 +33,8 @@ "react-router": "^0.13.2", "x11": "^1.0.3", "xprop": "^0.0.0", - "nonce":"^1.0.3" + "nonce":"^1.0.3", + "loglevel": "^1.2.0" }, "devDependencies": { "grunt": "^0.4.5",

1 0

r1437 - oipf/js/test
by ygrego＠users.nuiton.org 22 May '15

22 May '15

Author: ygrego Date: 2015-05-22 14:07:13 +0000 (Fri, 22 May 2015) New Revision: 1437 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1437 Log: Addition of method "testGetOwnerApplicationWithNull". Modified: oipf/js/test/ApplicationManagerTest.js Modified: oipf/js/test/ApplicationManagerTest.js =================================================================== --- oipf/js/test/ApplicationManagerTest.js 2015-05-22 14:05:50 UTC (rev 1436) +++ oipf/js/test/ApplicationManagerTest.js 2015-05-22 14:07:13 UTC (rev 1437) @@ -27,7 +27,18 @@ } else { reject(); } - } + }, + testGetOwnerApplicationWithNull: function(resolve, reject) { + var application = this.applicationManagerObject + .getOwnerApplication(null); + + if (this.assertEquals(application, null)) { + resolve(); + } else { + reject(); + } + }, + });

1 0

r1436 - oipf/js/test
by ygrego＠users.nuiton.org 22 May '15

22 May '15

Author: ygrego Date: 2015-05-22 14:05:50 +0000 (Fri, 22 May 2015) New Revision: 1436 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1436 Log: Addition of method "testGetOwnerApplicationOfDocumentOfGlobalPropertyWindow" and the property "applicationManagerObject" initialized in method "beforeTest". Modified: oipf/js/test/ApplicationManagerTest.js Modified: oipf/js/test/ApplicationManagerTest.js =================================================================== --- oipf/js/test/ApplicationManagerTest.js 2015-05-22 14:01:07 UTC (rev 1435) +++ oipf/js/test/ApplicationManagerTest.js 2015-05-22 14:05:50 UTC (rev 1436) @@ -11,11 +11,22 @@ }, beforeTest: function(resolve, reject) { - + this.applicationManagerObject = oipfObjectFactory.createApplicationManagerObject(); }, afterTest: function(resolve, reject) { + }, + + testGetOwnerApplicationOfDocumentOfGlobalPropertyWindow: function(resolve, reject) { + var application = this.applicationManagerObject + .getOwnerApplication(window.document); + + if (!this.assertEquals(application, null)) { + resolve(); + } else { + reject(); + } } });

1 0

r1435 - in wit: . js js/components js/services
by jruchaud＠users.nuiton.org 22 May '15

22 May '15

Author: jruchaud Date: 2015-05-22 14:01:07 +0000 (Fri, 22 May 2015) New Revision: 1435 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1435 Log: Add scope variable for the services Modified: wit/.eslintrc wit/activityChange.html wit/idle.html wit/js/components/ActionsBar.js wit/js/components/InputTag.js wit/js/components/LogsTable.js wit/js/components/Tags.js wit/js/components/Time.js wit/js/components/Timeline.js wit/js/main.js wit/js/services/TimerService.js wit/js/services/UserActivityService.js Modified: wit/.eslintrc =================================================================== --- wit/.eslintrc 2015-05-22 13:54:56 UTC (rev 1434) +++ wit/.eslintrc 2015-05-22 14:01:07 UTC (rev 1435) @@ -4,7 +4,8 @@ }, "globals": { "console": false, - "React": false + "React": false, + "scope": false }, "env": { "browser": true, Modified: wit/activityChange.html =================================================================== --- wit/activityChange.html 2015-05-22 13:54:56 UTC (rev 1434) +++ wit/activityChange.html 2015-05-22 14:01:07 UTC (rev 1435) @@ -12,7 +12,7 @@ <script> var gui = require('nw.gui'); var window = gui.Window.get(); - var timer = global.timer; + var timer = global.scope.timer; var user = global.user; var keepTiming = function() { Modified: wit/idle.html =================================================================== --- wit/idle.html 2015-05-22 13:54:56 UTC (rev 1434) +++ wit/idle.html 2015-05-22 14:01:07 UTC (rev 1435) @@ -12,7 +12,7 @@ <script> var gui = require('nw.gui'); var window = gui.Window.get(); - var timer = global.timer; + var timer = global.scope.timer; var keepIdle = function() { timer.keepIdle(); Modified: wit/js/components/ActionsBar.js =================================================================== --- wit/js/components/ActionsBar.js 2015-05-22 13:54:56 UTC (rev 1434) +++ wit/js/components/ActionsBar.js 2015-05-22 14:01:07 UTC (rev 1435) @@ -3,21 +3,21 @@ var ActionsBar = React.createClass({ onPlay: function() { - timer.start(); + scope.timer.start(); }, onStop: function() { - timer.stop(true); + scope.timer.stop(true); }, prevHistory: function() { - timer.stop(); - timer.prevHistory(); + scope.timer.stop(); + scope.timer.prevHistory(); }, nextHistory: function() { - timer.stop(); - timer.nextHistory(); + scope.timer.stop(); + scope.timer.nextHistory(); }, render: function() { Modified: wit/js/components/InputTag.js =================================================================== --- wit/js/components/InputTag.js 2015-05-22 13:54:56 UTC (rev 1434) +++ wit/js/components/InputTag.js 2015-05-22 14:01:07 UTC (rev 1435) @@ -8,7 +8,7 @@ getTags: function() { var setState = self.setState; - timer.getLastTags().then(function(tags) { + scope.timer.getLastTags().then(function(tags) { setState({options: tags, value: ""}); }); }, @@ -20,8 +20,8 @@ if (e.keyCode === 13 && value !== "") { // On enter this.setState({options: this.state.options, value: ""}); - timer.stop(); - timer.addTag(value); + scope.timer.stop(); + scope.timer.addTag(value); } }, Modified: wit/js/components/LogsTable.js =================================================================== --- wit/js/components/LogsTable.js 2015-05-22 13:54:56 UTC (rev 1434) +++ wit/js/components/LogsTable.js 2015-05-22 14:01:07 UTC (rev 1435) @@ -5,7 +5,7 @@ onDelete: function(e) { var logId = e.target.dataset.id; if (logId) { - timer.deleteLog(logId); + scope.timer.deleteLog(logId); var index = parseInt(e.target.dataset.index, 10); this.props.data.splice(index, 1); Modified: wit/js/components/Tags.js =================================================================== --- wit/js/components/Tags.js 2015-05-22 13:54:56 UTC (rev 1434) +++ wit/js/components/Tags.js 2015-05-22 14:01:07 UTC (rev 1435) @@ -3,30 +3,30 @@ var Tags = React.createClass({ getInitialState: function() { - return timer; + return scope.timer; }, componentDidMount: function() { this.forceUpdateBound = this.forceUpdate.bind(this); - timer.subscribeTagsChanged(this.forceUpdateBound); + scope.timer.subscribeTagsChanged(this.forceUpdateBound); }, componentWillUnmount: function() { - timer.unsubscribeTagsChanged(this.forceUpdateBound); + scope.timer.unsubscribeTagsChanged(this.forceUpdateBound); }, onRemove: function(e) { var target = e.target; var index = target.dataset.index; - timer.stop(); - timer.removeTag(index); + scope.timer.stop(); + scope.timer.removeTag(index); }, render: function() { var onRemove = this.onRemove; - var tags = timer.getTags(); + var tags = scope.timer.getTags(); var rows = []; for (var i = 0; i < 5; i++) { Modified: wit/js/components/Time.js =================================================================== --- wit/js/components/Time.js 2015-05-22 13:54:56 UTC (rev 1434) +++ wit/js/components/Time.js 2015-05-22 14:01:07 UTC (rev 1435) @@ -3,16 +3,16 @@ var Time = React.createClass({ getInitialState: function() { - return timer; + return scope.timer; }, componentDidMount: function() { this.forceUpdateBound = this.forceUpdate.bind(this); - timer.subscribeTimeChanged(this.forceUpdateBound); + scope.timer.subscribeTimeChanged(this.forceUpdateBound); }, componentWillUnmount: function() { - timer.unsubscribeTimeChanged(this.forceUpdateBound); + scope.timer.unsubscribeTimeChanged(this.forceUpdateBound); }, onEdit: function() { @@ -20,7 +20,7 @@ this.refs.editInput.getDOMNode().classList.toggle("hidden"); this.refs.timeValue.getDOMNode().classList.toggle("hidden"); - var time = timer.getTime() || "00:00:00"; + var time = scope.timer.getTime() || "00:00:00"; var editInputTime = this.refs.editInputTime.getDOMNode(); editInputTime.value = time; editInputTime.max = time; @@ -32,7 +32,7 @@ this.refs.timeValue.getDOMNode().classList.toggle("hidden"); var editInputTime = this.refs.editInputTime.getDOMNode(); - timer.editTime(editInputTime.value); + scope.timer.editTime(editInputTime.value); }, render: function() { Modified: wit/js/components/Timeline.js =================================================================== --- wit/js/components/Timeline.js 2015-05-22 13:54:56 UTC (rev 1434) +++ wit/js/components/Timeline.js 2015-05-22 14:01:07 UTC (rev 1435) @@ -24,7 +24,7 @@ if (startDate && endDate) { var setState = this.setState.bind(this); - user.getSessions(startDate, endDate, true) + scope.user.getSessions(startDate, endDate, true) .then(function(sessions) { setState({ sessions: sessions Modified: wit/js/main.js =================================================================== --- wit/js/main.js 2015-05-22 13:54:56 UTC (rev 1434) +++ wit/js/main.js 2015-05-22 14:01:07 UTC (rev 1435) @@ -11,11 +11,13 @@ global.navigator = window.navigator; global.localStorage = window.localStorage; +global.scope = window.scope = {}; + var timer = require("./js/services/TimerService.js"); -global.timer = timer; +scope.timer = timer; var user = require("./js/services/UserActivityService.js"); -global.user = user; +scope.user = user; var config = require("./js/services/ConfigurationService.js"); @@ -107,7 +109,7 @@ var current = gui.Window.get(); current.hide(); - user.suspendActivityDetection(); + scope.user.suspendActivityDetection(); var window = gui.Window.open(file, { position: "center", @@ -134,5 +136,5 @@ // Subscriptions to services -timer.subscribeIdle(openWindow.bind(null, "idle.html")); -user.subscribeActivityChange(openWindow.bind(null, "activityChange.html")); +scope.timer.subscribeIdle(openWindow.bind(null, "idle.html")); +scope.user.subscribeActivityChange(openWindow.bind(null, "activityChange.html")); Modified: wit/js/services/TimerService.js =================================================================== --- wit/js/services/TimerService.js 2015-05-22 13:54:56 UTC (rev 1434) +++ wit/js/services/TimerService.js 2015-05-22 14:01:07 UTC (rev 1435) @@ -79,7 +79,7 @@ timeChange(); - user.resumeActivityDetection(); + scope.user.resumeActivityDetection(); }; exports.stop = function(force) { @@ -145,7 +145,7 @@ }; exports.keepIdle = function() { - user.resumeActivityDetection(); + scope.user.resumeActivityDetection(); idleTime = null; }; Modified: wit/js/services/UserActivityService.js =================================================================== --- wit/js/services/UserActivityService.js 2015-05-22 13:54:56 UTC (rev 1434) +++ wit/js/services/UserActivityService.js 2015-05-22 14:01:07 UTC (rev 1435) @@ -306,8 +306,8 @@ * If timer change occured while activity change detection is on going, * stop activity change detection process (means the user has handled it) */ -timer.subscribeTimeChanged(function() { - if (!timer.getTime()) { +scope.timer.subscribeTimeChanged(function() { + if (!scope.timer.getTime()) { clearTimeout(activityChangeTimer); } });

1 0