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

r1668 - oipf/lib/js/utils
by ygrego＠users.nuiton.org 09 Jun '15

09 Jun '15

Author: ygrego Date: 2015-06-09 15:39:44 +0000 (Tue, 09 Jun 2015) New Revision: 1668 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1668 Log: Refactoring of the class DRMSystem in an ES6 class. Modified: oipf/lib/js/utils/DRMSystem.js Modified: oipf/lib/js/utils/DRMSystem.js =================================================================== --- oipf/lib/js/utils/DRMSystem.js 2015-06-09 15:39:35 UTC (rev 1667) +++ oipf/lib/js/utils/DRMSystem.js 2015-06-09 15:39:44 UTC (rev 1668) @@ -1,16 +1,15 @@ -/* - * - * - * +/* + * + * + * */ +class DRMSytem { -var DRMSytem = Class.extend({ - - init: function(name, id, status, contentId, privateData) { + constructor(name, id, status, contentId, privateData) { this.name = name; this.id = id; this.status = status; this.contentId = contentId; this.privateData = privateData; } -}); +}

1 0

r1667 - oipf/lib/js/impl/model
by smaisonneuve＠users.nuiton.org 09 Jun '15

09 Jun '15

Author: smaisonneuve Date: 2015-06-09 15:39:35 +0000 (Tue, 09 Jun 2015) New Revision: 1667 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1667 Log: [Refactor] Turning SignalInfo into es6 class Modified: oipf/lib/js/impl/model/SignalInfo.js Modified: oipf/lib/js/impl/model/SignalInfo.js =================================================================== --- oipf/lib/js/impl/model/SignalInfo.js 2015-06-09 15:38:00 UTC (rev 1666) +++ oipf/lib/js/impl/model/SignalInfo.js 2015-06-09 15:39:35 UTC (rev 1667) @@ -1,56 +1,56 @@ -/* - * The SignalInfo object provides details on the signal strength of the tuner. - * If the tuner is not tuned to a transponder the all properties SHALL have +/* + * The SignalInfo object provides details on the signal strength of the tuner. + * If the tuner is not tuned to a transponder the all properties SHALL have * the value undefined . - * + * */ -var SignalInfo = Class.extend({ - - /* - * Description: - * Signal strength measured in dBm, for example -31.5dBm. - * - * Type: readonly Number - */ - strength: null, - - /* - * Description: - * Signal quality with range from 0 to 100. Calculation of quality is a - * function of ber and snr . The specification remains silent as to - * how the calculation is made. - * - * Type: readonly Integer - */ - quality: null, - - /* - * Description: - * Bit error rate. - * - * Type: readonly Integer - */ - ber: null, - - /* - * Description: - * Signal to noise ratio (dB), for example 22.3dB. - * - * Type: readonly Number - */ - snr: null, - - /* - * Description: - * True if the tuner is locked to a transponder. - * - * Type: readonly Boolean - */ - lock: null, - - init: function(defaultProperties) { +class SignalInfo { + + constructor(defaultProperties) { oipf.utils.initProperties.call(this, defaultProperties); + + /* + * Description: + * Signal strength measured in dBm, for example -31.5dBm. + * + * Type: readonly Number + */ + this.strength = null; + + /* + * Description: + * Signal quality with range from 0 to 100. Calculation of quality is a + * function of ber and snr . The specification remains silent as to + * how the calculation is made. + * + * Type: readonly Integer + */ + this.quality = null; + + /* + * Description: + * Bit error rate. + * + * Type: readonly Integer + */ + this.ber = null; + + /* + * Description: + * Signal to noise ratio (dB), for example 22.3dB. + * + * Type: readonly Number + */ + this.snr = null; + + /* + * Description: + * True if the tuner is locked to a transponder. + * + * Type: readonly Boolean + */ + this.lock = null; } -}); +}

1 0

r1666 - oipf/lib/js/impl/model
by smaisonneuve＠users.nuiton.org 09 Jun '15

09 Jun '15

Author: smaisonneuve Date: 2015-06-09 15:38:00 +0000 (Tue, 09 Jun 2015) New Revision: 1666 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1666 Log: [Refactor] Turning Source into es6 class Modified: oipf/lib/js/impl/model/Source.js Modified: oipf/lib/js/impl/model/Source.js =================================================================== --- oipf/lib/js/impl/model/Source.js 2015-06-09 15:37:51 UTC (rev 1665) +++ oipf/lib/js/impl/model/Source.js 2015-06-09 15:38:00 UTC (rev 1666) @@ -1,24 +1,19 @@ -/* - * Just a object which represent the access to broadcasted contents.s - * +/* + * Just a object which represent the access to broadcasted contents.s + * */ -var Source = Class.extend({ - - currentChannel: null, - - tuner: null, - - init: function(currentChannel) { +class Source { + + constructor(currentChannel) { + this.tuner = null; this.currentChannel = currentChannel; - }, - - switch: function(tuner, channel, vidBroadObjTenantID){ + } + + switch(tuner, channel, vidBroadObjTenantID) { this.currentChannel = channel; this.tuner = tuner; this.tuner._tenant = vidBroadObjTenantID; - - } -}); - + } +}

1 0

r1665 - oipf/lib/js/utils
by ygrego＠users.nuiton.org 09 Jun '15

09 Jun '15

Author: ygrego Date: 2015-06-09 15:37:51 +0000 (Tue, 09 Jun 2015) New Revision: 1665 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1665 Log: Deletion of unused class Displayer. Removed: oipf/lib/js/utils/Displayer.js Deleted: oipf/lib/js/utils/Displayer.js =================================================================== --- oipf/lib/js/utils/Displayer.js 2015-06-09 15:36:42 UTC (rev 1664) +++ oipf/lib/js/utils/Displayer.js 2015-06-09 15:37:51 UTC (rev 1665) @@ -1,53 +0,0 @@ -/* - * 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 Displayer = Class.extend({ - - init : function() { - }, - - appendChildFromTab : function(id, tab) { - - for(var keys in tab){ - var p = document.createElement("P"); - var t = document.createTextNode(keys+": "+tab[keys]); - p.appendChild(t); - document.getElementById(id).appendChild(p); - } - - }, - - currentProgramInfo : function() { - - for (var i = 0; i< search.result.length; i++) { - var obj = search.result[i]; - console.log(obj); - var keys = Object.keys(obj); - console.log(keys); - //for (var j = 0; j< keys.length; j++) { - for (keys in obj){ - if (obj[keys] instanceof Object) { - - continue; - } - ////Test kind of obj - var h2 = document.createElement("H2"); - var t = document.createTextNode(keys); - h2.appendChild(t); - document.getElementById("prog").appendChild(h2); - var hr = document.createElement("HR"); - var p = document.createElement("P"); - t = document.createTextNode(obj[keys]); - p.appendChild(t); - document.getElementById("prog").appendChild(p); - document.getElementById("prog").appendChild(hr); - //break; - } - break; - } - document.getElementById("prog").style.visibility = "visible"; - } - -});

1 0

r1664 - oipf/lib/js/impl/model
by smaisonneuve＠users.nuiton.org 09 Jun '15

09 Jun '15

Author: smaisonneuve Date: 2015-06-09 15:36:42 +0000 (Tue, 09 Jun 2015) New Revision: 1664 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1664 Log: [Refactor] Turning Tuner into es6 class Modified: oipf/lib/js/impl/model/Tuner.js Modified: oipf/lib/js/impl/model/Tuner.js =================================================================== --- oipf/lib/js/impl/model/Tuner.js 2015-06-09 15:35:28 UTC (rev 1663) +++ oipf/lib/js/impl/model/Tuner.js 2015-06-09 15:36:42 UTC (rev 1664) @@ -13,7 +13,9 @@ */ class Tuner { - constructor() { + constructor(name, idTypes, defaultProperties) { + oipf.utils.initProperties.call(this, defaultProperties); + /* * Description: A unique identifier of the tuner. * @@ -26,7 +28,7 @@ * * Visibility Type: readonly String */ - this.name = null; + this.name = name; /* * Description: Returns a collection of the types supported by the tuner. The types are according to the ID types in section @@ -34,7 +36,7 @@ * * Visibility Type: readonly IntegerCollection */ - this.idTypes = null; + this.idTypes = idTypes; /* * Description: @@ -93,10 +95,4 @@ */ this.powerOnExternal = null; } - - init(name, idTypes, defaultProperties) { - oipf.utils.initProperties.call(this, defaultProperties); - this.idTypes = idTypes; - this.name = name; - } }

1 0

r1663 - oipf/lib/js/impl/model
by smaisonneuve＠users.nuiton.org 09 Jun '15

09 Jun '15

Author: smaisonneuve Date: 2015-06-09 15:35:28 +0000 (Tue, 09 Jun 2015) New Revision: 1663 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1663 Log: [Refactor] Turning StartupInformation into es6 class Modified: oipf/lib/js/impl/model/StartupInformation.js Modified: oipf/lib/js/impl/model/StartupInformation.js =================================================================== --- oipf/lib/js/impl/model/StartupInformation.js 2015-06-09 15:34:02 UTC (rev 1662) +++ oipf/lib/js/impl/model/StartupInformation.js 2015-06-09 15:35:28 UTC (rev 1663) @@ -1,35 +1,31 @@ -/* +/* * 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 StartupInformation = Class.extend({ - - /* - * Description: - * The mechanism used to obtain the url property. - * Any of the STARTUP_URL_* values defined in section 7.3.3.1 are valid. - * - * Visibility Type : readonly String - */ - urlSource: null, - - /* - * Description: - * The URL used at startup of the OITF. - * If the urlSource property is STARTUP_URL_NONE then - * the value of this property SHALL be NULL. - * If the urlSource property is STARTUP_URL_PRECONFIGURED then - * the value of this property SHALL be undefined. - * - * Visibility Type : readonly String - */ - url: null, - - init: function(urlSource, url) { +class StartupInformation { + + constructor(urlSource, url) { + /* + * Description: + * The mechanism used to obtain the url property. + * Any of the STARTUP_URL_* values defined in section 7.3.3.1 are valid. + * + * Visibility Type : readonly String + */ this.urlSource = urlSource; + + /* + * Description: + * The URL used at startup of the OITF. + * If the urlSource property is STARTUP_URL_NONE then + * the value of this property SHALL be NULL. + * If the urlSource property is STARTUP_URL_PRECONFIGURED then + * the value of this property SHALL be undefined. + * + * Visibility Type : readonly String + */ this.url = url; } - -}); +}

1 0

r1662 - oipf/lib/js/utils
by ygrego＠users.nuiton.org 09 Jun '15

09 Jun '15

Author: ygrego Date: 2015-06-09 15:34:02 +0000 (Tue, 09 Jun 2015) New Revision: 1662 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1662 Log: Refactoring of the class DateUtils in order to add space symbol in method constructor. Modified: oipf/lib/js/utils/DateUtils.js Modified: oipf/lib/js/utils/DateUtils.js =================================================================== --- oipf/lib/js/utils/DateUtils.js 2015-06-09 15:33:37 UTC (rev 1661) +++ oipf/lib/js/utils/DateUtils.js 2015-06-09 15:34:02 UTC (rev 1662) @@ -10,7 +10,7 @@ this.date = new Date(); this._yesterday = new Date(this.date.getFullYear(), this.date.getUTCMonth(), - this.date.getUTCDate()-1); + this.date.getUTCDate() - 1); } millisecondsToSeconds(timeInMilliseconds) {

1 0

r1661 - oipf/lib
by smaisonneuve＠users.nuiton.org 09 Jun '15

09 Jun '15

Author: smaisonneuve Date: 2015-06-09 15:33:37 +0000 (Tue, 09 Jun 2015) New Revision: 1661 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1661 Log: [Build] Fixing syntax in gulpfile Modified: oipf/lib/gulpfile.js Modified: oipf/lib/gulpfile.js =================================================================== --- oipf/lib/gulpfile.js 2015-06-09 15:32:54 UTC (rev 1660) +++ oipf/lib/gulpfile.js 2015-06-09 15:33:37 UTC (rev 1661) @@ -1,5 +1,5 @@ var gulp = require("gulp"); -var gulpSequence = require('gulp-sequence'); +var gulpSequence = require("gulp-sequence"); var concat = require("gulp-concat"); var sourcemaps = require("gulp-sourcemaps"); var babel = require("gulp-babel");

1 0

r1660 - in oipf/lib: . js/impl/model
by smaisonneuve＠users.nuiton.org 09 Jun '15

09 Jun '15

Author: smaisonneuve Date: 2015-06-09 15:32:54 +0000 (Tue, 09 Jun 2015) New Revision: 1660 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1660 Log: [Refactor] Moving Tuner and TunerCollection into es6 classes Modified: oipf/lib/gulpfile.js oipf/lib/js/impl/model/Tuner.js oipf/lib/js/impl/model/TunerCollection.js Modified: oipf/lib/gulpfile.js =================================================================== --- oipf/lib/gulpfile.js 2015-06-09 15:31:49 UTC (rev 1659) +++ oipf/lib/gulpfile.js 2015-06-09 15:32:54 UTC (rev 1660) @@ -42,7 +42,7 @@ "minification.propertyLiterals", "utility.inlineEnvironmentVariables" ], - compact: true + compact: false })) .on("error", errorHandler) .pipe(concat(conf.buildFile)) Modified: oipf/lib/js/impl/model/Tuner.js =================================================================== --- oipf/lib/js/impl/model/Tuner.js 2015-06-09 15:31:49 UTC (rev 1659) +++ oipf/lib/js/impl/model/Tuner.js 2015-06-09 15:32:54 UTC (rev 1660) @@ -8,90 +8,95 @@ * attribute of the <video_broadcast> element. * NOTE: An OITF may contain a physical tuner that has its capabilities split into multiple Tuner objects to fit the * restrictions on the <video_broadcast> element outlined above and in section 9.3.1. -* +* * Note: The standbyState property has been removed from this class. */ -var Tuner = Class.extend({ - - /* - * Description: A unique identifier of the tuner. - * - * Visibility Type: readonly Integer - */ - id: null, - - /* - * Description: The name of the tuner as designated in OITF. - * - * Visibility Type: readonly String - */ - name: null, - - /* - * Description: Returns a collection of the types supported by the tuner. The types are according to the ID types in section 7.13.11.1 under Channel object. - * - * Visibility Type: readonly IntegerCollection - */ - idTypes: null, - - /* - * Description: - * The property enables ( true ) and disables ( false ) the tuner. Reading the property provides the current - * state, enabled or disabled. Attempting to disable the tuner while the resource is in use has no effect and the tuner SHALL continue to be enabled. - * While disabled: - * • any external power feed (if applicable) SHALL be turned off; - * • the value of the signalInfo property is not defined; - * • the value of the lnbInfo property is not defined; - * • the tuner SHALL NOT be available for use by any JavaScript object (e.g. the video/broadcast object) or by the underlying OITF system (e.g. to perform a * scheduled recording). Note the property enableTuner is available in order to re-enable the tuner and get access to the tuner again. - * - * The set value of the property SHALL persist after OITF restarts. - * - * Type: Boolean - */ - enableTuner: null, - - /* - * Description: The property returns a SignalInfo object with signal information for example signal strength. - * - * Visibility Type: readonly SignalInfo - */ - signalInfo: null, - - /* - * Description: The property returns a LNBInfo object with information regarding the LNB associated with the tuner. - * - * Visibility Type: readonly LNBInfo - */ - lnbInfo: null, +class Tuner { - /* - * Description: Indicates the physical interface associated with the tuner. - * - * Visibility Type: readonly Integer - */ - frontEndPosition: null, - - /* - * Description: - * The property turns on (true) and off (false) the power applied to the external interface of the tuner unless the - * tuner is disabled. Reading the property provides the current value, on or off. Attempting to modify the - * property while the resource is in use has no effect. The value of the property SHALL persist after OITF - * restarts. - * For DVB-S/S2 power is supplied to the LNB(s) and if present the DiSEqC switch. - * For DVB-T/T2 a supply +5V is supplied to the antenna with built in amplifier. Note that applying power may - * have adverse effects to the external equipment if it has its own power supply. It is a strong recommendation - * to indicate to the end user a possible adverse effect before using this method. - * For DVB-C/C2 there is no effect. - * Reading the property provides the current value. - * - * Type: Boolean - */ - powerOnExternal: null, - - init: function(name, idTypes, defaultProperties) { + constructor() { + /* + * Description: A unique identifier of the tuner. + * + * Visibility Type: readonly Integer + */ + this.id = null; + + /* + * Description: The name of the tuner as designated in OITF. + * + * Visibility Type: readonly String + */ + this.name = null; + + /* + * Description: Returns a collection of the types supported by the tuner. The types are according to the ID types in section + * 7.13.11.1 under Channel object. + * + * Visibility Type: readonly IntegerCollection + */ + this.idTypes = null; + + /* + * Description: + * The property enables ( true ) and disables ( false ) the tuner. Reading the property provides the current + * state, enabled or disabled. Attempting to disable the tuner while the resource is in use has no effect and the tuner SHALL + * continue to be enabled. + * While disabled: + * • any external power feed (if applicable) SHALL be turned off; + * • the value of the signalInfo property is not defined; + * • the value of the lnbInfo property is not defined; + * • the tuner SHALL NOT be available for use by any JavaScript object (e.g. the video/broadcast object) or by the underlying OITF + * system (e.g. to perform a * scheduled recording). Note the property enableTuner is available in order to re-enable + * the tuner and get access to the tuner again. + * + * The set value of the property SHALL persist after OITF restarts. + * + * Type: Boolean + */ + this.enableTuner = null; + + /* + * Description: The property returns a SignalInfo object with signal information for example signal strength. + * + * Visibility Type: readonly SignalInfo + */ + this.signalInfo = null; + + /* + * Description: The property returns a LNBInfo object with information regarding the LNB associated with the tuner. + * + * Visibility Type: readonly LNBInfo + */ + this.lnbInfo = null; + + /* + * Description: Indicates the physical interface associated with the tuner. + * + * Visibility Type: readonly Integer + */ + this.frontEndPosition = null; + + /* + * Description: + * The property turns on (true) and off (false) the power applied to the external interface of the tuner unless the + * tuner is disabled. Reading the property provides the current value, on or off. Attempting to modify the + * property while the resource is in use has no effect. The value of the property SHALL persist after OITF + * restarts. + * For DVB-S/S2 power is supplied to the LNB(s) and if present the DiSEqC switch. + * For DVB-T/T2 a supply +5V is supplied to the antenna with built in amplifier. Note that applying power may + * have adverse effects to the external equipment if it has its own power supply. It is a strong recommendation + * to indicate to the end user a possible adverse effect before using this method. + * For DVB-C/C2 there is no effect. + * Reading the property provides the current value. + * + * Type: Boolean + */ + this.powerOnExternal = null; + } + + init(name, idTypes, defaultProperties) { oipf.utils.initProperties.call(this, defaultProperties); this.idTypes = idTypes; this.name = name; } - -}); \ No newline at end of file +} Modified: oipf/lib/js/impl/model/TunerCollection.js =================================================================== --- oipf/lib/js/impl/model/TunerCollection.js 2015-06-09 15:31:49 UTC (rev 1659) +++ oipf/lib/js/impl/model/TunerCollection.js 2015-06-09 15:32:54 UTC (rev 1660) @@ -3,10 +3,10 @@ * The TunerCollection class represents a collection of Tuner objects. See Annex K for the definition of the collection template. * */ -var TunerCollection = Collection.extend({ - - init: function() { - this.super.init.apply(this, arguments); +class TunerCollection extends Collection { + + constructor(...args) { + super(...args); } -}); \ No newline at end of file +}

1 0

r1659 - oipf/lib/js/utils
by ygrego＠users.nuiton.org 09 Jun '15

09 Jun '15

Author: ygrego Date: 2015-06-09 15:31:49 +0000 (Tue, 09 Jun 2015) New Revision: 1659 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1659 Log: Refactoring of the class DateUtils in an ES6 class. Modified: oipf/lib/js/utils/DateUtils.js Modified: oipf/lib/js/utils/DateUtils.js =================================================================== --- oipf/lib/js/utils/DateUtils.js 2015-06-09 15:28:47 UTC (rev 1658) +++ oipf/lib/js/utils/DateUtils.js 2015-06-09 15:31:49 UTC (rev 1659) @@ -1,36 +1,36 @@ -/* +/* * 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 DateUtils = Class.extend({ - - init: function() { +class DateUtils { + + constructor() { this.date = new Date(); this._yesterday = new Date(this.date.getFullYear(), - this.date.getUTCMonth(), + this.date.getUTCMonth(), this.date.getUTCDate()-1); - }, - - millisecondsToSeconds: function(timeInMilliseconds) { + } + + millisecondsToSeconds(timeInMilliseconds) { return timeInMilliseconds / 1000; - }, - - nowInSeconds: function() { + } + + nowInSeconds() { return this.millisecondsToSeconds(Date.now()); - }, - - secondsToMilliseconds: function(timeInSeconds) { + } + + secondsToMilliseconds(timeInSeconds) { return timeInSeconds * 1000; - }, - - secondsToMinutes: function(timeInSeconds) { + } + + secondsToMinutes(timeInSeconds) { return timeInSeconds / 60; - }, - - yesterday: function() { + } + + yesterday() { return this._yesterday; } - -}); + +}

1 0