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

r1684 - oipf/lib
by ygrego＠users.nuiton.org 10 Jun '15

10 Jun '15

Author: ygrego Date: 2015-06-10 09:11:38 +0000 (Wed, 10 Jun 2015) New Revision: 1684 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1684 Log: Take into account the deletion of file 'Utils.js' and the addition of new file 'OipfUtils.js'. Modified: oipf/lib/paths.json Modified: oipf/lib/paths.json =================================================================== --- oipf/lib/paths.json 2015-06-10 09:04:42 UTC (rev 1683) +++ oipf/lib/paths.json 2015-06-10 09:11:38 UTC (rev 1684) @@ -11,7 +11,7 @@ "js/utils/Timeout.js", "js/utils/Calculation.js", "js/utils/ChannelUtils.js", - "js/utils/Utils.js", + "js/utils/OipfUtils.js", "js/utils/EventManager.js", "js/utils/TimerManager.js", "js/utils/TimerRecordingManager.js",

1 0

r1683 - in oipf/lib/js: impl impl/model utils
by ygrego＠users.nuiton.org 10 Jun '15

10 Jun '15

Author: ygrego Date: 2015-06-10 09:04:42 +0000 (Wed, 10 Jun 2015) New Revision: 1683 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1683 Log: Refactoring of file ChannelUtils.js in an ES6 class. Modified: oipf/lib/js/impl/RecordingSchedulerObject.js oipf/lib/js/impl/VideoBroadcastObject.js oipf/lib/js/impl/model/Application.js oipf/lib/js/impl/model/Channel.js oipf/lib/js/impl/model/Configuration.js oipf/lib/js/impl/model/LNBInfo.js oipf/lib/js/impl/model/LocalSystem.js oipf/lib/js/impl/model/ModelFactory.js oipf/lib/js/impl/model/Programme.js oipf/lib/js/impl/model/Recording.js oipf/lib/js/impl/model/ScheduledRecording.js oipf/lib/js/impl/model/SearchResults.js oipf/lib/js/impl/model/SignalInfo.js oipf/lib/js/impl/model/Tuner.js oipf/lib/js/utils/ChannelUtils.js Modified: oipf/lib/js/impl/RecordingSchedulerObject.js =================================================================== --- oipf/lib/js/impl/RecordingSchedulerObject.js 2015-06-10 08:54:02 UTC (rev 1682) +++ oipf/lib/js/impl/RecordingSchedulerObject.js 2015-06-10 09:04:42 UTC (rev 1683) @@ -275,7 +275,7 @@ } _fireEvent(state, recording) { - var event = createCustomEvent("PVREvent", [state, recording]); + var event = this._eventManager.createCustomEvent("PVREvent", [state, recording]); this._eventManager.fireEvent(event, this); } Modified: oipf/lib/js/impl/VideoBroadcastObject.js =================================================================== --- oipf/lib/js/impl/VideoBroadcastObject.js 2015-06-10 08:54:02 UTC (rev 1682) +++ oipf/lib/js/impl/VideoBroadcastObject.js 2015-06-10 09:04:42 UTC (rev 1683) @@ -370,7 +370,7 @@ break; case this._CONNECTING: - if (!channelUtils.verifyASuitableTunerAvailable(currentChannel.idType)) { + if (!ChannelUtils.verifyASuitableTunerAvailable(currentChannel.idType)) { this._timeout() .then(this.changePlayState.bind(this, this._CONNECTING)); } else { @@ -383,7 +383,7 @@ case this._PRESENTING: /*if (!verifyASuitableTunerAvailable(currentChannel.idType)) { - this.timer = oipf.utils.this._timeout() + this.timer = OipfUtils.this._timeout() .then(this.changePlayState.bind(this, this._PRESENTING)); }*/ //Method documentation indicate it don't have effects in this state. @@ -391,7 +391,7 @@ case this._STOPPED: //FIX-ME :Make enable video and audio presentation - if (!channelUtils.verifyASuitableTunerAvailable(currentChannel.idType, this)) { + if (!ChannelUtils.verifyASuitableTunerAvailable(currentChannel.idType, this)) { this._timeout() .then(this.changePlayState.bind(this, this._STOPPED, 0)); } else { @@ -421,7 +421,7 @@ changePlayState(state, error) { console.log("changeState", state); this.playState = state; - this._fireEvent(createCustomEvent("PlayStateChange", [this.playState, error])); + this._fireEvent(this._eventManager.createCustomEvent("PlayStateChange", [this.playState, error])); } noTransientError(channel) { @@ -442,7 +442,7 @@ if (this.noTransientError(this._CONNECTING) && this.noPermanentError(this._CONNECTING, channel)) { this.playState = this._CONNECTING; - this._fireEvent(createCustomEvent("PlayStateChange", [this.playState])); + this._fireEvent(this._eventManager.createCustomEvent("PlayStateChange", [this.playState])); this._timeout() .then(this.changeStateToPresentingWhenSwitching.bind(this, channel)); } @@ -453,9 +453,9 @@ if (this.noTransientError(this._PRESENTING)) { this.setCurrentChannel(channel); this.playState = this._PRESENTING; - this._fireEvent(createCustomEvent("PlayStateChange", [this.playState])); + this._fireEvent(this._eventManager.createCustomEvent("PlayStateChange", [this.playState])); this._timeout() - .then(this._fireEvent.bind(this, createCustomEvent("ChannelChangeSucceeded", [channel]))); + .then(this._fireEvent.bind(this, this._eventManager.createCustomEvent("ChannelChangeSucceeded", [channel]))); } } @@ -556,14 +556,14 @@ if (CHANNEL_CREATION[idType]) { //Verify a channel of this idType (ID_DVB_SI_DIRECT = 13). - if (channelUtils.isAValidTerrestrialDsd (dsd)) { //Verify the dsd validity. + if (ChannelUtils.isAValidTerrestrialDsd (dsd)) { //Verify the dsd validity. if ((sid >= 1) && (sid <= 65535)) { //Verify the rigth range of service id. - var newChannel = new Channel(idType, dsd, sid, "localChannel" + createUUID()); + var newChannel = new Channel(idType, dsd, sid, "localChannel" + OipfUtils.createUUID()); var channelConfig = this._channelService; - if (channelUtils.getChannelByDsd(channelConfig.channelList, dsd)) { + if (ChannelUtils.getChannelByDsd(channelConfig.channelList, dsd)) { /* Normally channelList is readonly but the method documentation say * that the channel must be add if it not already present. @@ -639,7 +639,7 @@ if (idType == 30) { var equivalentChannel = this._channelService.channelList.getChannelBySourceID(sourceID); } else if (idType == 40) { - equivalentChannel = channelUtils.getChannelByIpBroadcastID(ipBroadcastID); + equivalentChannel = ChannelUtils.getChannelByIpBroadcastID(ipBroadcastID); } else { equivalentChannel = this._channelService.channelList.getChannelByTriplet(onid, tsid, sid); } @@ -647,7 +647,7 @@ if (equivalentChannel) { var newChannel = new Channel(arguments.push(equivalentChannel.name)); } else { - newChannel = new Channel(arguments.push("localChannel:"+createUUID())); + newChannel = new Channel(arguments.push("localChannel:" + OipfUtils.createUUID())); } this._channelService.channelList.push(newChannel); @@ -678,16 +678,16 @@ if (this.playState >= this._UNREALIZED && this.playState <= this._STOPPED && channel) { - if (channelUtils.verifyASuitableTunerAvailable(channel.idType, this) && channel.idType != 41) { + if (ChannelUtils.verifyASuitableTunerAvailable(channel.idType, this) && channel.idType != 41) { this._timeout() .then(this.changeStateToConnectingWhenSwitching.bind(this, channel)); } else if (channel.idType == 40 || channel.idType == 41) { this._timeout() - .then(this._fireEvent.bind(this, createCustomEvent("ChannelChangeError", [null, 8]))); + .then(this._fireEvent.bind(this, this._eventManager.createCustomEvent("ChannelChangeError", [null, 8]))); } else { this._timeout() - .then(this._fireEvent.bind(this, createCustomEvent("ChannelChangeError", [null, 0]))); + .then(this._fireEvent.bind(this, this._eventManager.createCustomEvent("ChannelChangeError", [null, 0]))); } } else { if (this.playState != this._UNREALIZED) { @@ -884,7 +884,7 @@ //Verify that the currentChannel exists in the channel list of channel configuration if (!channelConfig.channelList.getChannel(this.currentChannel.channelId)) { this._timeout() - .then(this._fireEvent.bind(this, createCustomEvent("ChannelChangeError", [null, 100]))); + .then(this._fireEvent.bind(this, this._eventManager.createCustomEvent("ChannelChangeError", [null, 100]))); /*setTimeout(function () { self.onChannelChangeError && self.onChannelChangeError(null, 100); } 0);*/ @@ -912,18 +912,18 @@ channelCollection = channelConfig.currentFavouriteLists; } - var channelToChange = channelUtils.findChannel(channelCollection, this.currentChannel, step); + var channelToChange = ChannelUtils.findChannel(channelCollection, this.currentChannel, step); - if (channelUtils.verifyASuitableTunerAvailable(channelToChange.idType, this)) { + if (ChannelUtils.verifyASuitableTunerAvailable(channelToChange.idType, this)) { this._timeout() .then(this.changeStateToConnectingWhenSwitching.bind(this, channelToChange)); } else if (channelToChange.idType == 40 || channelToChange.idType == 41) { this._timeout() - .then(this._fireEvent.bind(this, createCustomEvent("ChannelChangeError", [null, 8]))); + .then(this._fireEvent.bind(this, this._eventManager.createCustomEvent("ChannelChangeError", [null, 8]))); } else { this._timeout() - .then(this._fireEvent.bind(this, createCustomEvent("ChannelChangeError", [null, 0]))); + .then(this._fireEvent.bind(this, this._eventManager.createCustomEvent("ChannelChangeError", [null, 0]))); } } @@ -931,7 +931,7 @@ } else { //When the OITF does not maintain channel list or favourite list by itself this._timeout() - .then(this._fireEvent.bind(this, createCustomEvent("ChannelChangeError", [null, 10]))); + .then(this._fireEvent.bind(this, this._eventManager.createCustomEvent("ChannelChangeError", [null, 10]))); } } Modified: oipf/lib/js/impl/model/Application.js =================================================================== --- oipf/lib/js/impl/model/Application.js 2015-06-10 08:54:02 UTC (rev 1682) +++ oipf/lib/js/impl/model/Application.js 2015-06-10 09:04:42 UTC (rev 1683) @@ -194,7 +194,7 @@ } _fireEvent(eventName) { - var event = createCustomEvent(eventName, null); + var event = this._eventManager.createCustomEvent(eventName, null); this._eventManager.fireEvent(event, this); } } Modified: oipf/lib/js/impl/model/Channel.js =================================================================== --- oipf/lib/js/impl/model/Channel.js 2015-06-10 08:54:02 UTC (rev 1682) +++ oipf/lib/js/impl/model/Channel.js 2015-06-10 09:04:42 UTC (rev 1683) @@ -131,7 +131,7 @@ 6: "_createChannelIPTV" }; - (arguments.length !== 6) && this._setCcid(createUUID()); + (arguments.length !== 6) && this._setCcid(OipfUtils.createUUID()); this[dispatcher[arguments.length]].apply(this, arguments); } @@ -173,7 +173,7 @@ } _createChannelFromConf(channelConf) { - oipf.utils.initProperties.call(this, channelConf); + OipfUtils.initProperties.call(this, channelConf); } } Modified: oipf/lib/js/impl/model/Configuration.js =================================================================== --- oipf/lib/js/impl/model/Configuration.js 2015-06-10 08:54:02 UTC (rev 1682) +++ oipf/lib/js/impl/model/Configuration.js 2015-06-10 09:04:42 UTC (rev 1683) @@ -123,7 +123,7 @@ */ this.preferredTimeShiftMode = null; - oipf.utils.initProperties.call(this, defaultProperties); + OipfUtils.initProperties.call(this, defaultProperties); this._keys = {}; } Modified: oipf/lib/js/impl/model/LNBInfo.js =================================================================== --- oipf/lib/js/impl/model/LNBInfo.js 2015-06-10 08:54:02 UTC (rev 1682) +++ oipf/lib/js/impl/model/LNBInfo.js 2015-06-10 09:04:42 UTC (rev 1683) @@ -89,7 +89,7 @@ */ this.orbitalPosition = null; - oipf.utils.initProperties.call(this, defaultProperties); + OipfUtils.initProperties.call(this, defaultProperties); } } Modified: oipf/lib/js/impl/model/LocalSystem.js =================================================================== --- oipf/lib/js/impl/model/LocalSystem.js 2015-06-10 08:54:02 UTC (rev 1682) +++ oipf/lib/js/impl/model/LocalSystem.js 2015-06-10 09:04:42 UTC (rev 1683) @@ -381,7 +381,7 @@ this._timerManager = new TimerManager(); this._timeout = this._timerManager.createTimer; this._defaultProperties = defaultProperties; - oipf.utils.initProperties.call(this, defaultProperties.localSystem); + OipfUtils.initProperties.call(this, defaultProperties.localSystem); this.systemReady = true; } @@ -549,7 +549,7 @@ this.powerState = type; this._timeout() .then(this._fireEvent.bind( - this, createCustomEvent("PowerStateChange", [this.powerState]))); + this, this._eventManager.createCustomEvent("PowerStateChange", [this.powerState]))); return true; } Modified: oipf/lib/js/impl/model/ModelFactory.js =================================================================== --- oipf/lib/js/impl/model/ModelFactory.js 2015-06-10 08:54:02 UTC (rev 1682) +++ oipf/lib/js/impl/model/ModelFactory.js 2015-06-10 09:04:42 UTC (rev 1683) @@ -28,7 +28,7 @@ getAProgrammeFromXmlTvData() { console.log("Method createXmlTvData"); - var randomIndex = oipf.utils.getRandomNumberBetweenMinMax(0, + var randomIndex = OipfUtils.getRandomNumberBetweenMinMax(0, this.xmlTvData.programmes.length); if (this.xmlTvData && this.xmlTvData.programmes[randomIndex]) { Modified: oipf/lib/js/impl/model/Programme.js =================================================================== --- oipf/lib/js/impl/model/Programme.js 2015-06-10 08:54:02 UTC (rev 1682) +++ oipf/lib/js/impl/model/Programme.js 2015-06-10 09:04:42 UTC (rev 1683) @@ -326,7 +326,7 @@ */ this.recording = null; - oipf.utils.initProperties.call(this, initObject); + OipfUtils.initProperties.call(this, initObject); } /* Modified: oipf/lib/js/impl/model/Recording.js =================================================================== --- oipf/lib/js/impl/model/Recording.js 2015-06-10 08:54:02 UTC (rev 1682) +++ oipf/lib/js/impl/model/Recording.js 2015-06-10 09:04:42 UTC (rev 1683) @@ -54,9 +54,9 @@ this.isManual = true; associatedScheduledRecording && - oipf.utils.initProperties.call(this, associatedScheduledRecording); + OipfUtils.initProperties.call(this, associatedScheduledRecording); - this.id = createUUID(); + this.id = OipfUtils.createUUID(); } _setRecordingStartTime(recordingStartTime) { Modified: oipf/lib/js/impl/model/ScheduledRecording.js =================================================================== --- oipf/lib/js/impl/model/ScheduledRecording.js 2015-06-10 08:54:02 UTC (rev 1682) +++ oipf/lib/js/impl/model/ScheduledRecording.js 2015-06-10 09:04:42 UTC (rev 1683) @@ -234,7 +234,7 @@ this.customMetadata = null; this.state = this.RECORDING_SCHEDULED; - this.scheduleID = createUUID(); + this.scheduleID = OipfUtils.createUUID(); if (parameters.length == 1) { this._initFromProgramme.apply(this, parameters); } else { Modified: oipf/lib/js/impl/model/SearchResults.js =================================================================== --- oipf/lib/js/impl/model/SearchResults.js 2015-06-10 08:54:02 UTC (rev 1682) +++ oipf/lib/js/impl/model/SearchResults.js 2015-06-10 09:04:42 UTC (rev 1683) @@ -193,7 +193,7 @@ var next = true; if (constraints.length > 0 && - oipf.utils.isPresent(constraints, programme.channel.name)) { + OipfUtils.isPresent(constraints, programme.channel.name)) { this._cachedResults.push(programme); next = false; @@ -217,7 +217,7 @@ var programme = programmes[i]; if (constraints.length > 0 && - oipf.utils.isPresent(constraints, programme.channel.name) && + OipfUtils.isPresent(constraints, programme.channel.name) && programme.duration) { var stopTime = programme.startTime + @@ -255,20 +255,20 @@ if (query._and.length > 0 && query._or.length > 0) { - return (oipf.utils[methodName].call(null, programme[field], value) && this._evaluateQueryLoop(query._and, programme)) - || (oipf.utils[methodName].call(null, programme[field], value) + return (OipfUtils[methodName].call(null, programme[field], value) && this._evaluateQueryLoop(query._and, programme)) + || (OipfUtils[methodName].call(null, programme[field], value) || this._evaluateQueryLoop(query._and, programme)); } else if (query._and.length > 0 && query._or.length === 0) { - return (oipf.utils[methodName].call(null, programme[field], value) && this._evaluateQueryLoop(query._and, programme)); + return (OipfUtils[methodName].call(null, programme[field], value) && this._evaluateQueryLoop(query._and, programme)); } else if (query._or.length > 0 && query._and.length === 0) { - return (oipf.utils[methodName].call(null, programme[field], value) && this._evaluateQueryLoop(query._or, programme)); + return (OipfUtils[methodName].call(null, programme[field], value) && this._evaluateQueryLoop(query._or, programme)); } else if (query._and.length === 0 && query._or.length === 0) { - return (oipf.utils[methodName].call(null, programme[field], value)); + return (OipfUtils[methodName].call(null, programme[field], value)); } } Modified: oipf/lib/js/impl/model/SignalInfo.js =================================================================== --- oipf/lib/js/impl/model/SignalInfo.js 2015-06-10 08:54:02 UTC (rev 1682) +++ oipf/lib/js/impl/model/SignalInfo.js 2015-06-10 09:04:42 UTC (rev 1683) @@ -8,7 +8,7 @@ class SignalInfo { constructor(defaultProperties) { - oipf.utils.initProperties.call(this, defaultProperties); + OipfUtils.initProperties.call(this, defaultProperties); /* * Description: Modified: oipf/lib/js/impl/model/Tuner.js =================================================================== --- oipf/lib/js/impl/model/Tuner.js 2015-06-10 08:54:02 UTC (rev 1682) +++ oipf/lib/js/impl/model/Tuner.js 2015-06-10 09:04:42 UTC (rev 1683) @@ -14,7 +14,7 @@ class Tuner { constructor(name, idTypes, defaultProperties) { - oipf.utils.initProperties.call(this, defaultProperties); + OipfUtils.initProperties.call(this, defaultProperties); /* * Description: A unique identifier of the tuner. Modified: oipf/lib/js/utils/ChannelUtils.js =================================================================== --- oipf/lib/js/utils/ChannelUtils.js 2015-06-10 08:54:02 UTC (rev 1682) +++ oipf/lib/js/utils/ChannelUtils.js 2015-06-10 09:04:42 UTC (rev 1683) @@ -1,103 +1,106 @@ -var channelUtils = {}; +class ChannelUtils { -channelUtils.findChannel = function(channelCollection, channel, step) { - for (var i = 0, l = channelCollection.length; i < l; i++ ) { - - if (channelCollection[i] == channel) { - - if ((i == 0) && (step == -1)) { - var index = channelCollection.length + step; - - } else { - - if((i == (channelCollection.length-1)) && (step == 1)) { - index = 0; - + static findChannel(channelCollection, channel, step) { + for (var i = 0, l = channelCollection.length; i < l; i++) { + + if (channelCollection[i] == channel) { + + if ((i == 0) && (step == -1)) { + var index = channelCollection.length + step; + } else { - index = i + step; - + + if ((i == (channelCollection.length-1)) && (step == 1)) { + index = 0; + + } else { + index = i + step; + + } } + return channelCollection[index]; } - return channelCollection[index]; } - } - return null; -}; - -channelUtils.isAValidDVBTChannel = function (channel) { - return (channel.onid) && (channel.tsid) && (channel.sid); -}; - -/* - * Description: - * This method verify that a tuner is available to receive a channel with this "idType". - * And return the first tuner found which match the "idType". - * Actually all video broadcast will use the same tuner because there is only one and - * this choice would be directed by parameter. - * - * ToDo :Normally the method should check if the tuner don't locked by another object but - * no way to do that in the norm. - * - * Argument: - * - idType : the type of tuner researched. - * - * Return: Tuner - */ -channelUtils.verifyASuitableTunerAvailable = function(idType, object) { - var config = oipfObjectFactory.createConfigurationObject(); - var availableTuners = config.localSystem.tuners; - - for (var i = 0; i < availableTuners.length; i++) { - var tunerIdTypes = availableTuners[i].idTypes; - for (var j = 0; j < tunerIdTypes.length; j++) { - var tuner = availableTuners[i]; - if (tunerIdTypes[j] == idType) { - return tuner; + return null; + }; + + static isAValidDVBTChannel(channel) { + return (channel.onid) && (channel.tsid) && (channel.sid); + }; + + /* + * Description: + * This method verify that a tuner is available to receive a channel with this "idType". + * And return the first tuner found which match the "idType". + * Actually all video broadcast will use the same tuner because there is only one and + * this choice would be directed by parameter. + * + * ToDo :Normally the method should check if the tuner don't locked by another object but + * no way to do that in the norm. + * + * Argument: + * - idType : the type of tuner researched. + * + * Return: Tuner + */ + static verifyASuitableTunerAvailable(idType, object) { + var config = oipfObjectFactory.createConfigurationObject(); + var availableTuners = config.localSystem.tuners; + + for (var i = 0; i < availableTuners.length; i++) { + var tunerIdTypes = availableTuners[i].idTypes; + for (var j = 0; j < tunerIdTypes.length; j++) { + var tuner = availableTuners[i]; + if (tunerIdTypes[j] == idType) { + return tuner; + } } } - } - - return null; -}; - -channelUtils.getChannelByDsd = function(channelCollection, dsd) { - for (var i = 0, l = channelCollection.length; i < l; i++) { - if (channelCollection[i].dsd == dsd) { - return channelCollection[i]; + + return null; + }; + + static getChannelByDsd(channelCollection, dsd) { + for (var i = 0, l = channelCollection.length; i < l; i++) { + if (channelCollection[i].dsd == dsd) { + return channelCollection[i]; + } } - } -}; - -/* - * Description: - * This method verify the validity of the terrestrial delivery system descriptor. - * The argument will be compare to the dsd array byte defined either in - * the transport stream or directly in the terminal. - * - * Arguments - * - dsd: the delivery system descriptor string necessary to create a channel by intermediate of method - * createChannelObject. - */ -channelUtils.isAValidTerrestrialDsd = function(dsd) { - var dsdAttributes = dsd.split(","); - - if (TERRESTIAL_DELIVERY_SYSTEM_DESCRIPTOR.length == dsdAttributes.length) { - - for (var i = 0, l = TERRESTIAL_DELIVERY_SYSTEM_DESCRIPTOR.length; i < l; i++) { - - if (!(TERRESTIAL_DELIVERY_SYSTEM_DESCRIPTOR[i] == dsdAttributes[i])) { - return false; + }; + + /* + * Description: + * This method verify the validity of the terrestrial delivery system descriptor. + * The argument will be compare to the dsd array byte defined either in + * the transport stream or directly in the terminal. + * + * Arguments + * - dsd: the delivery system descriptor string necessary to create a channel by intermediate of method + * createChannelObject. + */ + static isAValidTerrestrialDsd(dsd) { + var dsdAttributes = dsd.split(","); + + if (TERRESTIAL_DELIVERY_SYSTEM_DESCRIPTOR.length == dsdAttributes.length) { + + for (var i = 0, l = TERRESTIAL_DELIVERY_SYSTEM_DESCRIPTOR.length; i < l; i++) { + + if (!(TERRESTIAL_DELIVERY_SYSTEM_DESCRIPTOR[i] == dsdAttributes[i])) { + return false; + } } + + return true; } - - return true; - } -}; - -channelUtils.getChannelByIpBroadcastID = function(channelCollection, ipBroadcastID) { - for (var i = 0, l = channelCollection.length; i < l; i++) { - if (channelCollection[i].ipBroadcastID == ipBroadcastID) { - return channelCollection[i]; + }; + + static getChannelByIpBroadcastID(channelCollection, ipBroadcastID) { + for (var i = 0, l = channelCollection.length; i < l; i++) { + if (channelCollection[i].ipBroadcastID == ipBroadcastID) { + return channelCollection[i]; + } } - } -}; + }; + +} +

1 0

r1682 - oipf/test/js
by ygrego＠users.nuiton.org 10 Jun '15

10 Jun '15

Author: ygrego Date: 2015-06-10 08:54:02 +0000 (Wed, 10 Jun 2015) New Revision: 1682 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1682 Log: Now Test.js must use the static method 'OipfUtils.timeout'. Modified: oipf/test/js/Test.js Modified: oipf/test/js/Test.js =================================================================== --- oipf/test/js/Test.js 2015-06-10 08:50:42 UTC (rev 1681) +++ oipf/test/js/Test.js 2015-06-10 08:54:02 UTC (rev 1682) @@ -1047,7 +1047,7 @@ var result = false; var promiseTest = new Promise(function(resolve, reject) { try { - timeout(object.timer || 5000) + OipfUtils.timeout(object.timer || 5000) .then(reject.bind(null, "No result returned.")) .then(function() { !result

1 0

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

10 Jun '15

Author: ygrego Date: 2015-06-10 08:50:42 +0000 (Wed, 10 Jun 2015) New Revision: 1681 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1681 Log: Utils.js has been deleted and its content has been moved to class OipfUtils.js Added: oipf/lib/js/utils/OipfUtils.js Removed: oipf/lib/js/utils/Utils.js Copied: oipf/lib/js/utils/OipfUtils.js (from rev 1680, oipf/lib/js/utils/Utils.js) =================================================================== --- oipf/lib/js/utils/OipfUtils.js (rev 0) +++ oipf/lib/js/utils/OipfUtils.js 2015-06-10 08:50:42 UTC (rev 1681) @@ -0,0 +1,95 @@ +class OipfUtils { + + static initProperties(defaultProperties) { + var keys = Object.keys(defaultProperties); + for (var i = 0, l = keys.length; i < l; i++) { + this[keys[i]] = defaultProperties[keys[i]]; + } + } + + static timeout(time) { + return new Timeout(time); + } + + static equals(field1, field2) { + return field1 == field2; + } + + static notEquals(field1, field2) { + return field1 != field2; + } + + static superior(field1, field2) { + return field1 > field2; + } + + static superiorOrEquals(field1, field2) { + return field1 >= field2; + } + + static inferior(field1, field2) { + return field1 < field2; + } + + static inferiorOrEquals(field1, field2) { + return field1 <= field2; + } + + static contains(field1, field2) { + return field1 == field2; + } + + static generateFourDigit() { + + return Math.floor(Math.random() * 9000) + 1000; + } + + static getRandomNumberBetweenMinMax(min, max) { + return Math.floor(Math.random() * (max - min)) + min; + } + + static isPresent(list, element) { + + for (var i = 0, l = list.length; i < l; i++) { + if (OipfUtils.equals(list[i].name, element)) { + return true; + } + } + } + + /* + * Some code based on RFC 4122, section 4.4 + * (Algorithms for Creating a UUID from Truly Random or Pseudo-Random Number). + */ + static createUUID() { + // http://www.ietf.org/rfc/rfc4122.txt + var s = []; + var hexDigits = "0123456789abcdef"; + for (var i = 0; i < 36; i++) { + s[i] = hexDigits.substr(Math.floor(Math.random() * 0x10), 1); + } + s[14] = "4"; // bits 12-15 of the time_hi_and_version field to 0010 + s[19] = hexDigits.substr((s[19] & 0x3) | 0x8, 1); // bits 6-7 of the clock_seq_hi_and_reserved to 01 + s[8] = s[13] = s[18] = s[23] = "-"; + + var uuid = s.join(""); + return uuid; + } + + /* + * Description: + * Should be use in each test method in anticipation of tests executed on a tv platform. + */ + static isMethodImplemented(object, methodName) { + return object[methodName]; + } + + static upperCaseFirstChar(string) { + return string.charAt(0).toUpperCase() + string.slice(1); + } + + static logTest() { + console.log.apply(console, arguments); + } + +} Deleted: oipf/lib/js/utils/Utils.js =================================================================== --- oipf/lib/js/utils/Utils.js 2015-06-10 08:13:47 UTC (rev 1680) +++ oipf/lib/js/utils/Utils.js 2015-06-10 08:50:42 UTC (rev 1681) @@ -1,121 +0,0 @@ -/* - * Some code based on RFC 4122, section 4.4 - * (Algorithms for Creating a UUID from Truly Random or Pseudo-Random Number). - */ -var oipf = { - utils: {} -}; - - -oipf.utils.initProperties = function(defaultProperties) { - var keys = Object.keys(defaultProperties); - for (var i = 0, l = keys.length; i < l; i++) { - this[keys[i]] = defaultProperties[keys[i]]; - } -}; - -oipf.utils.timeout = function(time) { - return new Timeout(time); -}; - -oipf.utils.equals = function(field1, field2) { - return field1 == field2; -}; - -oipf.utils.notEquals = function(field1, field2) { - return field1 != field2; -}; - -oipf.utils.superior = function(field1, field2) { - return field1 > field2; -}; - -oipf.utils.superiorOrEquals = function(field1, field2) { - return field1 >= field2; -}; - -oipf.utils.inferior = function(field1, field2) { - return field1 < field2; -}; - -oipf.utils.inferiorOrEquals = function(field1, field2) { - return field1 <= field2; -}; - -oipf.utils.contains = function(field1, field2) { - return field1 == field2; -}; - -oipf.utils.generateFourDigit = function() { - - return Math.floor(Math.random() * 9000) + 1000; -}; - -oipf.utils.getRandomNumberBetweenMinMax = function(min, max) { - return Math.floor(Math.random() * (max - min)) + min; -}; - -oipf.utils.isPresent = function(list, element) { - - for (var i = 0, l = list.length; i < l; i++) { - if (oipf.utils.equals(list[i].name, element)) { - return true; - } - } -}; - -function createUUID() { - // http://www.ietf.org/rfc/rfc4122.txt - var s = []; - var hexDigits = "0123456789abcdef"; - for (var i = 0; i < 36; i++) { - s[i] = hexDigits.substr(Math.floor(Math.random() * 0x10), 1); - } - s[14] = "4"; // bits 12-15 of the time_hi_and_version field to 0010 - s[19] = hexDigits.substr((s[19] & 0x3) | 0x8, 1); // bits 6-7 of the clock_seq_hi_and_reserved to 01 - s[8] = s[13] = s[18] = s[23] = "-"; - - var uuid = s.join(""); - return uuid; -} - -/* - * Description: - * Should be use in each test method in anticipation of tests executed on a tv platform. - */ -function isMethodImplemented(object, methodName) { - return object[methodName]; -} - -/* - * Description: - * Encapsulation of function "setTimeout" in order to it be accessible for all object and also reusable. - */ -function timeout(time) { - return new Promise(function(resolve, reject) { - setTimeout(resolve, time); - }); -} - -function upperCaseFirstChar(string) { - return string.charAt(0).toUpperCase() + string.slice(1); -} - -function logTest() { - console.log.apply(console, arguments); -} - -function createCustomEvent(type, param) { - return new CustomEvent(type, {detail :param}); -} - -function updateProperty(id, property, value){ - var getElById = document.getElementById.bind(document); - - if (property == "backgroundColor") { - getElById(id)["style"][property] = value; - } else { - getElById(id)[property] = value; - } - -}

1 0

r1680 - in oipf: emulator lib test
by smaisonneuve＠users.nuiton.org 10 Jun '15

10 Jun '15

Author: smaisonneuve Date: 2015-06-10 08:13:47 +0000 (Wed, 10 Jun 2015) New Revision: 1680 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1680 Log: [Doc] - Adding readme in each project Added: oipf/emulator/readme.txt oipf/lib/readme.txt oipf/test/readme.txt Added: oipf/emulator/readme.txt =================================================================== --- oipf/emulator/readme.txt (rev 0) +++ oipf/emulator/readme.txt 2015-06-10 08:13:47 UTC (rev 1680) @@ -0,0 +1,3 @@ +This project is a web project built on top of oipf implementation. It gives you the ability to use the oipf implementation directly on your local machine. + +To launch the project, run node server.js and browse http://<ip address of your machine>:4000 Added: oipf/lib/readme.txt =================================================================== --- oipf/lib/readme.txt (rev 0) +++ oipf/lib/readme.txt 2015-06-10 08:13:47 UTC (rev 1680) @@ -0,0 +1,13 @@ +This project is an implementation of oipf standard. You compile it and use it as a library. + +To build the project, you need to install the require dependencies : +> npm install + +then install Gulp : +> npm install gulp -g + +and finally, run gulp : +> gulp + +The gulp task is watching for change within the oipf project files. If you make a change, the project will be automatically rebuilt. +The building process produce a js bundle under build/ directory. It also copy the static files that the library need to work. If you want to use this library in another project, you need to point to that directory or embed the files within the build dir. Added: oipf/test/readme.txt =================================================================== --- oipf/test/readme.txt (rev 0) +++ oipf/test/readme.txt 2015-06-10 08:13:47 UTC (rev 1680) @@ -0,0 +1,6 @@ +This is project contains unit test for oipf implementation. You can run it on a machine to determine how well it handle oipf : it will gives you a feedback on what part of the spec is supported or not. + +To run the project, run : +> node server.js + +Then browse http://<ip address of your machine>:3000

1 0

r1679 - oipf/lib/js/impl/model
by jruchaud＠users.nuiton.org 10 Jun '15

10 Jun '15

Author: jruchaud Date: 2015-06-10 07:56:34 +0000 (Wed, 10 Jun 2015) New Revision: 1679 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1679 Log: Fix collection Modified: oipf/lib/js/impl/model/Collection.js Modified: oipf/lib/js/impl/model/Collection.js =================================================================== --- oipf/lib/js/impl/model/Collection.js 2015-06-09 21:38:59 UTC (rev 1678) +++ oipf/lib/js/impl/model/Collection.js 2015-06-10 07:56:34 UTC (rev 1679) @@ -1,7 +1,8 @@ -class Collection extends Array{ +class Collection extends Array { constructor(...args) { - super(...args); + super(); + this.push(...args); } item(index) {

1 0

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

09 Jun '15

Author: ygrego Date: 2015-06-09 21:38:59 +0000 (Tue, 09 Jun 2015) New Revision: 1678 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1678 Log: The property map and channelNameMap have not been added to the class ProgrammeHelper. Modified: oipf/lib/js/utils/ProgrammeHelper.js Modified: oipf/lib/js/utils/ProgrammeHelper.js =================================================================== --- oipf/lib/js/utils/ProgrammeHelper.js 2015-06-09 21:23:56 UTC (rev 1677) +++ oipf/lib/js/utils/ProgrammeHelper.js 2015-06-09 21:38:59 UTC (rev 1678) @@ -6,6 +6,30 @@ class ProgrammeHelper { constructor(channelService) { + this.map = { + "title": "name", + "start": "startTime", + "desc": "description", + "length#text": "duration", + "episode-num#text": "episode" + }; + + this.channelNameMap = { + "ART1.kazer.org" : "ARTE", + "EUR2.kazer.org" : "D17", + "FRA2.kazer.org" : "FRANCE_2", + "FRA3.kazer.org" : "FRANCE_3", + "FRA4.kazer.org" : "FRANCE_4", + "FRA5.kazer.org" : "FRANCE_5", + "M61.kazer.org" : "M6", + "NRJ1.kazer.org" : "NRJ_12", + "NT11.kazer.org" : "NT1", + "RTL2.kazer.org" : "RTL9", + "TF11.kazer.org" : "TF1", + "TMC1.kazer.org" : "TMC", + "W91.kazer.org" : "W9" + }; + this.programmes = null; this.channelService = channelService; this.programmes = [];

1 0

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

09 Jun '15

Author: ygrego Date: 2015-06-09 21:23:56 +0000 (Tue, 09 Jun 2015) New Revision: 1677 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1677 Log: The property programmes of ProgrammeHelper don't takes part to class. Modified: oipf/lib/js/utils/ProgrammeHelper.js Modified: oipf/lib/js/utils/ProgrammeHelper.js =================================================================== --- oipf/lib/js/utils/ProgrammeHelper.js 2015-06-09 20:40:34 UTC (rev 1676) +++ oipf/lib/js/utils/ProgrammeHelper.js 2015-06-09 21:23:56 UTC (rev 1677) @@ -6,7 +6,7 @@ class ProgrammeHelper { constructor(channelService) { - programmes = null; + this.programmes = null; this.channelService = channelService; this.programmes = []; }

1 0

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

09 Jun '15

Author: ygrego Date: 2015-06-09 20:40:34 +0000 (Tue, 09 Jun 2015) New Revision: 1676 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1676 Log: Transformation of theses classes in ES6 classes. Modified: oipf/lib/js/utils/Timeout.js oipf/lib/js/utils/TimerManager.js oipf/lib/js/utils/TimerRecordingManager.js oipf/lib/js/utils/XmlParser.js oipf/lib/js/utils/XmlToJson.js Modified: oipf/lib/js/utils/Timeout.js =================================================================== --- oipf/lib/js/utils/Timeout.js 2015-06-09 19:40:16 UTC (rev 1675) +++ oipf/lib/js/utils/Timeout.js 2015-06-09 20:40:34 UTC (rev 1676) @@ -1,37 +1,39 @@ -/* +/* * 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 Timeout = Class.extend({ - timerId: null, - - promise: null, - - init: function(time) { +class Timeout { + + constructor(time) { + this.timerId = null; + + this.promise = null; + var self = this; + this.promise = new Promise(function(resolve, reject) { self.timerId = setTimeout(function() { resolve(); - }, time || 0); + }, time || 0); }); - }, - - then: function(callback) { + } + + then(callback) { this.promise.then(callback); return this; - }, - - catch: function(callback) { + } + + catch(callback) { this.promise.catch(callback); return this; - }, - - cancel: function() { + } + + cancel() { clearTimeout(this.timerId); this.timerId = null; this.promise = null; } - -}); +} + Modified: oipf/lib/js/utils/TimerManager.js =================================================================== --- oipf/lib/js/utils/TimerManager.js 2015-06-09 19:40:16 UTC (rev 1675) +++ oipf/lib/js/utils/TimerManager.js 2015-06-09 20:40:34 UTC (rev 1676) @@ -1,25 +1,26 @@ -/* +/* * 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 TimerManager = Class.extend({ - - timer: null, +class TimerManager { - createTimer: function(time) { + constructor() { + this.timer = null; + } + + createTimer(time) { this.clearTimer(); this.timer = new Timeout(time); console.log("createTimer", this.timer.timerId); return this.timer; - }, + } - clearTimer: function() { + clearTimer() { if (this.timer) { this.timer.cancel(); console.log("cancelTimer", this.timer.timerId); } } - -}); +} Modified: oipf/lib/js/utils/TimerRecordingManager.js =================================================================== --- oipf/lib/js/utils/TimerRecordingManager.js 2015-06-09 19:40:16 UTC (rev 1675) +++ oipf/lib/js/utils/TimerRecordingManager.js 2015-06-09 20:40:34 UTC (rev 1676) @@ -1,29 +1,28 @@ -/* +/* * 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 TimerRecordingManager = Class.extend({ - - init: function() { +class TimerRecordingManager { + + constructor() { this.recordingTimers = {}; - }, - - createTimer: function(time) { + } + + createTimer(time) { var timer = new Timeout(time); console.log("createTimer", timer.timerId); return timer; - }, + } - clearTimer: function(recordingID) { + clearTimer(recordingID) { console.log("Method clearTimer called."); var timers = this.recordingTimers[recordingID]; - timers.start && timers.start.cancel() && + timers.start && timers.start.cancel() && console.log("cancelTimer", "Start timer: ", timers.start.timerId); timers.end && timers.end.cancel() && console.log("cancelTimer", "End timer: ", timers.end.timerId); } - -}); +} Modified: oipf/lib/js/utils/XmlParser.js =================================================================== --- oipf/lib/js/utils/XmlParser.js 2015-06-09 19:40:16 UTC (rev 1675) +++ oipf/lib/js/utils/XmlParser.js 2015-06-09 20:40:34 UTC (rev 1676) @@ -1,40 +1,40 @@ -/* +/* * 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 XmlParser = Class.extend({ - - init: function() { - +class XmlParser { + + constructor() { + this.initParser(); this.xmlDocument; - }, - - initParser: function() { + } + + initParser() { if (window.DOMParser) { - this.parser=new DOMParser(); + this.parser = new DOMParser(); } - }, - - createAXmlStringDocument: function(defaultPropertiesObject) { + } + + createAXmlStringDocument(defaultPropertiesObject) { console.log("Method createAXmlStringDocument called"); var defaultProperties = defaultPropertiesObject.rearrangeDefaultProperties(); var objectsNames = Object.keys(defaultProperties); var xmlStringDocument = "<" + defaultPropertiesObject.roots + ">"; for (var i = 0, l = objectsNames.length; i < l; i++) { - + var currentObjectName = objectsNames[i]; xmlStringDocument += "<" + currentObjectName; var currentObjectData = defaultProperties[currentObjectName]; var currentAttributes = currentObjectData.attributes; - + if (currentAttributes) { xmlStringDocument = this.createAttributes(currentAttributes, xmlStringDocument); } - + var currentObjectValue = currentObjectData.value; xmlStringDocument += ">" + currentObjectValue; xmlStringDocument += "</" + currentObjectName + ">"; @@ -42,32 +42,32 @@ xmlStringDocument += "</" + defaultPropertiesObject.roots + ">"; console.log("Method createAXmlStringDocument completed"); return xmlStringDocument; - }, - - createAttributes: function(currentAttributes, xmlStringDocument) { + } + + createAttributes(currentAttributes, xmlStringDocument) { var currentAttributesNames = Object.keys(currentAttributes); for (var i = 0, l = currentAttributesNames.length; i < l; i++) { var currentAttributeName = currentAttributesNames[i]; var currentAttributeValue = currentAttributes[currentAttributeName]; - xmlStringDocument += " " + currentAttributeName + xmlStringDocument += " " + currentAttributeName + "='" + currentAttributeValue + "'"; } return xmlStringDocument; - }, - - getXmlDocument: function(defaultProperties) { + } + + getXmlDocument(defaultProperties) { if (!this.parser) { this.initParser(); } - var xmlStringDocument = + var xmlStringDocument = this.createAXmlStringDocument(defaultProperties); - - this.xmlDocument = + + this.xmlDocument = this.parser.parseFromString(xmlStringDocument, "text/xml"); - + return this.xmlDocument; } - -}); +} + Modified: oipf/lib/js/utils/XmlToJson.js =================================================================== --- oipf/lib/js/utils/XmlToJson.js 2015-06-09 19:40:16 UTC (rev 1675) +++ oipf/lib/js/utils/XmlToJson.js 2015-06-09 20:40:34 UTC (rev 1676) @@ -1,97 +1,98 @@ -/* +/* * 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 XmlToJson = Class.extend({ - unwantedNodeName: { - "#text": true, - "#comment": true - }, - - mappingValue: { - "true": true, - "false": false - }, - - wantedNode: "channel", - - init: function(xmlDocument) { +class XmlToJson { + + constructor(xmlDocument) { xmlDocument && (this.xmlDocument = xmlDocument) && (this.json = {}) && this.initJson(); - }, - - initJson: function() { + + this.unwantedNodeName = { + "#text": true, + "#comment": true + }; + + this.mappingValue = { + "true": true, + "false": false + }; + + this.wantedNode = "channel"; + } + + initJson() { if (!this.xmlDocument) { return null; } - + this.rootsNode = this.xmlDocument.firstChild; - + //We already know that document contains at least one child. var rootsName = this.rootsNode.nodeName; this.rootsElementJson = this.json[rootsName] = {}; - + var rootsObject = this.json[rootsName]; - + this.convertAttributesToProperties(rootsObject, this.rootsNode); - }, - - convertAttributesToProperties: function(object, node) { + } + + convertAttributesToProperties(object, node) { var attributesList = node.attributes; - + for (var i = 0, li = attributesList.length; i < li; i++) { var currentAttributes = attributesList[i]; var name = currentAttributes.name; - var value = currentAttributes.value; + var value = currentAttributes.value; object[name] = value; } return object; - }, - - getJson: function() { + } + + getJson() { if (!this.json) { console.log("Your xml document is not valid or null."); return null; } var data = this.rootsNode.childNodes; var dataStoredByKind = {}; - + for (var i = 0, li = data.length; i < li; i++) { var currentNode = data[i]; this.setPropertiesFromDomNodeList(currentNode, this.rootsElementJson); } return this.json; - }, - - setPropertiesFromDomNodeList: function(currentNode, parentContainer) { - + } + + setPropertiesFromDomNodeList(currentNode, parentContainer) { + if (this.unwantedNodeName[currentNode.nodeName]) { return; } - + var childNodes = currentNode.childNodes; var childNodeName; var currentChildNode; var nodeDataMap = {}; if (currentNode.hasAttributes()) { - nodeDataMap = + nodeDataMap = this.convertAttributesToProperties(nodeDataMap, currentNode); } - + for (var i = 0, li = childNodes.length; i < li; i++) { currentChildNode = childNodes[i]; childNodeName = currentChildNode.nodeName; - + if (!this.unwantedNodeName[childNodeName]) { nodeDataMap = this.setPropertiesFromDomNodeList (currentChildNode, nodeDataMap); } - - if (/\w+/.exec(currentChildNode.nodeValue) && + + if (/\w+/.exec(currentChildNode.nodeValue) && (currentChildNode.childNodes.length == 0)) { - + if (!this.isMapNotEmpty(nodeDataMap)) { var currentNodeName = currentNode.nodeName; var key = currentNodeName; @@ -99,8 +100,8 @@ this.addPropertiesToMap(parentContainer, key, value, currentNode.parentNode); } - - //This add concern only the nodes which have an atomic content + + //This add concern only the nodes which have an atomic content if (this.isMapNotEmpty(nodeDataMap) && childNodes.length == 1) { var key = "#text"; var value = currentChildNode.nodeValue; @@ -109,14 +110,14 @@ } } } - + //Addition of node in parent container even if this one have not a value - if (!this.unwantedNodeName[currentNode.nodeName] && + if (!this.unwantedNodeName[currentNode.nodeName] && !currentChildNode) { - + var currentNodeName = currentNode.nodeName; var key = currentNodeName; - this.addPropertiesToMap(parentContainer, key, null, + this.addPropertiesToMap(parentContainer, key, null, currentNode.parentNode); } @@ -124,46 +125,46 @@ if (this.isMapNotEmpty(nodeDataMap)) { var key = currentNodeName; // parentContainer[key] = nodeDataMap; - this.addPropertiesToMap(parentContainer, key, nodeDataMap, + this.addPropertiesToMap(parentContainer, key, nodeDataMap, currentNode.parentNode); } - + return parentContainer; - }, - - isMapNotEmpty: function(map) { + } + + isMapNotEmpty(map) { return Object.keys(map).length > 0; - }, - + } + /* - * + * */ - addPropertiesToMap: function(map, key, value, parentNode) { + addPropertiesToMap(map, key, value, parentNode) { // map[key] = value; - + var childNodesWithSpecificName = parentNode.getElementsByTagName(key); - var specificNodesNumber = childNodesWithSpecificName.length; - + var specificNodesNumber = childNodesWithSpecificName.length; + if ((specificNodesNumber > 1) && !map[key]) { - map[key] = []; + map[key] = []; } - + var nodeValue = map[key]; - + var value = this.setValue(value); - + if (nodeValue && (nodeValue instanceof Array)) { map[key].push(value); } else { map[key] = value; } - }, - - setValue: function(value) { + } + + setValue(value) { var newValue = this.mappingValue[value]; if ((typeof value) == "string" && newValue != undefined) { return newValue; } return value; } -}); +}

1 0

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

09 Jun '15

Author: ygrego Date: 2015-06-09 19:40:16 +0000 (Tue, 09 Jun 2015) New Revision: 1675 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1675 Log: Refactoring of class ProgrammeService in an ES6 class. Modified: oipf/lib/js/utils/ProgrammeService.js Modified: oipf/lib/js/utils/ProgrammeService.js =================================================================== --- oipf/lib/js/utils/ProgrammeService.js 2015-06-09 16:29:13 UTC (rev 1674) +++ oipf/lib/js/utils/ProgrammeService.js 2015-06-09 19:40:16 UTC (rev 1675) @@ -1,12 +1,12 @@ -/* +/* * 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 ProgrammeService = Class.extend({ - - init: function(programmes) { +class ProgrammeService { + + constructor(programmes) { this.programmes = programmes; } -}); +}

1 0