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

r1758 - oipf/lib/js/impl
by ygrego＠users.nuiton.org June 22, 2015

June 22, 2015

Author: ygrego Date: 2015-06-22 11:36:30 +0000 (Mon, 22 Jun 2015) New Revision: 1758 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1758 Log: This property is useless. Modified: oipf/lib/js/impl/VideoBroadcastObject.js Modified: oipf/lib/js/impl/VideoBroadcastObject.js =================================================================== --- oipf/lib/js/impl/VideoBroadcastObject.js 2015-06-22 09:50:14 UTC (rev 1757) +++ oipf/lib/js/impl/VideoBroadcastObject.js 2015-06-22 11:36:30 UTC (rev 1758) @@ -153,7 +153,6 @@ this._timerManager = new TimerManager(); this._timeout = this._timerManager.createTimer.bind(this._timerManager, 0); - this._timeoutLong = this._timerManager.createTimer.bind(this._timerManager, 100); } createdCallback() {

1 0

r1757 - oipf/lib/js/utils
by ygrego＠users.nuiton.org June 22, 2015

June 22, 2015

Author: ygrego Date: 2015-06-22 09:50:14 +0000 (Mon, 22 Jun 2015) New Revision: 1757 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1757 Log: The value returned by these methods must be of type Integer. Modified: oipf/lib/js/utils/DateUtils.js Modified: oipf/lib/js/utils/DateUtils.js =================================================================== --- oipf/lib/js/utils/DateUtils.js 2015-06-22 09:45:13 UTC (rev 1756) +++ oipf/lib/js/utils/DateUtils.js 2015-06-22 09:50:14 UTC (rev 1757) @@ -14,7 +14,7 @@ } millisecondsToSeconds(timeInMilliseconds) { - return timeInMilliseconds / 1000; + return this.round(timeInMilliseconds / 1000); } nowInSeconds() { @@ -22,15 +22,19 @@ } secondsToMilliseconds(timeInSeconds) { - return timeInSeconds * 1000; + return this.round(timeInSeconds * 1000); } secondsToMinutes(timeInSeconds) { - return timeInSeconds / 60; + return this.round(timeInSeconds / 60); } yesterday() { return this._yesterday; } + round(time) { + return Math.round(time); + } + }

1 0

r1756 - oipf/test/js
by ygrego＠users.nuiton.org June 22, 2015

June 22, 2015

Author: ygrego Date: 2015-06-22 09:45:13 +0000 (Mon, 22 Jun 2015) New Revision: 1756 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1756 Log: The title don't have to be inject in the body of test page at this moment. Modified: oipf/test/js/Test.js Modified: oipf/test/js/Test.js =================================================================== --- oipf/test/js/Test.js 2015-06-22 09:42:07 UTC (rev 1755) +++ oipf/test/js/Test.js 2015-06-22 09:45:13 UTC (rev 1756) @@ -978,10 +978,8 @@ } displayInLineArray() { - var content = "<div id='testsDisplay'>"; - content += "<div id='title'><h1>OIPF Tests</h1></div>"; - content += "<div id='testControllerDiv'>"; - content += "<div id='titleTestControllerDiv'><h4>All tests</h4></div>"; + var content = "<div id='testControllerDiv'>"; + content += "<div id='titleTestControllerDiv'><h4>All tests</h4></div>"; content += "<button id='runAllBtn'>Run All</button>"; content += "<button id='displayConfigBtn'>Hide/Show</button>"; content += "<div id='globalTestResultsDiv'>"; @@ -1034,7 +1032,6 @@ content += "</div>"; } content += "</div>"; - content += "</div>"; document.body.innerHTML += content; }

1 0

r1755 - oipf/test/view
by ygrego＠users.nuiton.org June 22, 2015

June 22, 2015

Author: ygrego Date: 2015-06-22 09:42:07 +0000 (Mon, 22 Jun 2015) New Revision: 1755 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1755 Log: Te title must be there, it's not a variable part of test page. Modified: oipf/test/view/test.html Modified: oipf/test/view/test.html =================================================================== --- oipf/test/view/test.html 2015-06-22 08:16:07 UTC (rev 1754) +++ oipf/test/view/test.html 2015-06-22 09:42:07 UTC (rev 1755) @@ -101,5 +101,8 @@ </script> </head> <body onload="start()"> + <div id="title"> + <h1>OIPF Tests</h1> + </div> </body> </html>

1 0

r1754 - oipf/lib/js/impl
by ygrego＠users.nuiton.org June 22, 2015

June 22, 2015

