Author: ygrego Date: 2015-06-09 16:29:13 +0000 (Tue, 09 Jun 2015) New Revision: 1674 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1674 Log: Refactoring of class ProgrammeHelper in an ES6 class. Modified: oipf/lib/js/utils/ProgrammeHelper.js Modified: oipf/lib/js/utils/ProgrammeHelper.js =================================================================== --- oipf/lib/js/utils/ProgrammeHelper.js 2015-06-09 16:12:46 UTC (rev 1673) +++ oipf/lib/js/utils/ProgrammeHelper.js 2015-06-09 16:29:13 UTC (rev 1674) @@ -3,44 +3,19 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ -var ProgrammeHelper = Class.extend({ +class ProgrammeHelper { - map: { - "title": "name", - "start": "startTime", - "desc": "description", - "length#text": "duration", - "episode-num#text": "episode" - }, - - 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" - }, - - programmes: null, - - init: function(channelService) { + constructor(channelService) { + programmes = null; this.channelService = channelService; this.programmes = []; - }, + } /* * Description: * Don't take in charge the "credits" property of a xmlTv programmes for the moment. */ - initProgrammes: function(programmeList) { + initProgrammes(programmeList) { for (var i = 0, l = programmeList.length; i < l; i++) { var programme = {}; var object = programmeList[i]; @@ -61,7 +36,7 @@ channelName = self.channelNameMap[element]; } if (key == "#text") { - key = parentKey+key; + key = parentKey + key; if (key == "length#text") { element = self.minutesToSeconds(element); } @@ -82,13 +57,13 @@ } return this.programmes; - }, + } - initChannel: function(name) { + initChannel(name) { return this.channelService.getADvbTChannel(name); - }, + } - transformToActualDate: function(wrongDateFormat) { + transformToActualDate(wrongDateFormat) { var pattern = /(\d{4})(\d{2})(\d{2})(\d{2})(\d{2})(\d{2})\s\+(\d{2})/; var tmpDate = wrongDateFormat; @@ -107,15 +82,15 @@ var actualDate = new Date(year, month, day, hs, mins, secs); return actualDate; - }, + } - transformInSecondSince01011970: function(wrongDateFormat) { + transformInSecondSince01011970(wrongDateFormat) { return this.transformToActualDate(wrongDateFormat).getTime() / 1000; - }, + } - minutesToSeconds: function(minutes) { - return minutes*60; + minutesToSeconds(minutes) { + return minutes * 60; } -}); +}