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

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

15 Jun '15

Author: ygrego Date: 2015-06-15 10:51:32 +0000 (Mon, 15 Jun 2015) New Revision: 1724 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1724 Log: No more necessary. Removed: oipf/emulator/js/servicesRecipes/

1 0

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

15 Jun '15

Author: ygrego Date: 2015-06-15 10:50:14 +0000 (Mon, 15 Jun 2015) New Revision: 1723 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1723 Log: Permit to activate and deactivate an application. Modified: oipf/lib/js/impl/model/Application.js Modified: oipf/lib/js/impl/model/Application.js =================================================================== --- oipf/lib/js/impl/model/Application.js 2015-06-15 10:41:45 UTC (rev 1722) +++ oipf/lib/js/impl/model/Application.js 2015-06-15 10:50:14 UTC (rev 1723) @@ -183,9 +183,26 @@ * the value for argument gainFocus. */ activateInput(gainFocus) { + if (this._applicationManager.getApplicationVisualizationMode() == 1 || + this._applicationManager.getApplicationVisualizationMode() == 2) { + this.active = true; + } } + /** + * [[Description]] + * Remove the application from the active applications list. This has no effect on the + * lifecycle of the application and MAY have no effect on the resources it uses. Applications + * which are not active will receive no cross-application events, unless their Application + * object is the target of the event (as for the events defined in section 7.2.6). Applications + * may still be manipulated via their Application object or their DOM tree. + */ + deactivateInput() { + this.active = false; + this._applicationManager._removeFromActiveList(this); + } + _setWindow(windowApp) { this.window = {}; if (windowApp && windowApp.postMessage) {

1 0

r1722 - oipf/lib/configuration
by ygrego＠users.nuiton.org 15 Jun '15

15 Jun '15

Author: ygrego Date: 2015-06-15 10:41:45 +0000 (Mon, 15 Jun 2015) New Revision: 1722 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1722 Log: Delete some warnings. Modified: oipf/lib/configuration/ConfigDefaultProperties.js Modified: oipf/lib/configuration/ConfigDefaultProperties.js =================================================================== --- oipf/lib/configuration/ConfigDefaultProperties.js 2015-06-15 10:37:50 UTC (rev 1721) +++ oipf/lib/configuration/ConfigDefaultProperties.js 2015-06-15 10:41:45 UTC (rev 1722) @@ -11,7 +11,7 @@ this.restrictedPowerState = { 0: false, // OFF 6: true // FACTORY_RESET - }, + }; this.tvStandardsSupported = { 1: true, @@ -19,13 +19,13 @@ 4: true, 8: true, 16: true - }, + }; this.screenSize = { "1280x720": true, //HD 720 "1920x1080": true, //HD 1080 "640x480": true //VGA - }, + }; this.configuration = { preferredAudioLanguage: "fra",

1 0

r1721 - oipf/lib/configuration
by ygrego＠users.nuiton.org 15 Jun '15

15 Jun '15

Author: ygrego Date: 2015-06-15 10:37:50 +0000 (Mon, 15 Jun 2015) New Revision: 1721 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1721 Log: Permit to change power state in emulator. Modified: oipf/lib/configuration/ConfigDefaultProperties.js Modified: oipf/lib/configuration/ConfigDefaultProperties.js =================================================================== --- oipf/lib/configuration/ConfigDefaultProperties.js 2015-06-15 10:26:56 UTC (rev 1720) +++ oipf/lib/configuration/ConfigDefaultProperties.js 2015-06-15 10:37:50 UTC (rev 1721) @@ -9,7 +9,7 @@ constructor() { this.restrictedPowerState = { - 0: true, // OFF + 0: false, // OFF 6: true // FACTORY_RESET },

1 0

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

15 Jun '15

Author: ygrego Date: 2015-06-15 10:26:56 +0000 (Mon, 15 Jun 2015) New Revision: 1720 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1720 Log: We must see appear a video-broadcast object in emulator. Modified: oipf/emulator/view/index.html Modified: oipf/emulator/view/index.html =================================================================== --- oipf/emulator/view/index.html 2015-06-15 10:24:25 UTC (rev 1719) +++ oipf/emulator/view/index.html 2015-06-15 10:26:56 UTC (rev 1720) @@ -40,10 +40,11 @@ </div> </div> </div> + <object is="video-broadcast"></object> - <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>

1 0

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

15 Jun '15

Author: ygrego Date: 2015-06-15 10:24:25 +0000 (Mon, 15 Jun 2015) New Revision: 1719 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1719 Log: Make a video-broadcast object visible when it is present in DOM. Modified: oipf/emulator/css/main.css Modified: oipf/emulator/css/main.css =================================================================== --- oipf/emulator/css/main.css 2015-06-15 10:19:09 UTC (rev 1718) +++ oipf/emulator/css/main.css 2015-06-15 10:24:25 UTC (rev 1719) @@ -3,7 +3,7 @@ To change this template file, choose Tools | Templates and open the template in the editor. */ -/* +/* Created on : 3 juin 2015, 11:33:14 Author : root */ @@ -77,7 +77,7 @@ width: 15%; height: 5%; position: absolute; - right: 2em; + right: 2em; bottom: 6em; } @@ -85,7 +85,7 @@ width: 10%; height: 5%; position: absolute; - top: 2em; + top: 2em; left: 2em; } @@ -94,4 +94,8 @@ position: absolute; right: 50%; bottom: 50%; -} \ No newline at end of file +} + +object { + background-color: slategrey; +}

1 0

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