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

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

28 May '15

Author: ygrego Date: 2015-05-28 12:29:54 +0000 (Thu, 28 May 2015) New Revision: 1534 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1534 Log: Modification of the second element of the "if" condition. Modified: oipf/js/utils/XmlToJson.js Modified: oipf/js/utils/XmlToJson.js =================================================================== --- oipf/js/utils/XmlToJson.js 2015-05-28 12:07:31 UTC (rev 1533) +++ oipf/js/utils/XmlToJson.js 2015-05-28 12:29:54 UTC (rev 1534) @@ -101,7 +101,7 @@ } //This add concern only the nodes which have an atomic content - if (this.isMapNotEmpty(nodeDataMap) && !currentChildNode) { + if (this.isMapNotEmpty(nodeDataMap) && childNodes.length == 1) { var key = "#text"; var value = currentChildNode.nodeValue; this.addPropertiesToMap(nodeDataMap, key, value,

1 0

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

28 May '15

Author: ygrego Date: 2015-05-28 12:07:31 +0000 (Thu, 28 May 2015) New Revision: 1533 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1533 Log: Just pass to the method "initProgrammes" the object "data". Modified: oipf/js/utils/ProgrammeHelper.js Modified: oipf/js/utils/ProgrammeHelper.js =================================================================== --- oipf/js/utils/ProgrammeHelper.js 2015-05-28 10:30:04 UTC (rev 1532) +++ oipf/js/utils/ProgrammeHelper.js 2015-05-28 12:07:31 UTC (rev 1533) @@ -35,7 +35,7 @@ this.channelService = new ChannelService(); this.type = "XML_TV"; this.programmes = []; - data && this.initProgrammes(data.tv.programme); + data && this.initProgrammes(data); }, /*

1 0

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

28 May '15

Author: ygrego Date: 2015-05-28 10:30:04 +0000 (Thu, 28 May 2015) New Revision: 1532 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1532 Log: Deletion of "console.log()" in method "initJson". Modified: oipf/js/utils/XmlToJson.js Modified: oipf/js/utils/XmlToJson.js =================================================================== --- oipf/js/utils/XmlToJson.js 2015-05-28 10:27:49 UTC (rev 1531) +++ oipf/js/utils/XmlToJson.js 2015-05-28 10:30:04 UTC (rev 1532) @@ -26,7 +26,7 @@ if (!this.xmlDocument) { return null; } - console.log(this.xmlDocument.firstChild); + this.rootsNode = this.xmlDocument.firstChild; //We already know that document contains at least one child.

1 0

r1531 - oipf/init
by ygrego＠users.nuiton.org 28 May '15

28 May '15

Author: ygrego Date: 2015-05-28 10:27:49 +0000 (Thu, 28 May 2015) New Revision: 1531 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1531 Log: Deletion of parameter passed in constructor "ModelFactory". Modified: oipf/init/init.js Modified: oipf/init/init.js =================================================================== --- oipf/init/init.js 2015-05-28 10:25:54 UTC (rev 1530) +++ oipf/init/init.js 2015-05-28 10:27:49 UTC (rev 1531) @@ -53,7 +53,7 @@ ]; if (!oipfObjectFactory) { - var modelFactory = new ModelFactory(data); + var modelFactory = new ModelFactory(); var dateUtils = new DateUtils(); var oipfObjectFactory = new OipfObjectFactory(modelFactory, dateUtils); }

1 0

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

28 May '15

Author: ygrego Date: 2015-05-28 10:25:54 +0000 (Thu, 28 May 2015) New Revision: 1530 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1530 Log: Change the name class of this class. Modified: oipf/js/utils/ProgrammeHelper.js Modified: oipf/js/utils/ProgrammeHelper.js =================================================================== --- oipf/js/utils/ProgrammeHelper.js 2015-05-28 10:24:53 UTC (rev 1529) +++ oipf/js/utils/ProgrammeHelper.js 2015-05-28 10:25:54 UTC (rev 1530) @@ -3,7 +3,7 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ -var XmlTvData = Class.extend({ +var ProgrammeHelper = Class.extend({ map: { "title": "name",

1 0

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

28 May '15

Author: ygrego Date: 2015-05-28 10:24:53 +0000 (Thu, 28 May 2015) New Revision: 1529 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1529 Log: The property "_metadata" is instanciated with attribute "programmes" of property "_programmeService" in method "init". Modified: oipf/js/impl/SearchManagerObject.js Modified: oipf/js/impl/SearchManagerObject.js =================================================================== --- oipf/js/impl/SearchManagerObject.js 2015-05-28 10:22:50 UTC (rev 1528) +++ oipf/js/impl/SearchManagerObject.js 2015-05-28 10:24:53 UTC (rev 1529) @@ -110,8 +110,7 @@ this._listeners = {}; this._callbacks = {}; this._eventManager = new EventManager(); - this._metadata = this._modelFactory - .getMetadataManager().getMetadata("XML_TV"); + this._metadata = this._programmeService.programmes; }, /*

1 0

r1528 - oipf/view
by ygrego＠users.nuiton.org 28 May '15

28 May '15

Author: ygrego Date: 2015-05-28 10:22:50 +0000 (Thu, 28 May 2015) New Revision: 1528 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1528 Log: Addition of javascrip source file "ProgrammeHelper". Modified: oipf/view/test.html Modified: oipf/view/test.html =================================================================== --- oipf/view/test.html 2015-05-28 10:05:00 UTC (rev 1527) +++ oipf/view/test.html 2015-05-28 10:22:50 UTC (rev 1528) @@ -35,6 +35,7 @@ <script src="../js/utils/XmlParser.js" type="text/javascript"></script> <script src="../js/utils/ProgrammeService.js" type="text/javascript"></script> <script src="../js/utils/XmlToJson.js" type="text/javascript"></script> + <script src="../js/utils/ProgrammeHelper.js" type="text/javascript"></script> <script src="../configuration/ConfigDefaultProperties.js" type="text/javascript"></script> <script src="../configuration/CapabilitiesProperties.js" type="text/javascript"></script> @@ -75,8 +76,6 @@ <script src="../js/impl/ApplicationManagerObject.js" type="text/javascript"></script> <script src="../js/utils/ChannelService.js" type="text/javascript"></script> - <script src="../data/data.js" type="text/javascript"></script> - <script src="../data/XmlTvData.js" type="text/javascript"></script> <script src="../js/impl/model/ModelFactory.js" type="text/javascript"></script> <script src="../init/init.js" type="text/javascript"></script>

1 0

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

28 May '15

Author: ygrego Date: 2015-05-28 10:05:00 +0000 (Thu, 28 May 2015) New Revision: 1527 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1527 Log: Deletion of all "console.log" in method "setPropertiesFromDomNodeList". Modified: oipf/js/utils/XmlToJson.js Modified: oipf/js/utils/XmlToJson.js =================================================================== --- oipf/js/utils/XmlToJson.js 2015-05-28 09:59:29 UTC (rev 1526) +++ oipf/js/utils/XmlToJson.js 2015-05-28 10:05:00 UTC (rev 1527) @@ -68,10 +68,9 @@ setPropertiesFromDomNodeList: function(currentNode, parentContainer) { if (this.unwantedNodeName[currentNode.nodeName]) { - console.log("This node are useless.", currentNode.nodeName); return; } - console.log(currentNode.nodeName); + var childNodes = currentNode.childNodes; var childNodeName; var currentChildNode; @@ -84,7 +83,6 @@ for (var i = 0, li = childNodes.length; i < li; i++) { currentChildNode = childNodes[i]; childNodeName = currentChildNode.nodeName; - console.log(childNodeName); if (!this.unwantedNodeName[childNodeName]) { nodeDataMap = this.setPropertiesFromDomNodeList @@ -94,8 +92,6 @@ if (/\w+/.exec(currentChildNode.nodeValue) && (currentChildNode.childNodes.length == 0)) { - console.log(currentChildNode.nodeValue); - if (!this.isMapNotEmpty(nodeDataMap)) { var currentNodeName = currentNode.nodeName; var key = currentNodeName;

1 0

r1526 - oipf/view
by ygrego＠users.nuiton.org 28 May '15

28 May '15

Author: ygrego Date: 2015-05-28 09:59:29 +0000 (Thu, 28 May 2015) New Revision: 1526 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1526 Log: Modification of severals scripts sources. Modified: oipf/view/test.html Modified: oipf/view/test.html =================================================================== --- oipf/view/test.html 2015-05-28 09:53:03 UTC (rev 1525) +++ oipf/view/test.html 2015-05-28 09:59:29 UTC (rev 1526) @@ -36,9 +36,9 @@ <script src="../js/utils/ProgrammeService.js" type="text/javascript"></script> <script src="../js/utils/XmlToJson.js" type="text/javascript"></script> - <script src="../js/configuration/ConfigDefaultProperties.js" type="text/javascript"></script> - <script src="../js/configuration/CapabilitiesProperties.js" type="text/javascript"></script> - <script src="../js/configuration/OipfConfiguration.js" type="text/javascript"></script> + <script src="../configuration/ConfigDefaultProperties.js" type="text/javascript"></script> + <script src="../configuration/CapabilitiesProperties.js" type="text/javascript"></script> + <script src="../configuration/OipfConfiguration.js" type="text/javascript"></script> <script src="../js/impl/model/Collection.js" type="text/javascript"></script> <script src="../js/impl/model/SignalInfo.js" type="text/javascript"></script> @@ -89,7 +89,7 @@ <script src="../js/test/SearchManagerTest.js" type="text/javascript"></script> <script src="../js/test/VideoBroadcastTest.js" type="text/javascript"></script> <script src="../js/test/OipfFactoryTest.js" type="text/javascript"></script> - <script src="../js/configuration/TestConfig.js" type="text/javascript"></script> + <script src="../configuration/TestConfig.js" type="text/javascript"></script> <script src="../js/test/Test.js" type="text/javascript"></script> <script>

1 0

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

28 May '15

Author: ygrego Date: 2015-05-28 09:53:03 +0000 (Thu, 28 May 2015) New Revision: 1525 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1525 Log: Rename the parameter "programmes" in "programmesJson". Modified: oipf/js/utils/ProgrammeService.js Modified: oipf/js/utils/ProgrammeService.js =================================================================== --- oipf/js/utils/ProgrammeService.js 2015-05-28 09:49:35 UTC (rev 1524) +++ oipf/js/utils/ProgrammeService.js 2015-05-28 09:53:03 UTC (rev 1525) @@ -6,7 +6,7 @@ var ProgrammeService = Class.extend({ - init: function(programmes) { - this.programmes = programmes; + init: function(programmesJson) { + this.programmes = programmesJson; } });

1 0