Author: ygrego Date: 2015-06-22 08:16:07 +0000 (Mon, 22 Jun 2015) New Revision: 1754 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1754 Log: Avoid that some classes depending of ChannelService object try to get it while this one is not yet created by the oipf factory. Modified: oipf/lib/js/impl/OipfObjectFactory.js Modified: oipf/lib/js/impl/OipfObjectFactory.js =================================================================== --- oipf/lib/js/impl/OipfObjectFactory.js 2015-06-18 15:56:44 UTC (rev 1753) +++ oipf/lib/js/impl/OipfObjectFactory.js 2015-06-22 08:16:07 UTC (rev 1754) @@ -6,9 +6,11 @@ constructor() { console.log("[INFO] constructor of OipfObjectFactory class called."); + this._setChannelServicePromise(); var modelFactory = new ModelFactory(); var dateUtils = new DateUtils(); this._oipfConfiguration = new OipfConfiguration(); + this._channelService = null; /*The ChannelConfig class provides the entry point for applications to get information about the list of channels * available. It can be obtained in two ways: @@ -639,6 +641,7 @@ this._oipfConfiguration.channelOrigin, channelListJson.channelList.channel ); + this._channelServicePromise.resolve(this._channelService); this.channelConfig = new ChannelConfig(this._channelService); } @@ -653,4 +656,24 @@ this.searchManagerObject = new SearchManagerObject(programmeService); } + + _getChannelServicePromise() { + + return this._channelServicePromise; + } + + _setChannelServicePromise() { + this._channelServicePromise = { + promise: null, + resolve: null, + reject: null + }; + + var self = this; + + this._channelServicePromise.promise = new Promise(function(resolve, reject) { + self._channelServicePromise.resolve = resolve; + self._channelServicePromise.reject = reject; + }); + } }

1 0

r1753 - oipf/emulator/js/services
by ygrego＠users.nuiton.org June 18, 2015

June 18, 2015

Author: ygrego Date: 2015-06-18 15:56:44 +0000 (Thu, 18 Jun 2015) New Revision: 1753 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1753 Log: Permit to bind to current channel. Modified: oipf/emulator/js/services/OIPFServices.js Modified: oipf/emulator/js/services/OIPFServices.js =================================================================== --- oipf/emulator/js/services/OIPFServices.js 2015-06-18 14:16:00 UTC (rev 1752) +++ oipf/emulator/js/services/OIPFServices.js 2015-06-18 15:56:44 UTC (rev 1753) @@ -16,8 +16,45 @@ return oipfObjectFactory.createRecordingSchedulerObject(); }); -OIPFServices.factory("VideoBroadcastService", function() { - return new Service(); -}); +OIPFServices.factory("VideoBroadcastService", ["$q", function(promise) { + var videoBroadcastService = new Service(); + var videoBroadcastObject = document.getElementById("videoBroadcast"); + if (videoBroadcastObject) { + + videoBroadcastService.videoBroadcastObject = videoBroadcastObject; + + } else { + + console.log("There is no video-broadcast object present in DOM!!!!"); + + } + + videoBroadcastService.promiseManager = promise; + + + videoBroadcastService.bindToCurrentChannel = function() { + + var deffered = this.promise.defer(); + + this.videoBroadcastObject.onPlayStateChange = + this.onChangeState.bind(this, deffered.resolve, deffered.reject); + + this.addTransition(videoBroadcastConstants.state.UNREALIZED, + videoBroadcastConstants.state.CONNECTING); + + this.addTransition(videoBroadcastConstants.sate.CONNECTING, + videoBroadcastConstants.state.PRESENTING, + deffered.resolve); + + this.videoBroadcastObject.bindToCurrentChannel(); + + return deffered; + }; + + return videoBroadcastService; +}]); + + +

1 0

r1752 - oipf/emulator/js/contollers
by ygrego＠users.nuiton.org June 18, 2015

June 18, 2015

Author: ygrego Date: 2015-06-18 14:16:00 +0000 (Thu, 18 Jun 2015) New Revision: 1752 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1752 Log: The video-broadacast oject getting don't have to be done in a controller instance but in a service. Modified: oipf/emulator/js/contollers/RemoteControlControllers.js Modified: oipf/emulator/js/contollers/RemoteControlControllers.js =================================================================== --- oipf/emulator/js/contollers/RemoteControlControllers.js 2015-06-18 13:37:10 UTC (rev 1751) +++ oipf/emulator/js/contollers/RemoteControlControllers.js 2015-06-18 14:16:00 UTC (rev 1752) @@ -115,14 +115,6 @@ $scope.videoBroadcastService = VideoBroadcastService; - var videoBroadcast = document.getElementById("videoBroadcast"); - - if (videoBroadcast) { - $scope.videoBroadcastService.videoBroadcast = videoBroadcast; - } else { - console.log("There is no video-broadcast object present in DOM!!!!"); - } - $scope.currentVolume = 50; $rootScope.channelInfo = false;

1 0

r1751 - oipf/emulator/js/contollers
by ygrego＠users.nuiton.org June 18, 2015

June 18, 2015

Author: ygrego Date: 2015-06-18 13:37:10 +0000 (Thu, 18 Jun 2015) New Revision: 1751 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1751 Log: Permit the emulation of a tv control in emulator for channel switching, ... Modified: oipf/emulator/js/contollers/RemoteControlControllers.js Modified: oipf/emulator/js/contollers/RemoteControlControllers.js =================================================================== --- oipf/emulator/js/contollers/RemoteControlControllers.js 2015-06-18 13:26:51 UTC (rev 1750) +++ oipf/emulator/js/contollers/RemoteControlControllers.js 2015-06-18 13:37:10 UTC (rev 1751) @@ -115,6 +115,14 @@ $scope.videoBroadcastService = VideoBroadcastService; + var videoBroadcast = document.getElementById("videoBroadcast"); + + if (videoBroadcast) { + $scope.videoBroadcastService.videoBroadcast = videoBroadcast; + } else { + console.log("There is no video-broadcast object present in DOM!!!!"); + } + $scope.currentVolume = 50; $rootScope.channelInfo = false;

1 0

r1750 - in oipf/emulator: js/contollers js/services view
by ygrego＠users.nuiton.org June 18, 2015

June 18, 2015

Author: ygrego Date: 2015-06-18 13:26:51 +0000 (Thu, 18 Jun 2015) New Revision: 1750 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1750 Log: Permit the access to the Service class. Modified: oipf/emulator/js/contollers/RemoteControlControllers.js oipf/emulator/js/services/OIPFServices.js oipf/emulator/view/index.html Modified: oipf/emulator/js/contollers/RemoteControlControllers.js =================================================================== --- oipf/emulator/js/contollers/RemoteControlControllers.js 2015-06-18 13:18:45 UTC (rev 1749) +++ oipf/emulator/js/contollers/RemoteControlControllers.js 2015-06-18 13:26:51 UTC (rev 1750) @@ -111,8 +111,10 @@ }]); RemoteControlControllers.controller("VideoBroadcastController", - ["$rootScope", "$scope", "$timeout", function($rootScope, $scope, $timeout) { + ["$rootScope", "$scope", "$timeout", "VideoBroadcastService", function($rootScope, $scope, $timeout, VideoBroadcastService) { + $scope.videoBroadcastService = VideoBroadcastService; + $scope.currentVolume = 50; $rootScope.channelInfo = false; Modified: oipf/emulator/js/services/OIPFServices.js =================================================================== --- oipf/emulator/js/services/OIPFServices.js 2015-06-18 13:18:45 UTC (rev 1749) +++ oipf/emulator/js/services/OIPFServices.js 2015-06-18 13:26:51 UTC (rev 1750) @@ -15,3 +15,9 @@ OIPFServices.factory("RecordingSchedulerService", function() { return oipfObjectFactory.createRecordingSchedulerObject(); }); + +OIPFServices.factory("VideoBroadcastService", function() { + return new Service(); +}); + + Modified: oipf/emulator/view/index.html =================================================================== --- oipf/emulator/view/index.html 2015-06-18 13:18:45 UTC (rev 1749) +++ oipf/emulator/view/index.html 2015-06-18 13:26:51 UTC (rev 1750) @@ -15,6 +15,7 @@ <script src="./lib/build/oipf-lib.js" type="text/javascript"></script> <script src="./emulator/node_modules/angular/angular.js"></script> <script src="./emulator/js/filters/VolumeFilter.js"></script> + <script src="./emulator/js/utils/Service.js"></script> <script src="./emulator/js/services/OIPFServices.js"></script> <script src="./emulator/js/contollers/RemoteControlControllers.js"></script> <script src="./emulator/js/emulator.js"></script>

1 0

r1749 - oipf/emulator/js/utils
by ygrego＠users.nuiton.org June 18, 2015

June 18, 2015

Author: ygrego Date: 2015-06-18 13:18:45 +0000 (Thu, 18 Jun 2015) New Revision: 1749 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1749 Log: The class TestCase isn't accesible in emulator environment. Modified: oipf/emulator/js/utils/Service.js Modified: oipf/emulator/js/utils/Service.js =================================================================== --- oipf/emulator/js/utils/Service.js 2015-06-18 12:58:53 UTC (rev 1748) +++ oipf/emulator/js/utils/Service.js 2015-06-18 13:18:45 UTC (rev 1749) @@ -1,17 +1,42 @@ var Service = Class.extend({ init: function() { + this.transitions = [] - this.currentTransition = {}; this.currentIndex = 0; - var testCase = new TestCase(); + this.onChangeState = function(resolve, reject, newState, errorCode) { + var currentTransition = this.transitions[this.currentIndex]; + var begin = currentTransition.begin; + var end = currentTransition.end; + var error = currentTransition.error; - if (testCase) { - this.onChangeState = testCase.onChangeState.bind(this); - this.addTransition = testCase.addTransition.bind(this); - this.addTransitionWithError = testCase.addTransitionWithError.bind(this); - } + if (begin == this.previousState && end == newState && error == errorCode) { + currentTransition.callback && currentTransition.callback(); + this.previousState = newState; + this.currentIndex++; + } else { + if (begin == this.CONNECTING && this.transitions.length == this.currentIndex + 1) { + reject("Untestable case for the moment."); + } else { + reject("Invalid state."); + } + } + }; + + this.addTransition = function(begin, end, callback) { + this.addTransitionWithError(begin, end, null, callback); + }; + + this.addTransitionWithError = function(begin, end, error, callback) { + this.transitions.push({ + begin: begin, + end: end, + error: error, + callback: callback + }); + }; + } });

1 0