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

r1554 - oipf/js/utils
by ygrego＠users.nuiton.org 28 May '15

28 May '15

Author: ygrego Date: 2015-05-28 15:30:49 +0000 (Thu, 28 May 2015) New Revision: 1554 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1554 Log: Rename a variable in method "createChannelList". Modified: oipf/js/utils/ChannelService.js Modified: oipf/js/utils/ChannelService.js =================================================================== --- oipf/js/utils/ChannelService.js 2015-05-28 15:29:19 UTC (rev 1553) +++ oipf/js/utils/ChannelService.js 2015-05-28 15:30:49 UTC (rev 1554) @@ -37,8 +37,8 @@ for (var i = 0, li = this.channelListArray.length; i < li; i++) { var channel = this.channelListArray[i]; - var newOifpChannel = new Channel(channel); - this.channelList && this.channelList.push(newOifpChannel); + var newOipfChannel = new Channel(channel); + this.channelList && this.channelList.push(newOipfChannel); } }

1 0

r1553 - oipf/js/utils
by ygrego＠users.nuiton.org 28 May '15

28 May '15

Author: ygrego Date: 2015-05-28 15:29:19 +0000 (Thu, 28 May 2015) New Revision: 1553 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1553 Log: The loop concerns the property "channelListArray". Modified: oipf/js/utils/ChannelService.js Modified: oipf/js/utils/ChannelService.js =================================================================== --- oipf/js/utils/ChannelService.js 2015-05-28 15:25:39 UTC (rev 1552) +++ oipf/js/utils/ChannelService.js 2015-05-28 15:29:19 UTC (rev 1553) @@ -34,11 +34,9 @@ createChannelList: function() { if (this.channelNumber > 0) { - var keys = Object.keys(this.channelListArray); - for (var i = 0, li = keys.length; i < li; i++) { - - var channel = this.channelListArray[keys[i]]; - + + for (var i = 0, li = this.channelListArray.length; i < li; i++) { + var channel = this.channelListArray[i]; var newOifpChannel = new Channel(channel); this.channelList && this.channelList.push(newOifpChannel);

1 0

r1552 - oipf/js/utils
by ygrego＠users.nuiton.org 28 May '15

28 May '15

Author: ygrego Date: 2015-05-28 15:25:39 +0000 (Thu, 28 May 2015) New Revision: 1552 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1552 Log: The property "channelListJson" has been renamed in "channelListArray" and the parameter "channelListJson" in "channelList". Modified: oipf/js/utils/ChannelService.js Modified: oipf/js/utils/ChannelService.js =================================================================== --- oipf/js/utils/ChannelService.js 2015-05-28 15:22:09 UTC (rev 1551) +++ oipf/js/utils/ChannelService.js 2015-05-28 15:25:39 UTC (rev 1552) @@ -10,10 +10,10 @@ }, - init: function(currentChannel, channelNumber, channelOrigin, channelListJson) { + init: function(currentChannel, channelNumber, channelOrigin, channelList) { this.channelNumber = channelNumber; this.channelOrigin = channelOrigin; - this.channelListJson = channelListJson; + this.channelListArray = channelList; this.getNumber = oipf.utils.generateFourDigit.bind(null); var channelName = "ARTE"; var channelIdType = 12; @@ -33,11 +33,11 @@ }, createChannelList: function() { - if (channelNumber > 0) { - var keys = Object.keys(this.channelListJson); + if (this.channelNumber > 0) { + var keys = Object.keys(this.channelListArray); for (var i = 0, li = keys.length; i < li; i++) { - var channel = this.channelListJson[keys[i]]; + var channel = this.channelListArray[keys[i]]; var newOifpChannel = new Channel(channel); this.channelList && this.channelList.push(newOifpChannel);

1 0

r1551 - oipf/js/impl
by ygrego＠users.nuiton.org 28 May '15

28 May '15

Author: ygrego Date: 2015-05-28 15:22:09 +0000 (Thu, 28 May 2015) New Revision: 1551 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1551 Log: Call "ChannelService" constructor with the right parameter. Modified: oipf/js/impl/OipfObjectFactory.js Modified: oipf/js/impl/OipfObjectFactory.js =================================================================== --- oipf/js/impl/OipfObjectFactory.js 2015-05-28 15:17:21 UTC (rev 1550) +++ oipf/js/impl/OipfObjectFactory.js 2015-05-28 15:22:09 UTC (rev 1551) @@ -658,7 +658,8 @@ }, _setChannelConfig: function(channelListJson) { - var channelService = new ChannelService(null, channelListJson); + var channelService = + new ChannelService(null, channelListJson.channelList.channel); this.channelConfig = new ChannelConfig(channelService); },

1 0

r1550 - oipf/js/utils
by ygrego＠users.nuiton.org 28 May '15

28 May '15

Author: ygrego Date: 2015-05-28 15:17:21 +0000 (Thu, 28 May 2015) New Revision: 1550 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1550 Log: Modification of the property "channelList" and call of the method "createChannelList" in constructor. Modified: oipf/js/utils/ChannelService.js Modified: oipf/js/utils/ChannelService.js =================================================================== --- oipf/js/utils/ChannelService.js 2015-05-28 15:10:59 UTC (rev 1549) +++ oipf/js/utils/ChannelService.js 2015-05-28 15:17:21 UTC (rev 1550) @@ -26,7 +26,8 @@ var channelFrance4 = new Channel(channelIdType, 22, 23, 24, channelName); this.currentChannel = currentChannel || channelArte; - this.channelList = new ChannelList(channelArte, channelFrance5, channelFrance4); + this.channelList = new ChannelList(); + this.createChannelList(); this.favouriteLists = new FavouriteListCollection(); this.currentFavouriteList = new FavouriteList(); },

1 0

r1549 - oipf/js/utils
by ygrego＠users.nuiton.org 28 May '15

28 May '15

Author: ygrego Date: 2015-05-28 15:10:59 +0000 (Thu, 28 May 2015) New Revision: 1549 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1549 Log: Addition of the new channel created in the current channel list. (Modification in methode "createChannelList". Modified: oipf/js/utils/ChannelService.js Modified: oipf/js/utils/ChannelService.js =================================================================== --- oipf/js/utils/ChannelService.js 2015-05-28 15:06:34 UTC (rev 1548) +++ oipf/js/utils/ChannelService.js 2015-05-28 15:10:59 UTC (rev 1549) @@ -39,6 +39,7 @@ var channel = this.channelListJson[keys[i]]; var newOifpChannel = new Channel(channel); + this.channelList && this.channelList.push(newOifpChannel); } }

1 0

r1548 - oipf/js/utils
by ygrego＠users.nuiton.org 28 May '15

28 May '15

Author: ygrego Date: 2015-05-28 15:06:34 +0000 (Thu, 28 May 2015) New Revision: 1548 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1548 Log: Addition of the method "createChannelList". Modified: oipf/js/utils/ChannelService.js Modified: oipf/js/utils/ChannelService.js =================================================================== --- oipf/js/utils/ChannelService.js 2015-05-28 13:53:16 UTC (rev 1547) +++ oipf/js/utils/ChannelService.js 2015-05-28 15:06:34 UTC (rev 1548) @@ -31,6 +31,19 @@ this.currentFavouriteList = new FavouriteList(); }, + createChannelList: function() { + if (channelNumber > 0) { + var keys = Object.keys(this.channelListJson); + for (var i = 0, li = keys.length; i < li; i++) { + + var channel = this.channelListJson[keys[i]]; + + var newOifpChannel = new Channel(channel); + + } + } + }, + prevChannel: function(channelCollection, channel) { return channelUtils.findChannel(channelCollection, channel, -1); },

1 0

r1547 - oipf/js/utils
by ygrego＠users.nuiton.org 28 May '15

28 May '15

Author: ygrego Date: 2015-05-28 13:53:16 +0000 (Thu, 28 May 2015) New Revision: 1547 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1547 Log: Addition of properties "channelNumber" and "channelOrigin" to the class. (Modification in constructor) Modified: oipf/js/utils/ChannelService.js Modified: oipf/js/utils/ChannelService.js =================================================================== --- oipf/js/utils/ChannelService.js 2015-05-28 13:46:04 UTC (rev 1546) +++ oipf/js/utils/ChannelService.js 2015-05-28 13:53:16 UTC (rev 1547) @@ -11,6 +11,8 @@ }, init: function(currentChannel, channelNumber, channelOrigin, channelListJson) { + this.channelNumber = channelNumber; + this.channelOrigin = channelOrigin; this.channelListJson = channelListJson; this.getNumber = oipf.utils.generateFourDigit.bind(null); var channelName = "ARTE";

1 0

r1546 - oipf/js/utils
by ygrego＠users.nuiton.org 28 May '15

28 May '15

Author: ygrego Date: 2015-05-28 13:46:04 +0000 (Thu, 28 May 2015) New Revision: 1546 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1546 Log: Modification of the constructor's interface, addition of parameters "channelNumber" and "channelOrigin". Modified: oipf/js/utils/ChannelService.js Modified: oipf/js/utils/ChannelService.js =================================================================== --- oipf/js/utils/ChannelService.js 2015-05-28 13:37:06 UTC (rev 1545) +++ oipf/js/utils/ChannelService.js 2015-05-28 13:46:04 UTC (rev 1546) @@ -10,7 +10,7 @@ }, - init: function(currentChannel, channelListJson) { + init: function(currentChannel, channelNumber, channelOrigin, channelListJson) { this.channelListJson = channelListJson; this.getNumber = oipf.utils.generateFourDigit.bind(null); var channelName = "ARTE";

1 0

r1545 - oipf/js/impl
by ygrego＠users.nuiton.org 28 May '15

28 May '15

Author: ygrego Date: 2015-05-28 13:37:06 +0000 (Thu, 28 May 2015) New Revision: 1545 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1545 Log: Deletion of parameter "_modelFactory" for the creation of an object "SearchManagerObject". Modified: oipf/js/impl/OipfObjectFactory.js Modified: oipf/js/impl/OipfObjectFactory.js =================================================================== --- oipf/js/impl/OipfObjectFactory.js 2015-05-28 13:30:59 UTC (rev 1544) +++ oipf/js/impl/OipfObjectFactory.js 2015-05-28 13:37:06 UTC (rev 1545) @@ -667,6 +667,6 @@ .initProgrammes(programmesJson.tv.programme); var programmeService = new ProgrammeService(oipfProgrammes); this.searchManagerObject = - new SearchManagerObject(this._modelFactory, programmeService); + new SearchManagerObject(programmeService); } });

1 0