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

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

28 May '15

Author: ygrego Date: 2015-05-28 13:30:59 +0000 (Thu, 28 May 2015) New Revision: 1544 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1544 Log: Modification of variable "programmes" in method "getResults". Modified: oipf/js/impl/model/SearchResults.js Modified: oipf/js/impl/model/SearchResults.js =================================================================== --- oipf/js/impl/model/SearchResults.js 2015-05-28 13:12:29 UTC (rev 1543) +++ oipf/js/impl/model/SearchResults.js 2015-05-28 13:30:59 UTC (rev 1544) @@ -103,7 +103,7 @@ this.offset = offset; this._count = count; var self = this; - var programmes = this._search._searchManager._metadata.programmes; + var programmes = this._search._searchManager._metadata; /* * Verify some conditions before beginning of

1 0

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

28 May '15

Author: ygrego Date: 2015-05-28 13:12:29 +0000 (Thu, 28 May 2015) New Revision: 1543 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1543 Log: Deletion of property "_modelFactory". Modified: oipf/js/impl/SearchManagerObject.js Modified: oipf/js/impl/SearchManagerObject.js =================================================================== --- oipf/js/impl/SearchManagerObject.js 2015-05-28 13:06:52 UTC (rev 1542) +++ oipf/js/impl/SearchManagerObject.js 2015-05-28 13:12:29 UTC (rev 1543) @@ -104,9 +104,8 @@ _metadata: null, - init: function(modelFactory, programmeService) { + init: function(programmeService) { this._programmeService = programmeService; - this._modelFactory = modelFactory; this._listeners = {}; this._callbacks = {}; this._eventManager = new EventManager();

1 0

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

28 May '15

Author: ygrego Date: 2015-05-28 13:06:52 +0000 (Thu, 28 May 2015) New Revision: 1542 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1542 Log: Pass the right parameter to the method "initProgrammes" (modification in the method "_setSearchManagerObject"). Modified: oipf/js/impl/OipfObjectFactory.js Modified: oipf/js/impl/OipfObjectFactory.js =================================================================== --- oipf/js/impl/OipfObjectFactory.js 2015-05-28 12:52:19 UTC (rev 1541) +++ oipf/js/impl/OipfObjectFactory.js 2015-05-28 13:06:52 UTC (rev 1542) @@ -664,7 +664,7 @@ _setSearchManagerObject: function(programmesJson) { var oipfProgrammes = new ProgrammeHelper() - .initProgrammes(programmesJson); + .initProgrammes(programmesJson.tv.programme); var programmeService = new ProgrammeService(oipfProgrammes); this.searchManagerObject = new SearchManagerObject(this._modelFactory, programmeService);

1 0

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

28 May '15

Author: ygrego Date: 2015-05-28 12:52:19 +0000 (Thu, 28 May 2015) New Revision: 1541 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1541 Log: Additon of a programme helper in method "_setSearchManagerObject" in order to transform the "Json" object into an oipf object (Programme object). Modified: oipf/js/impl/OipfObjectFactory.js Modified: oipf/js/impl/OipfObjectFactory.js =================================================================== --- oipf/js/impl/OipfObjectFactory.js 2015-05-28 12:46:09 UTC (rev 1540) +++ oipf/js/impl/OipfObjectFactory.js 2015-05-28 12:52:19 UTC (rev 1541) @@ -663,7 +663,9 @@ }, _setSearchManagerObject: function(programmesJson) { - var programmeService = new ProgrammeService(programmesJson); + var oipfProgrammes = new ProgrammeHelper() + .initProgrammes(programmesJson); + var programmeService = new ProgrammeService(oipfProgrammes); this.searchManagerObject = new SearchManagerObject(this._modelFactory, programmeService); }

1 0

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

28 May '15

Author: ygrego Date: 2015-05-28 12:46:09 +0000 (Thu, 28 May 2015) New Revision: 1540 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1540 Log: Rename the construtor's parameter of this class. Modified: oipf/js/utils/ProgrammeService.js Modified: oipf/js/utils/ProgrammeService.js =================================================================== --- oipf/js/utils/ProgrammeService.js 2015-05-28 12:43:27 UTC (rev 1539) +++ oipf/js/utils/ProgrammeService.js 2015-05-28 12:46:09 UTC (rev 1540) @@ -6,7 +6,7 @@ var ProgrammeService = Class.extend({ - init: function(programmesJson) { - this.programmes = programmesJson; + init: function(programmes) { + this.programmes = programmes; } });

1 0

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

28 May '15

Author: ygrego Date: 2015-05-28 12:43:27 +0000 (Thu, 28 May 2015) New Revision: 1539 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1539 Log: Deletion of constructor's parameter. Modified: oipf/js/utils/ProgrammeHelper.js Modified: oipf/js/utils/ProgrammeHelper.js =================================================================== --- oipf/js/utils/ProgrammeHelper.js 2015-05-28 12:39:15 UTC (rev 1538) +++ oipf/js/utils/ProgrammeHelper.js 2015-05-28 12:43:27 UTC (rev 1539) @@ -31,10 +31,9 @@ programmes: null, - init: function(data) { + init: function() { this.channelService = new ChannelService(); this.programmes = []; - data && this.initProgrammes(data); }, /*

1 0

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

28 May '15

Author: ygrego Date: 2015-05-28 12:39:15 +0000 (Thu, 28 May 2015) New Revision: 1538 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1538 Log: The method "initProgrammes" return the programmes created. Modified: oipf/js/utils/ProgrammeHelper.js Modified: oipf/js/utils/ProgrammeHelper.js =================================================================== --- oipf/js/utils/ProgrammeHelper.js 2015-05-28 12:37:13 UTC (rev 1537) +++ oipf/js/utils/ProgrammeHelper.js 2015-05-28 12:39:15 UTC (rev 1538) @@ -81,6 +81,8 @@ var programmeObject = new Programme(programme); this.programmes.push(programmeObject); } + + return this.programmes; }, initChannel: function(name) {

1 0

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

28 May '15

Author: ygrego Date: 2015-05-28 12:37:13 +0000 (Thu, 28 May 2015) New Revision: 1537 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1537 Log: Deletion of the key "-start" and add this one "start" in the property map of this class. Modified: oipf/js/utils/ProgrammeHelper.js Modified: oipf/js/utils/ProgrammeHelper.js =================================================================== --- oipf/js/utils/ProgrammeHelper.js 2015-05-28 12:35:20 UTC (rev 1536) +++ oipf/js/utils/ProgrammeHelper.js 2015-05-28 12:37:13 UTC (rev 1537) @@ -7,7 +7,7 @@ map: { "title": "name", - "-start": "startTime", + "start": "startTime", "desc": "description", "length#text": "duration", "episode-num#text": "episode"

1 0

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

28 May '15

Author: ygrego Date: 2015-05-28 12:35:20 +0000 (Thu, 28 May 2015) New Revision: 1536 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1536 Log: Modification of somes values in condition of "if" statement. Modified: oipf/js/utils/ProgrammeHelper.js Modified: oipf/js/utils/ProgrammeHelper.js =================================================================== --- oipf/js/utils/ProgrammeHelper.js 2015-05-28 12:33:03 UTC (rev 1535) +++ oipf/js/utils/ProgrammeHelper.js 2015-05-28 12:35:20 UTC (rev 1536) @@ -55,10 +55,10 @@ if (element instanceof Object) { createProgramme(element, programme, key); } else { - if (key == "-start") { + if (key == "start") { element = self.transformInSecondSince01011970(element); } - if (key == "-channel") { + if (key == "channel") { channelName = self.channelNameMap[element]; } if (key == "#text") {

1 0

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

28 May '15

Author: ygrego Date: 2015-05-28 12:33:03 +0000 (Thu, 28 May 2015) New Revision: 1535 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1535 Log: Deletion of property "type" in constructor. Modified: oipf/js/utils/ProgrammeHelper.js Modified: oipf/js/utils/ProgrammeHelper.js =================================================================== --- oipf/js/utils/ProgrammeHelper.js 2015-05-28 12:29:54 UTC (rev 1534) +++ oipf/js/utils/ProgrammeHelper.js 2015-05-28 12:33:03 UTC (rev 1535) @@ -33,7 +33,6 @@ init: function(data) { this.channelService = new ChannelService(); - this.type = "XML_TV"; this.programmes = []; data && this.initProgrammes(data); },

1 0