Author: ygrego Date: 2015-03-31 07:48:04 +0000 (Tue, 31 Mar 2015) New Revision: 987 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/987 Log: New methods added for manage event on page "test.html", and new javscript sources files. Modified: oipf/view/test.html Modified: oipf/view/test.html =================================================================== --- oipf/view/test.html 2015-03-31 07:45:53 UTC (rev 986) +++ oipf/view/test.html 2015-03-31 07:48:04 UTC (rev 987) @@ -9,11 +9,17 @@ <title>OIPF Tests</title> <meta charset="UTF-8"> <meta name="viewport" content="width=device-width, initial-scale=1.0"> - <link rel="stylesheet" type="text/css" href="css/test.css"/> + <link rel="stylesheet" type="text/css" href="../css/test.css"/> + <script src="../js/utils/es6-promises.js" type="text/javascript"></script> + <script> + var Promise = Promise || ES6Promise.Promise; + </script> <script src="../js/lib/Class.js" type="text/javascript"></script> + <script src="../js/utils/Timeout.js" type="text/javascript"></script> <script src="../js/utils/Calculation.js" type="text/javascript"></script> <script src="../js/utils/ChannelUtils.js" type="text/javascript"></script> <script src="../js/utils/Utils.js" type="text/javascript"></script> + <script src="../js/utils/EventManager.js" type="text/javascript"></script> <script src="../js/impl/model/FavouriteList.js" type="text/javascript"></script> <script src="../js/impl/model/FavouriteListCollection.js" type="text/javascript"></script> <script src="../js/impl/model/IntegerCollection.js" type="text/javascript"></script> @@ -29,43 +35,76 @@ <script src="../js/impl/model/SearchResults.js" type="text/javascript"></script> <script src="../js/impl/model/constants/VideoBroadcastConstants.js" type="text/javascript"></script> <script src="../js/impl/model/constants/DaeMimeType.js" type="text/javascript"></script> + <script src="../js/impl/model/constants/IdType.js" type="text/javascript"></script> <script src="../js/impl/OipfObjectFactory.js" type="text/javascript"></script> <script src="../js/impl/ConfigurationObject.js" type="text/javascript"></script> <script src="../js/impl/ChannelConfig.js" type="text/javascript"></script> <script src="../js/impl/VideoBroadcastObject.js" type="text/javascript"></script> <script src="../js/impl/SearchManagerObject.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="../js/initObj/init.js" type="text/javascript"></script> <script src="../js/test/TestCase.js" type="text/javascript"></script> <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/test/Test.js" type="text/javascript"></script> - <script src="../data/data.js" type="text/javascript"></script> - <script src="../js/initObj/init.js" type="text/javascript"></script> <script> function start() { var tests = new Test(); tests.displayInLineArray(); - addListenerForEachTestButton(tests); - document.getElementById("runAllBtn").addEventListener("click",tests.runAll.bind(tests),false); + addListenerForButton(tests); + document.getElementById("runAllBtn").onclick = tests.runAll.bind(tests); +// if (ApplicationManager && !ApplicationManager.getWindows()[0].active) { +// ApplicationManager.getWindows()[0].activate(); +// } } + function hideOrShowTestSection(sectionId) { var style = document.getElementById(sectionId).style; style.display = (style.display == "none") ? "block" : "none"; } - function addListenerForEachTestButton(testClass){ + + function runAndShow(i, testClass) { + testClass.runSectionTest(i, 0); + var style = document.getElementById((/runAll(\w+)Btn/g + .exec(document.activeElement.id))[1] + "Section").style; + if (style.display == "none") { + style.display = "block"; + } + } + + function addListenerForButton(testClass){ for (var i = 0, l0 = testClass.testsObjects.length; i < l0; i++) { - var currentElement = testClass.testsObjects[i]; + document.getElementById(currentElement.name + "HideShowBtn").onclick = + hideOrShowTestSection.bind(this, currentElement.name + "Section"); + document.getElementById("runAll" + currentElement.name + "Btn").onclick = + runAndShow.bind(this, i, testClass); + var currentTests = currentElement["tests"]; for (var j = 0, l1 = currentTests.length; j < l1; j++) { var testCase = currentTests[j]; - document.getElementById(testCase["method"] + "Btn").addEventListener("click", testClass.updateTestResult.bind(testClass, testCase, currentElement["object"]), false); + document.getElementById(testCase["method"] + "Btn").onclick = + testClass.updateTestResult.bind(testClass, testCase, currentElement["object"]); } } } + + function onEnter() { + document.activeElement.onclick && document.activeElement.onclick(); + } + + var onEventDo = { + "Enter" : onEnter + }; + + document.onkeydown = function(e) { + onEventDo[e.keyIdentifier] && onEventDo[e.keyIdentifier].call(null); + }; </script> </head> <body onload="start()">