Author: jruchaud Date: 2015-05-13 15:25:13 +0000 (Wed, 13 May 2015) New Revision: 1338 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1338 Log: Move server Added: oipf/package.json oipf/static-server.js Removed: oipf/js/server/ Modified: oipf/view/test.html Added: oipf/package.json =================================================================== --- oipf/package.json (rev 0) +++ oipf/package.json 2015-05-13 15:25:13 UTC (rev 1338) @@ -0,0 +1,12 @@ +{ + "name": "oipf-server", + "version": "1.0.0", + "description": "", + "main": "static-server.js", + "dependencies": { + "express": "^4.12.3" + }, + "devDependencies": {}, + "author": "", + "license": "LGPL" +} Added: oipf/static-server.js =================================================================== --- oipf/static-server.js (rev 0) +++ oipf/static-server.js 2015-05-13 15:25:13 UTC (rev 1338) @@ -0,0 +1,12 @@ +var express = require('express'); +var app = express(); + +app.use(express.static('.')); + +app.get('/', function(req, res){ + res.sendFile('view/test.html', {root: "."}); +}); +app.listen(3000); + +console.log('Server running at http://192.168.99.190:3000/'); + Modified: oipf/view/test.html =================================================================== --- oipf/view/test.html 2015-05-13 12:33:50 UTC (rev 1337) +++ oipf/view/test.html 2015-05-13 15:25:13 UTC (rev 1338) @@ -18,14 +18,15 @@ <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/utils/TimerManager.js" type="text/javascript"></script> - <script src="../js/utils/MetadataManager.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/utils/TimerManager.js" type="text/javascript"></script> + <script src="../js/utils/MetadataManager.js" type="text/javascript"></script> + <script src="../js/impl/model/FavouriteListCollection.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> - <script src="../js/impl/model/AVOutputCollection.js" type="text/javascript"></script> + <script src="../js/impl/model/AVOutputCollection.js" type="text/javascript"></script> <script src="../js/impl/model/Query.js" type="text/javascript"></script> <script src="../js/impl/model/Tuner.js" type="text/javascript"></script> <script src="../js/impl/model/AVOutput.js" type="text/javascript"></script> @@ -64,12 +65,12 @@ ApplicationManager.getWindows()[0].activate(); } } - + function hideOrShowTestSection(sectionId) { var style = document.getElementById(sectionId).style; style.display = (style.display == "none") ? "block" : "none"; } - + function runAndShow(i, testClass) { testClass.runSectionTest(i, 0); var style = document.getElementById((/runAll(\w+)Btn/g @@ -78,39 +79,39 @@ 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); - + 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").onclick = + document.getElementById(testCase["method"] + "Btn").onclick = testClass.updateTestResult.bind(testClass, testCase, currentElement["object"]); } } } - + function onEnter() { document.activeElement.onclick && document.activeElement.onclick(); } - - var onEventDo = { + + var onEventDo = { "Enter" : onEnter }; - + document.onkeydown = function(e) { - onEventDo[e.keyIdentifier] && onEventDo[e.keyIdentifier].call(null); + onEventDo[e.keyIdentifier] && onEventDo[e.keyIdentifier].call(null); }; </script> </head> <body onload="start()"> </body> -</html> \ No newline at end of file +</html>