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

r1654 - oipf/lib/js/impl/model
by jruchaud＠users.nuiton.org 09 Jun '15

09 Jun '15

Author: jruchaud Date: 2015-06-09 14:37:23 +0000 (Tue, 09 Jun 2015) New Revision: 1654 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1654 Log: Use class Modified: oipf/lib/js/impl/model/Application.js oipf/lib/js/impl/model/ApplicationCollection.js Modified: oipf/lib/js/impl/model/Application.js =================================================================== --- oipf/lib/js/impl/model/Application.js 2015-06-09 13:59:26 UTC (rev 1653) +++ oipf/lib/js/impl/model/Application.js 2015-06-09 14:37:23 UTC (rev 1654) @@ -1,205 +1,200 @@ -/* - * The Application class is used to implement the characteristics of a - * DAE application. If the document of an application is modified - * (or even replaced entirely), the Application object SHALL be retained. - * This means that the permission set granted when the application is created - * applies to all “edits” of the document or other pages in the application, +/* + * The Application class is used to implement the characteristics of a + * DAE application. If the document of an application is modified + * (or even replaced entirely), the Application object SHALL be retained. + * This means that the permission set granted when the application is created + * applies to all “edits” of the document or other pages in the application, * until the application is destroyed. */ -var Application = Class.extend({ - - /* - * Description: - * true if the application is visible, false otherwise. The value of - * this property is not affected by the application's Z-index or position - * relative to other applications. Only calls to the show() and hide() - * methods will affect its value. - * - * Visibility Type: readonly Boolean - */ - visible: null, - - /* - * Description: - * true if the application is in the list of currently active applications, - * false otherwise (as defined in section 4.3.8). - * - * Visibility Type: readonly Boolean - */ - active: null, - - /* - * Descrioption: - * StringCollection object containing the names of the permissions granted - * to this application. - * - * Visibilty Type: readonly StringCollection - */ - permissions: null, - - /* - * Description: - * true if the application receives cross application events before any - * other application, false otherwise. - * - * Visibility Type: readonly Boolean - */ - isPrimaryReceiver: null, - - /* - * Description: - * Access the current application’s private data object. - * If an application attempts to access the privateData property of an - * Application object for a different application, the OITF SHALL throw - * an error as defined in section 10.1.1. - * - * Visibility Type: readonly ApplicationPrivateData - */ - privateData: null, - - /* - * Description: - * A strict subset of the DOM Window object representing the application. - * No symbols from the Window object are accessible through this property - * except the following: - * - * void postMessage (any message, String targetOrigin) - * - * Visibility Type: readonly Window - */ - window: null, - - init: function(windowApp, applicationManager) { - this._applicationManager = applicationManager; - this.active = false; +class Application { + + constructor(windowApp, applicationManager) { + /* + * Description: + * true if the application is visible, false otherwise. The value of + * this property is not affected by the application's Z-index or position + * relative to other applications. Only calls to the show() and hide() + * methods will affect its value. + * + * Visibility Type: readonly Boolean + */ this.visible = false; + + /* + * Description: + * true if the application is in the list of currently active applications, + * false otherwise (as defined in section 4.3.8). + * + * Visibility Type: readonly Boolean + */ + this.active = false; + + /* + * Descrioption: + * StringCollection object containing the names of the permissions granted + * to this application. + * + * Visibilty Type: readonly StringCollection + */ + this.permissions = null; + + /* + * Description: + * true if the application receives cross application events before any + * other application, false otherwise. + * + * Visibility Type: readonly Boolean + */ + this.isPrimaryReceiver = null; + + /* + * Description: + * Access the current application’s private data object. + * If an application attempts to access the privateData property of an + * Application object for a different application, the OITF SHALL throw + * an error as defined in section 10.1.1. + * + * Visibility Type: readonly ApplicationPrivateData + */ + this.privateData = null; + + /* + * Description: + * A strict subset of the DOM Window object representing the application. + * No symbols from the Window object are accessible through this property + * except the following: + * + * void postMessage (any message, String targetOrigin) + * + * Visibility Type: readonly Window + */ + this.window = null; + + this._applicationManager = applicationManager; this._setWindow(windowApp); - + this._listeners = {}; this._callbacks = {}; this._eventManager = new EventManager(); - + this._timerManager = new TimerManager(); this._timeout = this._timerManager.createTimer.bind(this._timerManager, 0); - }, - + } + /* * Description: - * Create a new application and add it to the application tree. Calling - * this method does not automatically show the newly-created application. - * This call is asynchronous and may return before the new application is - * fully loaded. An ApplicationLoaded event will be targeted at - * the Application object when the new application has fully loaded. If + * Create a new application and add it to the application tree. Calling + * this method does not automatically show the newly-created application. + * This call is asynchronous and may return before the new application is + * fully loaded. An ApplicationLoaded event will be targeted at + * the Application object when the new application has fully loaded. If * the application cannot be created, this method SHALL return null . * * Arguments: * - uri: The URI of the first page of the application to be created or the * localURI of a Widget as defined in section 7.2.8.1.1. - * - * - createChild: Flag indicating whether the new application is a child of - * the current application. A value of true indicates that the new - * application should be a child of the current application; a value of + * + * - createChild: Flag indicating whether the new application is a child of + * the current application. A value of true indicates that the new + * application should be a child of the current application; a value of * false indicates that it should be a sibling. - * + * */ - createApplication: function(uri, createChild) { + createApplication(uri, createChild) { var iframeApp = document.createElement("iframe"); - + iframeApp.setAttribute("src", uri); - + if (!iframeApp.window) { return null; } - + var app = new Application(iframeApp.window, this._applicationManager); - + if (app) { this._applicationManager._fireEvent("ApplicationLoaded", [app]); } - + return app; - - }, - + } + /* * Description: - * If the application visualization mode as defined by method - * getApplicationVisualizationMode() in section 7.2.1.3, is: - * - * 1 : Make the application visible. - * - * 2 : Make the application visible. Calling this method from the - * application itself may have no effect. - * - * 3 : Request to make the application visible. - * - * This method only affects the visibility of an application. In the case - * where more than one application is visible, calls to this method will - * not affect the z-index of the application with respect to any other + * If the application visualization mode as defined by method + * getApplicationVisualizationMode() in section 7.2.1.3, is: + * + * 1 : Make the application visible. + * + * 2 : Make the application visible. Calling this method from the + * application itself may have no effect. + * + * 3 : Request to make the application visible. + * + * This method only affects the visibility of an application. In the case + * where more than one application is visible, calls to this method will + * not affect the z-index of the application with respect to any other * visible applications. */ - show: function() { + show() { this.visible = true; - }, - + } + /* * Description: - * If the application visualization mode as defined by method - * getApplicationVisualizationMode() in section 7.2.1.3, is: - * - * 1 : Make the application invisible. - * - * 2 : Make the application invisible. Calling this method from the - * application itself may have no effect. - * - * 3 : Request to make the application invisible. - * - * Calling this method has no effect on the lifecycle of the application. - * Note: Broadcast independent applications should not call this method. + * If the application visualization mode as defined by method + * getApplicationVisualizationMode() in section 7.2.1.3, is: + * + * 1 : Make the application invisible. + * + * 2 : Make the application invisible. Calling this method from the + * application itself may have no effect. + * + * 3 : Request to make the application invisible. + * + * Calling this method has no effect on the lifecycle of the application. + * Note: Broadcast independent applications should not call this method. * Doing so may result in only the background being visible to the user. */ - hide: function() { + hide() { this.visible = false; - }, - + } + /* * Desription * Move the application to the front of the active applications list. If the - * application has been hidden using Application.hide(), this method does + * application has been hidden using Application.hide(), this method does * not cause the application to be shown. - * - * If the application visualization mode as defined by method + * + * If the application visualization mode as defined by method * getApplicationVisualizationMode() in section 7.2.1.3, is: - * - * 1: The application's Window object SHALL be moved to the top of - * the stack of visible applications. In addition, the application's Window + * + * 1: The application's Window object SHALL be moved to the top of + * the stack of visible applications. In addition, the application's Window * object SHALL gain input focus if argument gainFocus has value true. - * - * 2 : The application's Window object SHALL be moved to the top of - * the stack of visible applications. In addition, the application's Window - * object SHALL gain input focus if argument gainFocus has value true. + * + * 2 : The application's Window object SHALL be moved to the top of + * the stack of visible applications. In addition, the application's Window + * object SHALL gain input focus if argument gainFocus has value true. * Calling this method from the application itself MAY have no effect. - * - * 3 : Request to make the application’s Window object visible. + * + * 3 : Request to make the application’s Window object visible. * Once visible, the application SHALL be given input focus, irrespective of * the value for argument gainFocus. */ - activateInput: function(gainFocus) { - - }, - - _setWindow: function(windowApp) { + activateInput(gainFocus) { + + } + + _setWindow(windowApp) { this.window = {}; if (windowApp && windowApp.postMessage) { this.window.postMessage = windowApp.postMessage.bind(windowApp); } - }, - - _fireEvent: function(eventName) { + } + + _fireEvent(eventName) { var event = createCustomEvent(eventName, null); this._eventManager.fireEvent(event, this); } -}); - - +} Modified: oipf/lib/js/impl/model/ApplicationCollection.js =================================================================== --- oipf/lib/js/impl/model/ApplicationCollection.js 2015-06-09 13:59:26 UTC (rev 1653) +++ oipf/lib/js/impl/model/ApplicationCollection.js 2015-06-09 14:37:23 UTC (rev 1654) @@ -1,13 +1,12 @@ -/* +/* * To change this license header, choose License Headers in Project Properties. * To change this template file, choose Tools | Templates * and open the template in the editor. */ -var ApplicationCollection = Collection.extend({ - - init: function() { - this.super.init.apply(this, arguments); - } -}); +class ApplicationCollection extends Collection { + constructor(...args) { + super(args); + } +}

1 0

r1653 - in oipf/test: css js
by jruchaud＠users.nuiton.org 09 Jun '15

09 Jun '15

Author: jruchaud Date: 2015-06-09 13:59:26 +0000 (Tue, 09 Jun 2015) New Revision: 1653 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1653 Log: Improve style Modified: oipf/test/css/test.css oipf/test/js/Test.js Modified: oipf/test/css/test.css =================================================================== --- oipf/test/css/test.css 2015-06-09 13:34:15 UTC (rev 1652) +++ oipf/test/css/test.css 2015-06-09 13:59:26 UTC (rev 1653) @@ -1,102 +1,89 @@ -/* -To change this license header, choose License Headers in Project Properties. -To change this template file, choose Tools | Templates -and open the template in the editor. -*/ -/* - Created on : 26 févr. 2015, 10:03:51 - Author : root -*/ -:focus { - border: 3px navy solid; +* { + margin: 0; + padding: 0; + box-sizing: border-box; } -#menu { - position: fixed; - top: 0; - left: 50%; - margin-left: auto; - margin-right: auto; - border: 1px solid grey; +body { + color: #4e4f54; } -#testControllerDiv { - margin: 0 0 1em 0; +:focus { + border: 2px #0095dd solid; } -#title, #titleTestControllerDiv, #titleGlobalTestResultsDiv { - border: 1px solid grey; - background-color: #efe; - border-radius: 10px; +#title { + border-bottom: 1px solid grey; + background-color: #e3e7ea; } #title { - margin: 0% 20% 0% 20%; + width: 100%; + padding: 20px; } -#titleTestControllerDiv, #titleGlobalTestResultsDiv { - margin: 1em 90% 0 0; - padding: 0; -} - #globalTestResultsDiv { display: none; } -h1 { - text-align: center; - color: blue; -} - table { + width: 90%; font: 100% sans-serif; - background-color: #efe; + margin: 15px; border-collapse: collapse; empty-cells: show; border: 1px solid #7a7; } -table tbody td:nth-child(1) { - text-align: center; -} - -table tbody td:nth-child(4) { - background-color: gainsboro; -} - - table th, table td { text-align: left; - border: 1px solid #7a7; + border: 1px solid #e6ecef; } +table td, table th { + padding: 5px; + background-color: #f8fafb; +} + table th { + text-align: center; + color: #5f6166; + padding: 5px; font-weight: bold; - padding-left: .5em; - padding-right: .5em; + background-color: #ced2d6; } - -table > thead > tr:first-child > th { +table > tbody > tr > td:first-child { text-align: center; - color: blue; } -table > thead > tr + tr > th { - font-style: italic; - color: gray; +#globalTestResultsTable { + width: auto; } -table td { - background-color: #cef; - padding:.5em .5em .5em .5em; +#globalTestResultsTable td, #globalTestResultsTable th { + text-align: right; } -table tbody th:after { - content: " :"; +button { + background-color: #bacfe4; + color: #5f6166; + padding: 5px; + margin: 5px; + border: 1px solid #5f6166; } -table tbody tr:nth-child(2n+3) { - background: #7a7; -} \ No newline at end of file +h4 { + padding: 10px; +} + +.success { + background-color: #00978e; + color: white; +} + +.error { + background-color: #e66e33; + color: white; +} Modified: oipf/test/js/Test.js =================================================================== --- oipf/test/js/Test.js 2015-06-09 13:34:15 UTC (rev 1652) +++ oipf/test/js/Test.js 2015-06-09 13:59:26 UTC (rev 1653) @@ -1,7 +1,7 @@ -/* +/* * To change this license header, choose License Headers in Project Properties. * To change this template file, choose Tools | Templates - * and open the template in the editor. + * and open the template in the editor. */ var Test = Class.extend({ testsObjects: [{ @@ -841,10 +841,10 @@ start: true, intervalID: 0 }; - + this.sectionsID = []; }, - + runAll: function() { this.results = []; this.currentResult = { @@ -853,17 +853,17 @@ }; this.runLoop(0, 0).then(this.totalPercentage.bind(this)); }, - - runLoop: function(indexObject, indexTest) { - var element = this.testsObjects[indexObject]; + + runLoop: function(indexObject, indexTest) { + var element = this.testsObjects[indexObject]; var object = element.object; var tests = element.tests; - + var self = this; var loop = function() { if (indexTest < tests.length - 1) { return self.runLoop(indexObject, indexTest + 1); - + } else if (indexObject < self.testsObjects.length - 1) { element.results = { testName: "", @@ -875,8 +875,8 @@ element.results.succeeded = self.currentResult.succeeded; self.currentResult.failed = 0; self.currentResult.succeeded = 0; - return self.runLoop(indexObject + 1, 0); - + return self.runLoop(indexObject + 1, 0); + } if (indexObject == self.testsObjects.length - 1) { element.results = { @@ -889,25 +889,25 @@ element.results.succeeded = self.currentResult.succeeded; } }; - + return this.updateTestResult(tests[indexTest], object) .then(loop).catch(loop); - + }, - + percentageCalculating: function(currentResult) { this.round = Math.round.bind(Math); var testNumber = currentResult.failed + currentResult.succeeded; - currentResult.failed = this.round((currentResult.failed/testNumber)*100); - currentResult.succeeded = this.round((currentResult.succeeded/testNumber)*100); + currentResult.failed = this.round((currentResult.failed / testNumber) * 100); + currentResult.succeeded = this.round((currentResult.succeeded / testNumber) * 100); }, - + totalPercentage: function() { this.resultsPercentageFailed = 0; this.resultsPercentageSucceeded = 0; - + for (var i = 0, l = this.testsObjects.length; i < l; i++) { - + this.percentageCalculating(this.testsObjects[i].results); this.resultsPercentageFailed += this.testsObjects[i].results.failed; this.resultsPercentageSucceeded += this.testsObjects[i].results.succeeded; @@ -917,97 +917,97 @@ this.resultsPercentageSucceeded = this.resultsPercentageSucceeded/this.testsObjects.length; this.displayGlobalTestResults(); }, - + displayGlobalTestResults: function() { var id = "globalTestResultsTable"; var tableResult = document.getElementById(id); - var content; + var content = ""; content += "<table>"; content += "<tbody>"; content += "<thead>"; content += "<tr>"; - content += "<th></th>"; - content += "<th>Succeeded (%)</th>"; - content += "<th>Failed (%)</th>"; + content += "<th></th>"; + content += "<th>Succeeded</th>"; + content += "<th>Failed</th>"; content += "</tr>"; content += "</thead>"; for (var i = 0, l = this.results.length; i < l; i++) { content += "<tr>"; content += "<th>" + this.results[i].testName + "</th>"; - content += "<td>" + this.results[i].succeeded + "</td>"; - content += "<td>" + this.results[i].failed + "</td>"; + content += "<td>" + this.results[i].succeeded + "%</td>"; + content += "<td>" + this.results[i].failed + "%</td>"; content += "</tr>"; } content += "<tr>"; content += "<th>Total</th>"; - content += "<td>" + this.resultsPercentageSucceeded + "</td>"; - content += "<td>" + this.resultsPercentageFailed + "</td>"; + content += "<td>" + this.resultsPercentageSucceeded + "%</td>"; + content += "<td>" + this.resultsPercentageFailed + "%</td>"; content += "</tr>"; content += "</tbody>"; content += "</table>"; - + tableResult.innerHTML = content; - + var style = document.getElementById("globalTestResultsDiv").style; style.display = (!style.display || style.display == "none") ? "block" : "none"; }, - + runSectionTest : function(indexObject, indexTest) { - var element = this.testsObjects[indexObject]; + var element = this.testsObjects[indexObject]; var object = element.object; var tests = element.tests; - + var self = this; var loop = function() { if (indexTest < tests.length - 1) { self.runSectionTest(indexObject, indexTest + 1); } }; - + this.updateTestResult(tests[indexTest], object) .then(loop).catch(loop); }, - + run: function(indexObject, indexTest) { - var element = this.testsObjects[indexObject]; + var element = this.testsObjects[indexObject]; var object = element.object; var tests = element.tests; - + return this.updateTestResult(tests[indexTest], object); }, - + displayInLineArray: function() { var content = "<div id='testsDisplay'>"; - content += "<div id='title'><h1> Test Page</h1></div>"; + content += "<div id='title'><h1>OIPF Tests</h1></div>"; content += "<div id='testControllerDiv'>"; - content += "<div id='titleTestControllerDiv'><h4>Test Controller<h4></div>"; + content += "<div id='titleTestControllerDiv'><h4>All tests</h4></div>"; content += "<button id='runAllBtn'>Run All</button>"; content += "<button id='displayConfigBtn'>Hide/Show</button>"; content += "<div id='globalTestResultsDiv'>"; - content += "<div id='titleGlobalTestResultsDiv'><h4>Global Test Results<h4></div>"; + content += "<div id='titleGlobalTestResultsDiv'><h4>Test Results</h4></div>"; content += "<table id='globalTestResultsTable'></table>"; content += "</div>"; content += "</div>"; - + var testsObjects = this.testsObjects; content += "<div id=AllTestDiv>"; for (var i = 0; i < testsObjects.length; i++) { var currentObject = testsObjects[i]; - content += "<div id='" + currentObject.name + "Title'>" - + "Section " + currentObject.name + content += "<div id='" + currentObject.name + "Title' class='section'>" + + "<h4>Section " + currentObject.name + "</h4>" + "<button id='" + currentObject.name + "HideShowBtn'>Hide/Show</button>" + "<button id='runAll" + currentObject.name + "Btn'>Run tests of this section</button>"; content += "</div>"; var idOfTestSection = currentObject.name + "Section"; this.sectionsID.push(idOfTestSection); - + content += "<div id=" + idOfTestSection + ">"; content += "<table id='" + currentObject.name + "Table'>"; content += "<tbody>"; content += "<thead>"; content += "<tr>"; - content += "<th>Lauching</th>"; + content += "<th>Lauching</th>"; content += "<th>Tested Method</th>"; content += "<th>Label</th>"; content += "<th>Test duration</th>"; @@ -1018,7 +1018,7 @@ var currentObject = testsObjects[i]; var tests = currentObject["tests"]; for (var j = 0; j < tests.length; j++) { - + var currentTest = tests[j]; content += "<tr id='" + currentTest["method"] + "'>"; content += "<td><button id='" + currentTest["method"] + "Btn" + "'>Run</button></td>"; @@ -1036,26 +1036,30 @@ content += "</div>"; document.body.innerHTML += content; }, - + updateTestResult: function(currentTest, object) { + this.updateTestResultStart(currentTest); + console.group(currentTest["label"]); var timeStart = new Date(); + var self = this; var result = false; - var promiseTest = new Promise(function(resolve, reject) { + var promiseTest = new Promise(function(resolve, reject) { try { timeout(object.timer || 5000) .then(reject.bind(null, "No result returned.")) .then(function() { !result && self.stopAnimationInProgress(currentTest) - && object.afterTest + && object.afterTest && object.afterTest.bind(object); self.currentResult && self.currentResult.failed++; }); object.beforeTest && object.beforeTest(resolve, reject); object[currentTest["method"]] && object[currentTest["method"]](resolve, reject); self.startAnimationInProgress(currentTest); + } catch (error) { reject(error); } @@ -1076,32 +1080,38 @@ console.log(val); console.groupEnd(currentTest["label"]); var timeEnd = new Date(); - self.updateTestResultError(timeStart, timeEnd, currentTest, val); + self.updateTestResultError(timeStart, timeEnd, currentTest, val); object.afterTest && object.afterTest(); }); - + return promiseTest; }, - + + updateTestResultStart: function(currentTest) { + document.getElementById(currentTest["method"] + "Result").textContent = "None"; + document.getElementById(currentTest["method"] + "Result").className = ""; + document.getElementById(currentTest["method"] + "Duration").textContent = "None"; + }, + updateTestResultSuccess: function(timeStart, timeEnd, currentTest, message) { document.getElementById(currentTest["method"] + "Result").textContent = message || "Success"; - document.getElementById(currentTest["method"] + "Result").style.backgroundColor = "limegreen"; + document.getElementById(currentTest["method"] + "Result").className = "success"; document.getElementById(currentTest["method"] + "Duration").textContent = (timeEnd - timeStart).toFixed(2) + " ms"; }, - + updateTestResultError: function(timeStart, timeEnd, currentTest, message) { document.getElementById(currentTest["method"] + "Result").textContent = message || "Error"; - document.getElementById(currentTest["method"] + "Result").style.backgroundColor = this.colorManaging(message); + document.getElementById(currentTest["method"] + "Result").className = this.colorManaging(message); document.getElementById(currentTest["method"] + "Duration").textContent = (timeEnd - timeStart).toFixed(2) + " ms"; }, - + startAnimationInProgress: function(currentTest) { var self = this; - + self.animation.intervalID = setInterval(function() { var currentTestResult = document .getElementById(currentTest["method"] + "Result"); - + if((self.animation.i%6) == 0) { currentTestResult.textContent = "*"; self.animation.i = 1; @@ -1115,35 +1125,37 @@ console.log("Test in progress"); self.animation.i++; } - + }, 500); }, - + stopAnimationInProgress: function(object, currentTest) { - + clearInterval(this.animation.intervalID); this.animation.id = 1; this.animation.start = true; this.animation.intervalID = null; - + }, - + colorManaging: function(errorMessage) { - var map = { - "No result returned.": "orange", - "Untestable case for the moment.": "sandybrown", - "Invalid state.": "orangered" + var map = { + "No result returned.": "error", + "Untestable case for the moment.": "error", + "Invalid state.": "error" }; - + if (!errorMessage) { - return "red"; + return "error"; + } else if (typeof errorMessage == "string") { return map[errorMessage]; + } else if (errorMessage instanceof Error) { - return "tomato"; + return "error"; } } - + });

1 0

r1652 - oipf/lib/js/impl
by ygrego＠users.nuiton.org 09 Jun '15

09 Jun '15

Author: ygrego Date: 2015-06-09 13:34:15 +0000 (Tue, 09 Jun 2015) New Revision: 1652 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1652 Log: Transformation of severals classes(DownloadManagerObject, DownloadTriggerObject, DrmAgentObject, GatewayInfoObject, MDTFObject and NotifSocketObject) in ES6 classes. Modified: oipf/lib/js/impl/DownloadManagerObject.js oipf/lib/js/impl/DownloadTriggerObject.js oipf/lib/js/impl/DrmAgentObject.js oipf/lib/js/impl/GatewayInfoObject.js oipf/lib/js/impl/MDTFObject.js oipf/lib/js/impl/NotifSocketObject.js Modified: oipf/lib/js/impl/DownloadManagerObject.js =================================================================== --- oipf/lib/js/impl/DownloadManagerObject.js 2015-06-09 13:21:52 UTC (rev 1651) +++ oipf/lib/js/impl/DownloadManagerObject.js 2015-06-09 13:34:15 UTC (rev 1652) @@ -1,7 +1,6 @@ -var DownloadManagerObject = Class.extend({ +class DownloadManagerObject { - init : function(){ - + constructor() { } -}); \ No newline at end of file +} Modified: oipf/lib/js/impl/DownloadTriggerObject.js =================================================================== --- oipf/lib/js/impl/DownloadTriggerObject.js 2015-06-09 13:21:52 UTC (rev 1651) +++ oipf/lib/js/impl/DownloadTriggerObject.js 2015-06-09 13:34:15 UTC (rev 1652) @@ -1,7 +1,6 @@ -var DownloadTriggerObject = Class.extend({ +class DownloadTriggerObject { - init : function(){ - + constructor() { } -}); \ No newline at end of file +} Modified: oipf/lib/js/impl/DrmAgentObject.js =================================================================== --- oipf/lib/js/impl/DrmAgentObject.js 2015-06-09 13:21:52 UTC (rev 1651) +++ oipf/lib/js/impl/DrmAgentObject.js 2015-06-09 13:34:15 UTC (rev 1652) @@ -1,7 +1,7 @@ -var DrmAgentObject = Class.extend({ +class DrmAgentObject { - init : function(DRMSystemCollection) { + constructor(DRMSystemCollection) { this._DRMSystemCollection = DRMSystemCollection; } -}); \ No newline at end of file +} Modified: oipf/lib/js/impl/GatewayInfoObject.js =================================================================== --- oipf/lib/js/impl/GatewayInfoObject.js 2015-06-09 13:21:52 UTC (rev 1651) +++ oipf/lib/js/impl/GatewayInfoObject.js 2015-06-09 13:34:15 UTC (rev 1652) @@ -1,7 +1,6 @@ -var GatewayInfoObject = Class.extend({ +class GatewayInfoObject { - init : function(){ - + constructor() { } -}); \ No newline at end of file +} Modified: oipf/lib/js/impl/MDTFObject.js =================================================================== --- oipf/lib/js/impl/MDTFObject.js 2015-06-09 13:21:52 UTC (rev 1651) +++ oipf/lib/js/impl/MDTFObject.js 2015-06-09 13:34:15 UTC (rev 1652) @@ -1,7 +1,6 @@ -var MDTFObject = Class.extend({ +class MDTFObject { - init : function(){ - + constructor() { } -}); \ No newline at end of file +} Modified: oipf/lib/js/impl/NotifSocketObject.js =================================================================== --- oipf/lib/js/impl/NotifSocketObject.js 2015-06-09 13:21:52 UTC (rev 1651) +++ oipf/lib/js/impl/NotifSocketObject.js 2015-06-09 13:34:15 UTC (rev 1652) @@ -1,6 +1,6 @@ class NotifSocketObject { - constructor: function(){ + constructor() { } }

1 0

r1651 - oipf/lib/js/impl
by ygrego＠users.nuiton.org 09 Jun '15

09 Jun '15

Author: ygrego Date: 2015-06-09 13:21:52 +0000 (Tue, 09 Jun 2015) New Revision: 1651 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1651 Log: Deletion of commas in classes which are not required in ES6 + Transformation of severals classes in ES6 classes. Modified: oipf/lib/js/impl/ChannelConfig.js oipf/lib/js/impl/CodManagerObject.js oipf/lib/js/impl/ConfigurationObject.js oipf/lib/js/impl/NotifSocketObject.js Modified: oipf/lib/js/impl/ChannelConfig.js =================================================================== --- oipf/lib/js/impl/ChannelConfig.js 2015-06-09 13:12:47 UTC (rev 1650) +++ oipf/lib/js/impl/ChannelConfig.js 2015-06-09 13:21:52 UTC (rev 1651) @@ -88,7 +88,7 @@ /* Visibility : readonly FavouriteList */ this.currentFavouriteList = this._channelService.currentFavouriteList; - }, + } _getCallback(type) { if (this._callbacks) { @@ -101,6 +101,7 @@ this._callbacks[type] = callback; } } + /* * Description: * This function is the DOM 0 event handler for events relating to channel list updates. Upon receiving a @@ -130,9 +131,9 @@ */ get onChannelScan() { return this._getCallback("ChannelScan"); - }, + } set onChannelScan(callback) { this._setCallback("ChannelScan", callback); - }, + } } Modified: oipf/lib/js/impl/CodManagerObject.js =================================================================== --- oipf/lib/js/impl/CodManagerObject.js 2015-06-09 13:12:47 UTC (rev 1650) +++ oipf/lib/js/impl/CodManagerObject.js 2015-06-09 13:21:52 UTC (rev 1651) @@ -1,7 +1,6 @@ -var CodManagerObject = Class.extend({ +class CodManagerObject { - init : function(){ - + constructor(){ } -}); \ No newline at end of file +} Modified: oipf/lib/js/impl/ConfigurationObject.js =================================================================== --- oipf/lib/js/impl/ConfigurationObject.js 2015-06-09 13:12:47 UTC (rev 1650) +++ oipf/lib/js/impl/ConfigurationObject.js 2015-06-09 13:21:52 UTC (rev 1651) @@ -3,70 +3,69 @@ * The OITF SHALL implement the “ application/oipfConfiguration ” object as defined below. This object * provides an interface to the configuration and user settings facilities within the OITF. */ -var ConfigurationObject = Class.extend({ - - /* - * Description: - * Accesses the configuration object that sets defaults and shows system settings. - * - * Visibility Type: readonly Configuration - */ - configuration: null, - - /* - * Description: - * Accesses the object representing the platform hardware. - * - * Visibility Type: readonly LocalSystem - */ - localSystem: null, +class ConfigurationObject { - init : function(){ + constructor() { + /* + * Description: + * Accesses the configuration object that sets defaults and shows system settings. + * + * Visibility Type: readonly Configuration + */ + this.configuration = null; + + /* + * Description: + * Accesses the object representing the platform hardware. + * + * Visibility Type: readonly LocalSystem + */ + this.localSystem = null; + this._listeners = {}; this._callbacks = {}; var configDefaultProperties = new ConfigDefaultProperties(); this._eventManager = new EventManager(); this.localSystem = new LocalSystem(configDefaultProperties); - this.configuration = - new Configuration(configDefaultProperties.configuration); - }, - - _getCallback : function(type) { + this.configuration = new Configuration(configDefaultProperties.configuration); + } + + _getCallback(type) { if (this._callbacks) { return this._callbacks[type]; } - }, - - _setCallback: function(type, callback) { + } + + _setCallback(type, callback) { if (this._callbacks) { this._callbacks[type] = callback; } - }, - + } + /* * Description: * The function that is called when the IP address of a network interface has changed. The specified function * is called with two arguments (NetworkInterface)item and (String)ipAddress. The ipAddress may have the value undefined if a previously assigned address has been * lost. - * + * */ get onIpAddressChange() { return this._getCallback("IpAddressChange"); - }, - + } + set onIpAddressChange(callback) { this._setCallback("IpAddressChange", callback); - }, - - addEventListener: function(type, listener) { + } + + addEventListener(type, listener) { this._eventManager.addEventListener(type, listener, this); - }, - - _fireEvent: function(event) { + } + + _fireEvent(event) { this._eventManager.fireEvent(event, this); - }, - - removeEventListener: function(type, listener) { + } + + removeEventListener(type, listener) { this._eventManager.removeEventListener(type, listener, this); } -}); +} Modified: oipf/lib/js/impl/NotifSocketObject.js =================================================================== --- oipf/lib/js/impl/NotifSocketObject.js 2015-06-09 13:12:47 UTC (rev 1650) +++ oipf/lib/js/impl/NotifSocketObject.js 2015-06-09 13:21:52 UTC (rev 1651) @@ -1,7 +1,6 @@ -var NotifSocketObject = Class.extend({ +class NotifSocketObject { - init : function(){ - + constructor: function(){ } -}); \ No newline at end of file +}

1 0

r1650 - oipf/lib
by smaisonneuve＠users.nuiton.org 09 Jun '15

09 Jun '15

Author: smaisonneuve Date: 2015-06-09 13:12:47 +0000 (Tue, 09 Jun 2015) New Revision: 1650 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1650 Log: [Build] - Watch for change Modified: oipf/lib/gulpfile.js Modified: oipf/lib/gulpfile.js =================================================================== --- oipf/lib/gulpfile.js 2015-06-09 13:05:11 UTC (rev 1649) +++ oipf/lib/gulpfile.js 2015-06-09 13:12:47 UTC (rev 1650) @@ -1,5 +1,5 @@ var gulp = require("gulp"); -var gulpSequence = require("gulp-sequence"); +var gulpSequence = require('gulp-sequence'); var concat = require("gulp-concat"); var sourcemaps = require("gulp-sourcemaps"); var babel = require("gulp-babel"); @@ -55,4 +55,10 @@ .pipe(gulp.dest(conf.buildDir)); }); -gulp.task("default", gulpSequence("clean", "javascript", "statics")); +// Rerun the task when a file changes +gulp.task("watch", function() { + gulp.watch(conf.jsFiles, ["javascript"]); + gulp.watch(conf.statics, ["statics"]); +}); + +gulp.task("default", gulpSequence("javascript", "statics", "watch"));

1 0

r1649 - oipf/lib/js/impl
by ygrego＠users.nuiton.org 09 Jun '15

09 Jun '15

Author: ygrego Date: 2015-06-09 13:05:11 +0000 (Tue, 09 Jun 2015) New Revision: 1649 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1649 Log: Transformation of the class ChannelConfig in an ES6 class. Modified: oipf/lib/js/impl/ChannelConfig.js Modified: oipf/lib/js/impl/ChannelConfig.js =================================================================== --- oipf/lib/js/impl/ChannelConfig.js 2015-06-09 12:53:02 UTC (rev 1648) +++ oipf/lib/js/impl/ChannelConfig.js 2015-06-09 13:05:11 UTC (rev 1649) @@ -11,7 +11,7 @@ * ------------------------------------------------------------------------ * Capability | Properties | Methods * --------------------------------- --------------- ---------------------- - * Element <extendedAVControl> | onChannelScan | startScan() + * Element <extendedAVControl> | onChannelScan | startScan() * is set to “ true ” as defined in | | stopScan() * section 9.3.6. | | * ---------------------------------|---------------|---------------------- @@ -19,98 +19,88 @@ * type="ID_IPTV_SDS"> is set as | | * defined in section 9.3.6. | | */ -var ChannelConfig = Class.extend({ - - /* - * Description: - * The current channel of the OITF if the user has given permission to share this information, possibly through a - * mechanism outside the scope of this specification. If no channel is being presented, or if this information is - * not visible to the caller, the value of this property SHALL be null. - * In an OITF where exactly one video/broadcast object is in any state other than Unrealized and the - * channel being presented by that video/broadcast object is the only broadcast channel being presented by - * the OITF then changes to the channel presented by that video/broadcast object SHALL result in changes - * to the current channel of the OITF. - * In an OITF which is presenting more than one broadcast channel at the same time, the current channel of - * the OITF is the channel whose audio is being presented (as defined in the bindToCurrentChannel() - * method). If that current channel is under the control of a DAE application via a video/broadcast object - * then changes to the channel presented by that video/broadcast object SHALL result in changes to the - * current channel of the OITF. - * - * Visibility Type : readonly Channel - */ - currentChannel: null, +class ChannelConfig { - /* - * Description: - * The list of channels. - * If an OITF includes a platform-specific application that enables the end-user to choose a channel to be - * presented from a list then all the channels in the list offered to the user by that application SHALL be - * included in this ChannelList. - * The list of channels will be a subset of all those available to the OITF. The precise algorithm by which this - * subset is selected will be market and/or implementation dependent. For example; - * • If an OITF with a DVB-T tuner receives multiple versions of the same channel, one would be - * included in the list and the duplicates discarded - * • An OITF with a DVB tuner will often filter services based on service type to discard those which are - * obviously inappropriate or impossible for that device to present to the end-user, e.g. firmware - * download services. - * The order of the channels in the list corresponds to the channel ordering as managed by the OITF. SHALL - * return the value null if the channel list is not (partially) managed by the OITF (i.e., if the channel list - * information is managed entirely in the network). - * The properties of channels making up the channel list SHALL be set by the OITF to the appropriate values - * as determined by the tables in section 8.4.3. The OITF SHALL store all these values as part of the channel - * list. - * Some values are set according to the data carried in the broadcast stream. In this case, the OITF MAY set - * these values to undefined until such time as the relevant data has been received by the OITF, for example - * after tuning to the channel. Once the data has been received, the OITF SHALL update the properties of the - * channel in the channel list according to the received data. - * Note: There is no requirement for the OITF to pro-actively tune to every channel to gather such data. - * - * Visibility Type : readonly ChannelList - */ - channelList: null, - - /* Visibility : readonly FavouriteListCollection - */ - favouriteLists: null, - - /* Visibility : readonly FavouriteList - */ - currentFavouriteList: null, - - /* - * \param Integer - * \param Interger - * \param Interger - * \param Interger - * \param Interger - * \param Interger - * \param Interger - * \param Interger - * \param Channel - */ - onChannelScan: function(scanEvent, progress, frequency, signalStrength, channelNumber, channelType, channelCount, transponderCount, newChannel) { - + constructor(channelService) { + this._callbacks = {}; + this._channelService = channelService; + /* + * Description: + * The current channel of the OITF if the user has given permission + * to share this information, possibly through a + * mechanism outside the scope of this specification. + * If no channel is being presented, or if this information is + * not visible to the caller, the value of this property SHALL be null. + * In an OITF where exactly one video/broadcast object is in any state other than + * Unrealized and the + * channel being presented by that video/broadcast object is the only broadcast + * channel being presented by + * the OITF then changes to the channel presented by that video/broadcast object + * SHALL result in changes + * to the current channel of the OITF. + * In an OITF which is presenting more than one broadcast channel at the same time, + * the current channel of + * the OITF is the channel whose audio is being presented (as defined in the + * bindToCurrentChannel() + * method). If that current channel is under the control of a DAE application via a + * video/broadcast object + * then changes to the channel presented by that video/broadcast object SHALL + * result in changes to the + * current channel of the OITF + * + * Visibility Type : readonly Channel + */ + this.currentChannel = this._channelService.currentChannel; + + /* + * Description: + * The list of channels. + * If an OITF includes a platform-specific application that enables the end-user to choose a channel to be + * presented from a list then all the channels in the list offered to the user by that application SHALL be + * included in this ChannelList. + * The list of channels will be a subset of all those available to the OITF. The precise algorithm by which this + * subset is selected will be market and/or implementation dependent. For example; + * • If an OITF with a DVB-T tuner receives multiple versions of the same channel, one would be + * included in the list and the duplicates discarded + * • An OITF with a DVB tuner will often filter services based on service type to discard those which are + * obviously inappropriate or impossible for that device to present to the end-user, e.g. firmware + * download services. + * The order of the channels in the list corresponds to the channel ordering as managed by the OITF. SHALL + * return the value null if the channel list is not (partially) managed by the OITF (i.e., if the channel list + * information is managed entirely in the network). + * The properties of channels making up the channel list SHALL be set by the OITF to the appropriate values + * as determined by the tables in section 8.4.3. The OITF SHALL store all these values as part of the channel + * list. + * Some values are set according to the data carried in the broadcast stream. In this case, the OITF MAY set + * these values to undefined until such time as the relevant data has been received by the OITF, for example + * after tuning to the channel. Once the data has been received, the OITF SHALL update the properties of the + * channel in the channel list according to the received data. + * Note: There is no requirement for the OITF to pro-actively tune to every channel to gather such data. + * + * Visibility Type : readonly ChannelList + */ + this.channelList = this._channelService.channelList; + + /* Visibility : readonly FavouriteListCollection + */ + this.favouriteLists = this._channelService.favouriteLists; + + /* Visibility : readonly FavouriteList + */ + this.currentFavouriteList = this._channelService.currentFavouriteList; }, - - init: function(channelService) { - this._channelService = channelService; - var channelType = "TYPE_TV"; - var channelName = "ARTE"; - var channelIdType = 12; - var channelArte = new Channel(channelIdType, 52, 53, 54, channelName); - channelName = "FRANCE_5"; - var channelFrance5 = new Channel(channelIdType, 12, 13, 14, channelName); - - channelName = "FRANCE_4"; - var channelFrance4 = new Channel(channelIdType, 22, 23, 24, channelName); + _getCallback(type) { + if (this._callbacks) { + return this._callbacks[type]; + } + } - this.currentChannel = channelArte; - this.channelList = new ChannelList(channelArte, channelFrance5, channelFrance4); - this.favouriteLists = new FavouriteListCollection(); - this.currentFavouriteList = new FavouriteList(); - }, - + _setCallback(type, callback) { + if (this._callbacks) { + this._callbacks[type] = callback; + } + } /* * Description: * This function is the DOM 0 event handler for events relating to channel list updates. Upon receiving a @@ -119,7 +109,30 @@ * removed, but their order in the ChannelConfig.all collection MAY have changed. Any lists created with * ChannelConfig.createFilteredList() SHOULD be recreated in case channels have been removed. */ - onChannelListUpdate: function() { + get onChannelListUpdate() { + return this._getCallback("ChannelListUpdate"); + } + set onChannelListUpdate(callback) { + this._setCallback("ChannelListUpdate", callback); } -}); + + /* + * \param Integer scanEvent + * \param Interger progress + * \param Interger frequency + * \param Interger signalStrength + * \param Interger channelNumber + * \param Interger channelType + * \param Interger channelCount + * \param Interger transponderCount + * \param Channel newChannel + */ + get onChannelScan() { + return this._getCallback("ChannelScan"); + }, + + set onChannelScan(callback) { + this._setCallback("ChannelScan", callback); + }, +}

1 0

r1648 - oipf/lib/js/utils
by smaisonneuve＠users.nuiton.org 09 Jun '15

09 Jun '15

Author: smaisonneuve Date: 2015-06-09 12:53:02 +0000 (Tue, 09 Jun 2015) New Revision: 1648 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1648 Log: [Build] - Fixing bad declaration in programmesHelper Modified: oipf/lib/js/utils/ProgrammeHelper.js Modified: oipf/lib/js/utils/ProgrammeHelper.js =================================================================== --- oipf/lib/js/utils/ProgrammeHelper.js 2015-06-09 12:49:05 UTC (rev 1647) +++ oipf/lib/js/utils/ProgrammeHelper.js 2015-06-09 12:53:02 UTC (rev 1648) @@ -1,10 +1,10 @@ -/* +/* * To change this license header, choose License Headers in Project Properties. * To change this template file, choose Tools | Templates * and open the template in the editor. */ var ProgrammeHelper = Class.extend({ - + map: { "title": "name", "start": "startTime", @@ -12,7 +12,7 @@ "length#text": "duration", "episode-num#text": "episode" }, - + channelNameMap: { "ART1.kazer.org" : "ARTE", "EUR2.kazer.org" : "D17", @@ -35,16 +35,16 @@ this.channelService = channelService; this.programmes = []; }, - + /* - * Description: + * Description: * Don't take in charge the "credits" property of a xmlTv programmes for the moment. */ initProgrammes: function(programmeList) { for (var i = 0, l = programmeList.length; i < l; i++) { var programme = {}; var object = programmeList[i]; - var channelName; + var channelName; var self = this; var createProgramme = function(object, programme, parentKey) { var keys = Object.keys(object); @@ -73,23 +73,23 @@ } } }; - + createProgramme(object, programme); programme.channel = this.initChannel(channelName); programme.programmeID = createUUID(); var programmeObject = new Programme(programme); this.programmes.push(programmeObject); } - + return this.programmes; }, - + initChannel: function(name) { return this.channelService.getADvbTChannel(name); }, - + transformToActualDate: function(wrongDateFormat) { - pattern = /(\d{4})(\d{2})(\d{2})(\d{2})(\d{2})(\d{2})\s\+(\d{2})/; + var pattern = /(\d{4})(\d{2})(\d{2})(\d{2})(\d{2})(\d{2})\s\+(\d{2})/; var tmpDate = wrongDateFormat; tmpDate = pattern.exec(tmpDate); @@ -108,14 +108,14 @@ var actualDate = new Date(year, month, day, hs, mins, secs); return actualDate; }, - + transformInSecondSince01011970: function(wrongDateFormat) { - return this.transformToActualDate(wrongDateFormat).getTime() / 1000; + return this.transformToActualDate(wrongDateFormat).getTime() / 1000; }, - + minutesToSeconds: function(minutes) { return minutes*60; } - + });

1 0

r1647 - in oipf: lib lib/configuration lib/init test test/view
by smaisonneuve＠users.nuiton.org 09 Jun '15

09 Jun '15

Author: smaisonneuve Date: 2015-06-09 12:49:05 +0000 (Tue, 09 Jun 2015) New Revision: 1647 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1647 Log: [Build] - Building test app Modified: oipf/lib/configuration/OipfConfiguration.js oipf/lib/init/init.js oipf/lib/paths.json oipf/test/server.js oipf/test/view/test.html Modified: oipf/lib/configuration/OipfConfiguration.js =================================================================== --- oipf/lib/configuration/OipfConfiguration.js 2015-06-09 12:36:00 UTC (rev 1646) +++ oipf/lib/configuration/OipfConfiguration.js 2015-06-09 12:49:05 UTC (rev 1647) @@ -1,24 +1,24 @@ -/* +/* * To change this license header, choose License Headers in Project Properties. * To change this template file, choose Tools | Templates * and open the template in the editor. */ var OipfConfiguration = Class.extend({ - + init: function() { - + //Channels configuration this.channelNumber = 13; this.currentChannel = "ARTE"; this.channelCountry = "France"; - this.channelList = "../../data/oipfChannels.xml"; - + this.channelList = "./lib/build/oipfChannels.xml"; + //Programmes configuration this.programmeType = "xmlTV"; this.programmeCountry = "France"; - this.programmes = "../../data/xmlTVProgrammes.xml"; - + this.programmes = "./lib/build/xmlTVProgrammes.xml"; + //ApplicationManager this.applicationVisualizationMode = 3; } Modified: oipf/lib/init/init.js =================================================================== --- oipf/lib/init/init.js 2015-06-09 12:36:00 UTC (rev 1646) +++ oipf/lib/init/init.js 2015-06-09 12:49:05 UTC (rev 1647) @@ -1,5 +1,5 @@ // Used in the channelType property to indicate a TV channel. -CHANNEL_CONSTANT = {"TYPE_TV": 0}; +var CHANNEL_CONSTANT = {"TYPE_TV": 0}; var VideoBroadcastObject = document.registerElement('video-broadcast', { prototype: VideoBroadcastObject.prototype, @@ -30,7 +30,7 @@ /* * Description: * Information necessary to channel creation of identifier type ID_DVB_*. - * Not a real data, just for simulation but the syntactic structure is based on + * Not a real data, just for simulation but the syntactic structure is based on * DVB-SI [EN 300 468] section 6.2.13. */ var TERRESTIAL_DELIVERY_SYSTEM_DESCRIPTOR = [ Modified: oipf/lib/paths.json =================================================================== --- oipf/lib/paths.json 2015-06-09 12:36:00 UTC (rev 1646) +++ oipf/lib/paths.json 2015-06-09 12:49:05 UTC (rev 1647) @@ -7,7 +7,7 @@ "js/impl/model/constants/MetadataSearchConstants.js", "js/impl/model/constants/DaeMimeType.js", "js/impl/model/constants/IdType.js", - "js/lib/Class.js", + "js/utils/Class.js", "js/utils/Timeout.js", "js/utils/Calculation.js", "js/utils/ChannelUtils.js", Modified: oipf/test/server.js =================================================================== --- oipf/test/server.js 2015-06-09 12:36:00 UTC (rev 1646) +++ oipf/test/server.js 2015-06-09 12:49:05 UTC (rev 1647) @@ -1,7 +1,7 @@ var express = require("express"); var app = express(); -app.use(express.static(".")); +app.use(express.static("..")); app.get("/", function(req, res) { res.sendFile("view/test.html", {root: "."}); Modified: oipf/test/view/test.html =================================================================== --- oipf/test/view/test.html 2015-06-09 12:36:00 UTC (rev 1646) +++ oipf/test/view/test.html 2015-06-09 12:49:05 UTC (rev 1647) @@ -10,21 +10,21 @@ <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="./test/css/test.css"/> - <script src="../../lib/build/oipf-lib.js" type="text/javascript"></script> + <script src="./lib/build/oipf-lib.js" type="text/javascript"></script> - <script src="../js/TestCase.js" type="text/javascript"></script> - <script src="../js/ApplicationManagerTest.js" type="text/javascript"></script> - <script src="../js/CapabilitiesTest.js" type="text/javascript"></script> - <script src="../js/ParentalControlManagerTest.js" type="text/javascript"></script> - <script src="../js/RecordingSchedulerTest.js" type="text/javascript"></script> - <script src="../js/ConfigurationTest.js" type="text/javascript"></script> - <script src="../js/SearchManagerTest.js" type="text/javascript"></script> - <script src="../js/VideoBroadcastTest.js" type="text/javascript"></script> - <script src="../js/OipfFactoryTest.js" type="text/javascript"></script> - <script src="../js/TestConfig.js" type="text/javascript"></script> - <script src="../js/Test.js" type="text/javascript"></script> + <script src="./test/js/TestCase.js" type="text/javascript"></script> + <script src="./test/js/ApplicationManagerTest.js" type="text/javascript"></script> + <script src="./test/js/CapabilitiesTest.js" type="text/javascript"></script> + <script src="./test/js/ParentalControlManagerTest.js" type="text/javascript"></script> + <script src="./test/js/RecordingSchedulerTest.js" type="text/javascript"></script> + <script src="./test/js/ConfigurationTest.js" type="text/javascript"></script> + <script src="./test/js/SearchManagerTest.js" type="text/javascript"></script> + <script src="./test/js/VideoBroadcastTest.js" type="text/javascript"></script> + <script src="./test/js/OipfFactoryTest.js" type="text/javascript"></script> + <script src="./test/js/TestConfig.js" type="text/javascript"></script> + <script src="./test/js/Test.js" type="text/javascript"></script> <script> var tests = new Test();

1 0

r1646 - oipf/lib
by smaisonneuve＠users.nuiton.org 09 Jun '15

09 Jun '15

Author: smaisonneuve Date: 2015-06-09 12:36:00 +0000 (Tue, 09 Jun 2015) New Revision: 1646 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1646 Log: [Build] - moving js path into a conf file Modified: oipf/lib/gulpfile.js Modified: oipf/lib/gulpfile.js =================================================================== --- oipf/lib/gulpfile.js 2015-06-09 12:35:37 UTC (rev 1645) +++ oipf/lib/gulpfile.js 2015-06-09 12:36:00 UTC (rev 1646) @@ -9,7 +9,7 @@ var util = require("gulp-util"); var paths = require("./paths.json"); -console.log(paths.js); + var conf = { jsFiles: paths.js, statics: ["data/*.xml"],

1 0

r1645 - oipf/lib
by smaisonneuve＠users.nuiton.org 09 Jun '15

09 Jun '15

Author: smaisonneuve Date: 2015-06-09 12:35:37 +0000 (Tue, 09 Jun 2015) New Revision: 1645 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1645 Log: [Build] - moving js path into a conf file Added: oipf/lib/paths.json Modified: oipf/lib/gulpfile.js Modified: oipf/lib/gulpfile.js =================================================================== --- oipf/lib/gulpfile.js 2015-06-09 12:29:01 UTC (rev 1644) +++ oipf/lib/gulpfile.js 2015-06-09 12:35:37 UTC (rev 1645) @@ -8,8 +8,11 @@ var notifier = require("node-notifier"); var util = require("gulp-util"); +var paths = require("./paths.json"); +console.log(paths.js); var conf = { - src: ["js/**/*.js", "data/*.js", "configuration/*.js"], + jsFiles: paths.js, + statics: ["data/*.xml"], buildFile: "oipf-lib.js", buildDir: "build" }; @@ -25,7 +28,7 @@ }); gulp.task("javascript", function() { - return gulp.src(conf.src) + return gulp.src(conf.jsFiles) .pipe(sourcemaps.init()) .pipe(babel({ blacklist: [ @@ -47,4 +50,9 @@ .pipe(gulp.dest(conf.buildDir)); }); -gulp.task("default", gulpSequence("clean", "javascript")); +gulp.task("statics", function() { + return gulp.src(conf.statics) + .pipe(gulp.dest(conf.buildDir)); +}); + +gulp.task("default", gulpSequence("clean", "javascript", "statics")); Added: oipf/lib/paths.json =================================================================== --- oipf/lib/paths.json (rev 0) +++ oipf/lib/paths.json 2015-06-09 12:35:37 UTC (rev 1645) @@ -0,0 +1,65 @@ +{ + "js": [ + "js/impl/model/constants/VideoBroadcastConstants.js", + "js/impl/model/constants/ParentalControlManagerConstants.js", + "js/impl/model/constants/RecordingSchedulerConstants.js", + "js/impl/model/constants/ConfigurationConstants.js", + "js/impl/model/constants/MetadataSearchConstants.js", + "js/impl/model/constants/DaeMimeType.js", + "js/impl/model/constants/IdType.js", + "js/lib/Class.js", + "js/utils/Timeout.js", + "js/utils/Calculation.js", + "js/utils/ChannelUtils.js", + "js/utils/Utils.js", + "js/utils/EventManager.js", + "js/utils/TimerManager.js", + "js/utils/TimerRecordingManager.js", + "js/utils/MetadataManager.js", + "js/utils/DateUtils.js", + "js/utils/XmlParser.js", + "js/utils/ProgrammeService.js", + "js/utils/XmlToJson.js", + "js/utils/ProgrammeHelper.js", + "configuration/ConfigDefaultProperties.js", + "configuration/CapabilitiesProperties.js", + "configuration/OipfConfiguration.js", + "js/impl/model/Collection.js", + "js/impl/model/SignalInfo.js", + "js/impl/model/LNBInfo.js", + "js/impl/model/NetworkInterface.js", + "js/impl/model/FavouriteList.js", + "js/impl/model/Programme.js", + "js/impl/model/AVOutput.js", + "js/impl/model/Tuner.js", + "js/impl/model/IntegerCollection.js", + "js/impl/model/AVOutputCollection.js", + "js/impl/model/TunerCollection.js", + "js/impl/model/NetworkInterfaceCollection.js", + "js/impl/model/FavouriteListCollection.js", + "js/impl/model/ScheduledRecordingCollection.js", + "js/impl/model/Query.js", + "js/impl/model/Configuration.js", + "js/impl/model/LocalSystem.js", + "js/impl/model/Channel.js", + "js/impl/model/ChannelList.js", + "js/impl/model/MetadataSearch.js", + "js/impl/model/SearchResults.js", + "js/impl/model/ScheduledRecording.js", + "js/impl/model/Recording.js", + "js/impl/model/Application.js", + "js/impl/model/ApplicationCollection.js", + "js/impl/OipfObjectFactory.js", + "js/impl/ConfigurationObject.js", + "js/impl/ChannelConfig.js", + "js/impl/VideoBroadcastObject.js", + "js/impl/SearchManagerObject.js", + "js/impl/RecordingSchedulerObject.js", + "js/impl/CapabilitiesObject.js", + "js/impl/ParentalControlManagerObject.js", + "js/impl/ApplicationManagerObject.js", + "js/utils/ChannelService.js", + "js/impl/model/ModelFactory.js", + "init/init.js" + ] +}

1 0