Author: ygrego Date: 2015-03-11 11:17:53 +0000 (Wed, 11 Mar 2015) New Revision: 929 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/929 Log: New declaration of channel object. Modified: oipf/js/impl/ChannelConfig.js Modified: oipf/js/impl/ChannelConfig.js =================================================================== --- oipf/js/impl/ChannelConfig.js 2015-03-11 11:12:08 UTC (rev 928) +++ oipf/js/impl/ChannelConfig.js 2015-03-11 11:17:53 UTC (rev 929) @@ -39,7 +39,7 @@ * Visibility Type : readonly Channel */ currentChannel: null, - + /* * Description: * The list of channels. @@ -67,7 +67,7 @@ * * Visibility Type : readonly ChannelList */ - channelList: null, + channelList: null, /* Visibility : readonly FavouriteListCollection */ @@ -93,19 +93,20 @@ }, init: function() { - - var calculation = new Calculation();//Necessary to generate a unique id for each channel. - + var channelType = "TYPE_TV"; var channelName = "ARTE"; var channelIdType = 12; - var channelArte = new Channel(channelName, channelType, "channelId:"+calculation.genId(100,1), channelIdType); + var channelArte = new Channel(channelIdType, 52, 53, 54, channelName); channelName = "FRANCE_5"; - var channelFrance5 = new Channel(channelName, channelType, "channelId:"+calculation.genId(100,1), channelIdType); + var channelFrance5 = new Channel(channelIdType, 12, 13, 14, channelName); + + channelName = "FRANCE_4"; + var channelFrance4 = new Channel(channelIdType, 22, 23, 24, channelName); this.currentChannel = channelArte; - this.channelList = new ChannelList(channelArte, channelFrance5); + this.channelList = new ChannelList(channelArte, channelFrance5, channelFrance4); this.favouriteLists = new FavouriteListCollection(); this.currentFavouriteList = new FavouriteList(); },