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

r1718 - oipf/lib/js/impl
by ygrego＠users.nuiton.org 15 Jun '15

15 Jun '15

Author: ygrego Date: 2015-06-15 10:19:09 +0000 (Mon, 15 Jun 2015) New Revision: 1718 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1718 Log: When VideoBroadcastObject will be created(visually) the dimensions defined in the class will be used. Modified: oipf/lib/js/impl/VideoBroadcastObject.js Modified: oipf/lib/js/impl/VideoBroadcastObject.js =================================================================== --- oipf/lib/js/impl/VideoBroadcastObject.js 2015-06-15 08:26:54 UTC (rev 1717) +++ oipf/lib/js/impl/VideoBroadcastObject.js 2015-06-15 10:19:09 UTC (rev 1718) @@ -50,7 +50,7 @@ * the DOM Level 2 Style interfaces (i.e. CSS2Properties interface style.width ), at least for values * specified in pixels. */ - this.width = null; + this.width = "100%"; /* * Description: * The height of the area used for rendering the video object. This property is only writable if property @@ -59,7 +59,7 @@ * the DOM Level 2 Style interfaces (i.e. CSS2Properties interface style.height ), at least for values * specified in pixels. */ - this.heigth = null; + this.height = "100%"; /* * Description: @@ -74,7 +74,7 @@ * is read, the value returned SHALL always be the empty string. * Type: String */ - this.data = null; + this.data = ""; /*! * Description:

1 0

r1717 - oipf/emulator/view
by ygrego＠users.nuiton.org 15 Jun '15

15 Jun '15

Author: ygrego Date: 2015-06-15 08:26:54 +0000 (Mon, 15 Jun 2015) New Revision: 1717 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1717 Log: In order to display the main view of emulator. Modified: oipf/emulator/view/index.html Modified: oipf/emulator/view/index.html =================================================================== --- oipf/emulator/view/index.html 2015-06-15 08:26:06 UTC (rev 1716) +++ oipf/emulator/view/index.html 2015-06-15 08:26:54 UTC (rev 1717) @@ -9,6 +9,7 @@ <title>TV Emulator</title> <meta charset="UTF-8"> <meta name="viewport" content="width=device-width, initial-scale=1.0"> + <link rel="stylesheet" type="text/css" href="./emulator/css/main.css"> <link rel="stylesheet" type="text/css" href="./emulator/node_modules/bootstrap/dist/css/bootstrap.min.css"> <script src="./lib/build/oipf-lib.js" type="text/javascript"></script>

1 0

r1716 - oipf/emulator/js/contollers
by ygrego＠users.nuiton.org 15 Jun '15

15 Jun '15

Author: ygrego Date: 2015-06-15 08:26:06 +0000 (Mon, 15 Jun 2015) New Revision: 1716 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1716 Log: The get of file remoteControl.json was failed. Modified: oipf/emulator/js/contollers/RemoteControlControllers.js Modified: oipf/emulator/js/contollers/RemoteControlControllers.js =================================================================== --- oipf/emulator/js/contollers/RemoteControlControllers.js 2015-06-15 08:13:38 UTC (rev 1715) +++ oipf/emulator/js/contollers/RemoteControlControllers.js 2015-06-15 08:26:06 UTC (rev 1716) @@ -1,16 +1,16 @@ -/* +/* * To change this license header, choose License Headers in Project Properties. * To change this template file, choose Tools | Templates * and open the template in the editor. */ var RemoteControlControllers = angular.module('RemoteControlControllers', []); -RemoteControlControllers.controller('RemoteControlController', +RemoteControlControllers.controller('RemoteControlController', ['$scope', '$http', '$timeout', function ($scope, $http, $timeout) { - $http.get('remoteControl/remoteControl.json').success(function(data) { + $http.get('./emulator/remoteControl/remoteControl.json').success(function(data) { $scope.remoteControl = data; }); - + $scope.clickMapping = { "POWER": "setEmulatorON", "0": "setChannelByNumber", @@ -26,7 +26,7 @@ "V+": "setVolume", "V-": "setVolume", }; - + $scope.state = 'OFF'; $scope.channel = ""; $scope.channelNumber = ""; @@ -34,17 +34,17 @@ $scope.volumeViewActive = false; $scope.emulatorON = false; $scope.currentVolume = 50; - + $scope.setSate = function() { }; - + $scope.setEmulatorON = function() { $scope.emulatorON = !$scope.emulatorON; }; $scope.setChannelByNumber = function(buttonId) { $scope.channelNumberActive = true; - + if ($scope.channel.length == 0) { $timeout(function() { $scope.channel = $scope.channelNumber.toString(); @@ -53,9 +53,9 @@ }, 3000); } $scope.channelNumber += buttonId; - + }; - + $scope.setVolume = function(buttonId) { $scope.volumeViewActive = true; if (buttonId == "V+" && $scope.currentVolume < 100) { @@ -67,7 +67,7 @@ $scope.volumeViewActive = false; }, 3000); }; - + $scope.remoteControlClick = function(buttonId) { var methodName = $scope.clickMapping[buttonId]; console.log("methodName:", methodName, $scope[methodName]);

1 0

r1715 - oipf/emulator/view
by ygrego＠users.nuiton.org 15 Jun '15

15 Jun '15

Author: ygrego Date: 2015-06-15 08:13:38 +0000 (Mon, 15 Jun 2015) New Revision: 1715 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1715 Log: Access to ressources necessary for the emulator. Modified: oipf/emulator/view/index.html Modified: oipf/emulator/view/index.html =================================================================== --- oipf/emulator/view/index.html 2015-06-15 07:48:16 UTC (rev 1714) +++ oipf/emulator/view/index.html 2015-06-15 08:13:38 UTC (rev 1715) @@ -9,12 +9,13 @@ <title>TV Emulator</title> <meta charset="UTF-8"> <meta name="viewport" content="width=device-width, initial-scale=1.0"> - <link rel="stylesheet" type="text/css" href="../node_modules/bootstrap/dist/css/bootstrap.min.css"> + <link rel="stylesheet" type="text/css" href="./emulator/node_modules/bootstrap/dist/css/bootstrap.min.css"> - <script src="../node_modules/angular/angular.js"></script> - <script src="../js/filters/VolumeFilter.js"></script> - <script src="../js/contollers/RemoteControlControllers.js"></script> - <script src="../js/emulator.js"></script> + <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/contollers/RemoteControlControllers.js"></script> + <script src="./emulator/js/emulator.js"></script> </head> <body>

1 0

r1714 - oipf/lib/js/impl
by ygrego＠users.nuiton.org 15 Jun '15

15 Jun '15

Author: ygrego Date: 2015-06-15 07:48:16 +0000 (Mon, 15 Jun 2015) New Revision: 1714 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1714 Log: Method useful for activate or deactivate an application. Modified: oipf/lib/js/impl/ApplicationManagerObject.js Modified: oipf/lib/js/impl/ApplicationManagerObject.js =================================================================== --- oipf/lib/js/impl/ApplicationManagerObject.js 2015-06-15 07:46:04 UTC (rev 1713) +++ oipf/lib/js/impl/ApplicationManagerObject.js 2015-06-15 07:48:16 UTC (rev 1714) @@ -189,4 +189,16 @@ return this._applicationVisualizationMode; } + _removeFromActiveList(app) { + this._activeApplicationsList = this._activeApplicationsList.filter(function(itemList) { + return itemList.window != app.window; + }); + } + + _removeFromVisibleList(app) { + this._visibleApplicationsList = this._visibleApplicationsList.filter(function(itemList) { + return itemList.window != app.window; + }); + } + }

1 0

r1713 - oipf/emulator
by ygrego＠users.nuiton.org 15 Jun '15

15 Jun '15

Author: ygrego Date: 2015-06-15 07:46:04 +0000 (Mon, 15 Jun 2015) New Revision: 1713 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1713 Log: Make accessible the directory lib. Modified: oipf/emulator/server.js Modified: oipf/emulator/server.js =================================================================== --- oipf/emulator/server.js 2015-06-15 07:41:10 UTC (rev 1712) +++ oipf/emulator/server.js 2015-06-15 07:46:04 UTC (rev 1713) @@ -1,12 +1,12 @@ -var express = require('express'); +var express = require("express"); var app = express(); -app.use(express.static('.')); +app.use(express.static("..")); -app.get('/', function(req, res){ - res.sendFile('view/index.html', {root: "."}); -}); +app.get("/", function(req, res) { + res.sendFile("view/index.html", {root: "."}); +}) app.listen(4000); -console.log('Server running at http://192.168.99.190:4000/'); +console.log("Server running at http://localhost:4000/");

1 0

r1712 - oipf/emulator/view
by ygrego＠users.nuiton.org 15 Jun '15

15 Jun '15

Author: ygrego Date: 2015-06-15 07:41:10 +0000 (Mon, 15 Jun 2015) New Revision: 1712 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1712 Log: Unnecessary files. Modified: oipf/emulator/view/index.html Modified: oipf/emulator/view/index.html =================================================================== --- oipf/emulator/view/index.html 2015-06-12 14:23:16 UTC (rev 1711) +++ oipf/emulator/view/index.html 2015-06-15 07:41:10 UTC (rev 1712) @@ -9,92 +9,25 @@ <title>TV Emulator</title> <meta charset="UTF-8"> <meta name="viewport" content="width=device-width, initial-scale=1.0"> - <link rel="stylesheet" type="text/css" href="../css/main.css"/> <link rel="stylesheet" type="text/css" href="../node_modules/bootstrap/dist/css/bootstrap.min.css"> - - <script src="../js/impl/model/constants/VideoBroadcastConstants.js" type="text/javascript"></script> - <script src="../js/impl/model/constants/ParentalControlManagerConstants.js" type="text/javascript"></script> - <script src="../js/impl/model/constants/RecordingSchedulerConstants.js" type="text/javascript"></script> - <script src="../js/impl/model/constants/ConfigurationConstants.js" type="text/javascript"></script> - <script src="../js/impl/model/constants/MetadataSearchConstants.js" type="text/javascript"></script> - <script src="../js/impl/model/constants/DaeMimeType.js" type="text/javascript"></script> - <script src="../js/impl/model/constants/IdType.js" type="text/javascript"></script> - - <script src="../js/lib/Class.js" type="text/javascript"></script> - <script src="../js/utils/Timeout.js" type="text/javascript"></script> - <script src="../js/utils/Calculation.js" type="text/javascript"></script> - <script src="../js/utils/ChannelUtils.js" type="text/javascript"></script> - <script src="../js/utils/Utils.js" type="text/javascript"></script> - <script src="../js/utils/EventManager.js" type="text/javascript"></script> - <script src="../js/utils/TimerManager.js" type="text/javascript"></script> - <script src="../js/utils/TimerRecordingManager.js" type="text/javascript"></script> - <script src="../js/utils/MetadataManager.js" type="text/javascript"></script> - <script src="../js/utils/DateUtils.js" type="text/javascript"></script> - <script src="../js/utils/XmlParser.js" type="text/javascript"></script> - <script src="../js/utils/ProgrammeService.js" type="text/javascript"></script> - <script src="../js/utils/XmlToJson.js" type="text/javascript"></script> - <script src="../js/utils/ProgrammeHelper.js" type="text/javascript"></script> - - <script src="../configuration/ConfigDefaultProperties.js" type="text/javascript"></script> - <script src="../configuration/CapabilitiesProperties.js" type="text/javascript"></script> - <script src="../configuration/OipfConfiguration.js" type="text/javascript"></script> - - <script src="../js/impl/model/Collection.js" type="text/javascript"></script> - <script src="../js/impl/model/SignalInfo.js" type="text/javascript"></script> - <script src="../js/impl/model/LNBInfo.js" type="text/javascript"></script> - <script src="../js/impl/model/NetworkInterface.js" type="text/javascript"></script> - <script src="../js/impl/model/FavouriteList.js" type="text/javascript"></script> - <script src="../js/impl/model/Programme.js" type="text/javascript"></script> - <script src="../js/impl/model/AVOutput.js" type="text/javascript"></script> - <script src="../js/impl/model/Tuner.js" type="text/javascript"></script> - <script src="../js/impl/model/IntegerCollection.js" type="text/javascript"></script> - <script src="../js/impl/model/AVOutputCollection.js" type="text/javascript"></script> - <script src="../js/impl/model/TunerCollection.js" type="text/javascript"></script> - <script src="../js/impl/model/NetworkInterfaceCollection.js" type="text/javascript"></script> - <script src="../js/impl/model/FavouriteListCollection.js" type="text/javascript"></script> - <script src="../js/impl/model/ScheduledRecordingCollection.js" type="text/javascript"></script> - <script src="../js/impl/model/Query.js" type="text/javascript"></script> - <script src="../js/impl/model/Configuration.js" type="text/javascript"></script> - <script src="../js/impl/model/LocalSystem.js" type="text/javascript"></script> - <script src="../js/impl/model/Channel.js" type="text/javascript"></script> - <script src="../js/impl/model/ChannelList.js" type="text/javascript"></script> - <script src="../js/impl/model/MetadataSearch.js" type="text/javascript"></script> - <script src="../js/impl/model/SearchResults.js" type="text/javascript"></script> - <script src="../js/impl/model/ScheduledRecording.js" type="text/javascript"></script> - <script src="../js/impl/model/Recording.js" type="text/javascript"></script> - <script src="../js/impl/model/Application.js" type="text/javascript"></script> - - <script src="../js/impl/OipfObjectFactory.js" type="text/javascript"></script> - <script src="../js/impl/ConfigurationObject.js" type="text/javascript"></script> - <script src="../js/impl/ChannelConfig.js" type="text/javascript"></script> - <script src="../js/impl/VideoBroadcastObject.js" type="text/javascript"></script> - <script src="../js/impl/SearchManagerObject.js" type="text/javascript"></script> - <script src="../js/impl/RecordingSchedulerObject.js" type="text/javascript"></script> - <script src="../js/impl/CapabilitiesObject.js" type="text/javascript"></script> - <script src="../js/impl/ParentalControlManagerObject.js" type="text/javascript"></script> - <script src="../js/impl/ApplicationManagerObject.js" type="text/javascript"></script> - - <script src="../js/utils/ChannelService.js" type="text/javascript"></script> - <script src="../js/impl/model/ModelFactory.js" type="text/javascript"></script> - <script src="../init/init.js" type="text/javascript"></script> - + <script src="../node_modules/angular/angular.js"></script> <script src="../js/filters/VolumeFilter.js"></script> <script src="../js/contollers/RemoteControlControllers.js"></script> <script src="../js/emulator.js"></script> - + </head> <body> - + <div class="container-fluid" ng-controller="RemoteControlController"> <div class="row"> <div id="emulator" class="col-md-9"> - + <div id="volumeView" class="text-center" ng-show="volumeViewActive"> <div> <h3> <span class="label label-default"> - {{currentVolume}} + {{currentVolume}} <span class="glyphicon glyphicon-volume-up"></span> </span> </h3> @@ -104,26 +37,26 @@ </div> </div> </div> - </div> - + </div> + <div id="imgChannel" class="text-center" ng-show="emulatorON"> <h1>{{channel}}</h1> </div> - + <div id="channelNumberSwitchView" class="text-center" ng-show="channelNumberActive"> <span class="badge">{{channelNumber}}</span> </div> - + </div> - + <div class="col-sm-2 col-sm-offset-1"> - + <div class="panel panel-default"> <div class="panel-body"> <div class="row"> <div class="col-md-2 col-md-offset-2"> <button type="button" class="btn btn-default btn-sm" ng-click="remoteControlClick('POWER')"> - <span class="glyphicon glyphicon-off"></span> + <span class="glyphicon glyphicon-off"></span> </button> </div> </div> @@ -140,7 +73,7 @@ </div> <div class="col-md-2"> <button type="button" class="btn btn-default btn-sm" ng-click="remoteControlClick('3')"> - <span>3</span> + <span>3</span> </button> </div> </div> @@ -157,7 +90,7 @@ </div> <div class="col-md-2"> <button type="button" class="btn btn-default btn-sm" ng-click="remoteControlClick('6')"> - <span>6</span> + <span>6</span> </button> </div> </div> @@ -174,14 +107,14 @@ </div> <div class="col-md-2"> <button type="button" class="btn btn-default btn-sm" ng-click="remoteControlClick('9')"> - <span>9</span> + <span>9</span> </button> </div> </div> <div class="row"> <div class="col-md-2 col-md-offset-2"> <button type="button" class="btn btn-default btn-sm" ng-click="remoteControlClick('0')"> - <span>0</span> + <span>0</span> </button> </div> </div> @@ -218,31 +151,31 @@ </div> </div> </div> - + </div> - +  - + </div> </div> - - - + </body> -</html> \ No newline at end of file +</html>

1 0

r1711 - oipf/lib/js/impl
by ygrego＠users.nuiton.org 12 Jun '15

12 Jun '15

Author: ygrego Date: 2015-06-12 14:23:16 +0000 (Fri, 12 Jun 2015) New Revision: 1711 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1711 Log: Avoid the duplication of somes properties, unnecessary. Modified: oipf/lib/js/impl/ApplicationManagerObject.js Modified: oipf/lib/js/impl/ApplicationManagerObject.js =================================================================== --- oipf/lib/js/impl/ApplicationManagerObject.js 2015-06-12 14:11:54 UTC (rev 1710) +++ oipf/lib/js/impl/ApplicationManagerObject.js 2015-06-12 14:23:16 UTC (rev 1711) @@ -160,23 +160,19 @@ this.widgets = null; this._currentApplication = null; - this._rootApplication = null; + this._hiddenSystemRootNode = []; + this._activeApplicationsList = new ApplicationCollection(); + this._visibleApplicationsList = new ApplicationCollection(); - this._hiddenSystemRootNode = null; - - this._activeApplicationsList = null; - - this._visibleApplicationsList = null; this._applicationVisualizationMode = applicationVisualizationMode; + this._listeners = {}; this._callbacks = {}; this._eventManager = new EventManager(); - this._timerManager = new TimerManager(); this._timeout = this._timerManager.createTimer.bind(this._timerManager, 0); - this._hiddenSystemRootNode = []; - this._activeApplicationsList = new ApplicationCollection(); + this._createRootApplication(); }

1 0

r1710 - oipf/test/js
by ygrego＠users.nuiton.org 12 Jun '15

12 Jun '15

Author: ygrego Date: 2015-06-12 14:11:54 +0000 (Fri, 12 Jun 2015) New Revision: 1710 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1710 Log: The VideoBroadcastObject must be created only one time. Modified: oipf/test/js/TestConfig.js Modified: oipf/test/js/TestConfig.js =================================================================== --- oipf/test/js/TestConfig.js 2015-06-12 14:06:48 UTC (rev 1709) +++ oipf/test/js/TestConfig.js 2015-06-12 14:11:54 UTC (rev 1710) @@ -171,11 +171,7 @@ this.blocked = function() {}; this.bindToCurrentChannel = this.blocked; this.onChangeState = this.blocked; - this.createVideoBroadcast = function() { - if (!this.vidBroadObj) { - this.vidBroadObj = oipfObjectFactory.createVideoBroadcastObject(); - } - } + this.createVideoBroadcastObject = this.blocked; } onPVREvent(resolve, reject, event) {

1 0

r1709 - oipf/test/js
by ygrego＠users.nuiton.org 12 Jun '15

12 Jun '15

Author: ygrego Date: 2015-06-12 14:06:48 +0000 (Fri, 12 Jun 2015) New Revision: 1709 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1709 Log: The method which will use this variable waits a 'String'. Modified: oipf/test/js/SearchManagerTest.js Modified: oipf/test/js/SearchManagerTest.js =================================================================== --- oipf/test/js/SearchManagerTest.js 2015-06-12 12:37:33 UTC (rev 1708) +++ oipf/test/js/SearchManagerTest.js 2015-06-12 14:06:48 UTC (rev 1709) @@ -182,7 +182,7 @@ testSearchingForProgrammesWithDurationLowerThanOneHour(resolve, reject) { var self = this; - var value = 3600; + var value = "3600"; this.addTransition(this.UNREALIZED, this.CONNECTING);

1 0