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

r954 - oipf/js/test
by ygrego＠users.nuiton.org March 18, 2015

March 18, 2015

Author: ygrego Date: 2015-03-18 10:44:54 +0000 (Wed, 18 Mar 2015) New Revision: 954 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/954 Log: -Deletion of field relevantless in object "testObject" but addition of field "before" to know if a method must be called before the test. -In method "runAll" deletion of condition on implementation of a test in order to run current test. -Deletion of method "display" and "displayArrayLayout". -In method "displayInLineArray" deletion of variable not used and use of test method name as identifier for each row of table created in DOM element of "test.html". -In method "updateTestResult" make logs display in console more legible thank to instructions "console.group()" and "console.groupEnd()" added and restructuration of code which must achieve the update in internal method then(), catch() and setTimeout(). Modified: oipf/js/test/Test.js Modified: oipf/js/test/Test.js =================================================================== --- oipf/js/test/Test.js 2015-03-18 09:18:57 UTC (rev 953) +++ oipf/js/test/Test.js 2015-03-18 10:44:54 UTC (rev 954) @@ -9,44 +9,48 @@ object: new VideoBroadcastTest(), tests: [ { - id: "vbTestInstanceCreation", - label: "Object creation.", - method: "testInstanceCreation", - impl: true + label: "Video broadcast creation.", + before: false, + method: "testVideoBroadcastInit" }, { - id: "vbTestBindToCurrentChannel", label: "Bind the current channel stream with a video broadcast object.", - method: "testBindToCurrentChannel", - impl: true + before: true, + method: "testBindToCurrentChannel" }, { - id: "vbTestPrevChannel", label: "Switch to precedent channel in channel list.", - method: "testPrevChannel", - impl: true + before: true, + method: "testPrevChannel" }, { - id: "vbTestNextChannel", label: "Switch to next channel in channel list.", - method:"testNextChannel", - impl: true + before: true, + method:"testNextChannel" + }, + { + label: "Release any tuner and/or ressources held by a video broadcast object.", + before: true, + method: "testRelease" + }, + { + label: "Stop the video and audio presentation of video broadcast object.", + before: true, + method: "testStop" } ]},{ name: "SearchManagerTest", object: new SearchManagerTest(), tests: [ { - id: "smTestInstanceCreation", - label: "Object creation.", - method: "testInstanceCreation", - impl: true + label: "Search manager creation.", + before: false, + method: "testSearchManagerInit" }, { - id: "smTestGetCurrentProgram", label: "Obtain current program according to oipf norm.", - method: "testGetCurrentProgram", - impl: true + before: true, + method: "testGetCurrentProgram" } ] }], @@ -65,89 +69,12 @@ for (var j = 0; j < tests.length; j++) { var currentTest = tests[j]; - if (currentTest["impl"]) { - this.updateTestResult(currentTest, object); - } + this.updateTestResult(currentTest, object); + } } }, - //Use the innerHTML property to achieve display - display: function() { - var content = "<div id='testsDisplay'>Test Page <button id='runAllBtn'>Run All</button>"; - var testsObjects = this.testsObjects; - for (var i = 0; i < testsObjects.length; i++) { - - var currentObject = testsObjects[i]; - var sectionName = currentObject["name"]; - content += "<div id='" + sectionName + "'>"; - var tests = currentObject["tests"]; - for (var j = 0; j < tests.length; j++) { - - var currentTest = tests[j]; - content += "<div id='" + currentTest["id"] + "'>"; - content += "<div>Label: " + currentTest["label"] + "</div>"; - content += "<div>Tested method: " + currentTest["method"] + "</div>"; - var impl = currentTest["impl"]; - content += "<div>Implementation State: " + impl + "</div>"; - - if (impl) { - content += "<div id='" + currentTest["id"] + "Res" + "'>Result: Test has not been launch. Click on button \"Run\" below.</div>"; - content += "<div><button id='" + currentTest["id"] + "Btn" + "'>Run</button></div>"; - } else { - content += "<div id='" + currentTest["id"] + "Res" + "'>Result: Any result will be available for the moment, test has not been implemented.</div>"; - content += "<div><button id='" + currentTest["id"] + "Btn" + "' disabled>Run</button></div>"; - } - content += "</div>"; - } - content += "</div>"; - } - content += "</div>"; - document.body.innerHTML = content; - }, - - //Use the innerHTML property to achieve display - displayArrayLayout: function() { - var content = "<div id='testsDisplay'>Test Page <button id='runAllBtn'>Run All</button>"; - var testsObjects = this.testsObjects; - for (var i = 0; i < testsObjects.length; i++) { - - var currentObject = testsObjects[i]; - var sectionName = currentObject["name"]; - content += "<div id='" + sectionName + "SectionTitle" + "'>" + sectionName + " <button id='" + sectionName + "Btn' onclick='hideOrShowTestSection(\"" + sectionName + "\")'>Hide/Show</button>"; - content += "<div id='" + sectionName + "'>"; - var tests = currentObject["tests"]; - for (var j = 0; j < tests.length; j++) { - - var currentTest = tests[j]; - //content += "<div id='" + currentTest["id"] + "'>"; - content += "<table id='" + currentTest["id"] + "Table'>"; - content += "<caption>" + currentTest["id"] + "<caption/>"; - content += "<tbody>"; - content += "<tr><th>Tested method</th><td>" + currentTest["method"] + "</td></tr>"; - content += "<tr><th>Label</th><td>" + currentTest["label"] + "</td></tr>"; - var impl = currentTest["impl"]; - content += "<tr><th>Implementation State</th><td>" + impl + "</td></tr>"; - content += "</tbody>"; - ////TFOOT - content += "<tfoot>"; - if (impl) { - content += "<tr><th>Result</th><td id='" + currentTest["id"] + "Res'>Test has not been launch. Click on button \"Run\" below.</td></tr>"; - content += "<tr><th>Test launching</th><td><button id='" + currentTest["id"] + "Btn" + "'>Run</button></td></tr>"; - } else { - content += "<tr><th>Result</th><td id='" + currentTest["id"] + "Res'>Any result will be available for the moment, test has not been implemented.</td></tr>"; - content += "<tr><th>Test launching</th><td><button id='" + currentTest["id"] + "Btn" + "' disabled>Run</button></td></tr>"; - } - content += "</tfoot>"; - content += "</table>"; - } - - content += "</div>"; - } - content += "</div>"; - document.body.innerHTML = content; - }, - displayInLineArray: function() { var content = "<div id='testsDisplay'>Test Page <button id='runAllBtn'>Run All</button>"; var testsObjects = this.testsObjects; @@ -169,21 +96,18 @@ for (var i = 0; i < testsObjects.length; i++) { var currentObject = testsObjects[i]; - var sectionName = currentObject["name"]; - //content += "<div id='" + sectionName + "SectionTitle" + "'>" + sectionName + " <button id='" + sectionName + "Btn' onclick='hideOrShowTestSection(\"" + sectionName + "\")'>Hide/Show</button>"; var tests = currentObject["tests"]; for (var j = 0; j < tests.length; j++) { var currentTest = tests[j]; - content += "<tr id='" + currentTest["id"] + "'>"; + content += "<tr id='" + currentTest["method"] + "'>"; content += "<td>" + currentTest["method"] + "</td>"; content += "<td>" + currentTest["label"] + "</td>"; - content += "<td id='" + currentTest["id"] + "Duration'>None</td>"; - content += "<td id='" + currentTest["id"] + "Result'>None</td>"; - content += "<td><button id='" + currentTest["id"] + "Btn" + "'>Run</button></td>"; + content += "<td id='" + currentTest["method"] + "Duration'>None</td>"; + content += "<td id='" + currentTest["method"] + "Result'>None</td>"; + content += "<td><button id='" + currentTest["method"] + "Btn" + "'>Run</button></td>"; } content += "</tr>"; - content += "<tr><td></td><td></td><td></td><td></td><td></td></tr>"; //Make a seperation between 2 test section (VideoBroadcast and SearchManager for example) } content += "</tbody>"; @@ -194,28 +118,28 @@ }, updateTestResult: function(currentTest, object) { - + console.group(currentTest["label"]); var timeStart = performance.now(); var promise = new Promise(object[currentTest["method"]].bind(object)); var result = false; promise.then(function(val) { + console.groupEnd(currentTest["label"]); result = true; var timeEnd = performance.now(); - document.getElementById(currentTest["id"] + "Result").textContent = val; - var style = document.getElementById(currentTest["id"] + "Result").style; - style.backgroundColor = "limegreen"; - document.getElementById(currentTest["id"] + "Duration").textContent = (timeEnd - timeStart).toFixed(2) + " ms"; - + document.getElementById(currentTest["method"] + "Result").textContent = val; + document.getElementById(currentTest["method"] + "Result").style.backgroundColor = "limegreen"; + document.getElementById(currentTest["method"] + "Duration").textContent = (timeEnd - timeStart).toFixed(2) + " ms"; + }); promise.catch(function(val) { + console.groupEnd(currentTest["label"]); result = true; var timeEnd = performance.now(); - document.getElementById(currentTest["id"] + "Result").textContent = val; - var style = document.getElementById(currentTest["id"] + "Result").style; - style.backgroundColor = "red"; - document.getElementById(currentTest["id"] + "Duration").textContent = (timeEnd - timeStart).toFixed(2) + " ms"; + document.getElementById(currentTest["method"] + "Result").textContent = val; + document.getElementById(currentTest["method"] + "Result").style.backgroundColor = "red"; + document.getElementById(currentTest["method"] + "Duration").textContent = (timeEnd - timeStart).toFixed(2) + " ms"; }); @@ -224,13 +148,13 @@ try { var message = "Any result have been return."; var timeEnd = performance.now(); - document.getElementById(currentTest["id"] + "Result").textContent = message; - var style = document.getElementById(currentTest["id"] + "Result").style; - style.backgroundColor = "red"; - document.getElementById(currentTest["id"] + "Duration").textContent = (timeEnd - timeStart).toFixed(2) + " ms"; + document.getElementById(currentTest["method"] + "Result").textContent = message; + document.getElementById(currentTest["method"] + "Result").style.backgroundColor = "red"; + document.getElementById(currentTest["method"] + "Duration").textContent = (timeEnd - timeStart).toFixed(2) + " ms"; throw new Error(message); } catch (error) { console.log("[INFO]", error.message); + console.groupEnd(currentTest["label"]); } } }, 10000);

1 0

r953 - oipf/js/lib
by ygrego＠users.nuiton.org March 18, 2015

March 18, 2015

Author: ygrego Date: 2015-03-18 09:18:57 +0000 (Wed, 18 Mar 2015) New Revision: 953 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/953 Log: The method "addEventListener" and "fireEvent" have been added to "prototype" of super class "Class". Because these one must be present in each subclass. Modified: oipf/js/lib/Class.js Modified: oipf/js/lib/Class.js =================================================================== --- oipf/js/lib/Class.js 2015-03-17 09:18:21 UTC (rev 952) +++ oipf/js/lib/Class.js 2015-03-18 09:18:57 UTC (rev 953) @@ -10,6 +10,23 @@ child.prototype = proto; child.prototype.__proto__ = parent.prototype; child.prototype.super = parent.prototype; + + child.prototype.addEventListener = function(type, listener) { + var listenersList = this.listeners[type]; + + if (listenersList) { + listenersList.push(listener); + } else { + this.listeners[type] = [listener]; + } + + }; + child.prototype.fireEvent = function(event) { + this.listeners[event.type].forEach(function(element){ + element.apply(this, event.detail); + }); + }; + return child; };

1 0

r952 - oipf/js/initObj
by ygrego＠users.nuiton.org March 17, 2015

March 17, 2015

Author: ygrego Date: 2015-03-17 09:18:21 +0000 (Tue, 17 Mar 2015) New Revision: 952 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/952 Log: The variable "event_listener" is a map which contains couples ("event type" as key and "a listener" as value). This one will be used when a object call the method "dispatchEvent", in order to determinate which listener call on dispatching of a specific event. Modified: oipf/js/initObj/init.js Modified: oipf/js/initObj/init.js =================================================================== --- oipf/js/initObj/init.js 2015-03-17 09:11:36 UTC (rev 951) +++ oipf/js/initObj/init.js 2015-03-17 09:18:21 UTC (rev 952) @@ -52,6 +52,8 @@ "N/A" //reserved_future_use ]; +var event_listener = {}; + var oipfObjectFactory = new OipfObjectFactory(); var metadata = data;

1 0

r951 - oipf/js/utils
by ygrego＠users.nuiton.org March 17, 2015

March 17, 2015

Author: ygrego Date: 2015-03-17 09:11:36 +0000 (Tue, 17 Mar 2015) New Revision: 951 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/951 Log: Addition of a new method "timeout" which permit to set a timer and return a Promise in order simulate more easily asynchronous calls. Modified: oipf/js/utils/Utils.js Modified: oipf/js/utils/Utils.js =================================================================== --- oipf/js/utils/Utils.js 2015-03-13 16:42:16 UTC (rev 950) +++ oipf/js/utils/Utils.js 2015-03-17 09:11:36 UTC (rev 951) @@ -2,7 +2,6 @@ * Some code based on RFC 4122, section 4.4 * (Algorithms for Creating a UUID from Truly Random or Pseudo-Random Number). */ - function createUUID() { // http://www.ietf.org/rfc/rfc4122.txt var s = []; @@ -25,3 +24,13 @@ function isMethodImplemented(object, methodName) { return object[methodName]; } + +/* + * Description: + * Encapsulation of function "setTimeout" in order to it be accessible for all object and also reusable. + */ +function timeout(time) { + return new Promise(function(resolve, reject) { + setTimeout(resolve, time); + }); +} \ No newline at end of file

1 0

r950 - oipf/js/impl
by ygrego＠users.nuiton.org March 13, 2015

March 13, 2015

Author: ygrego Date: 2015-03-13 16:42:16 +0000 (Fri, 13 Mar 2015) New Revision: 950 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/950 Log: Renaming of property "playstate" into "playState", use of variable "self" in all methods "setTimeout" use in this class, addition of method "setTimeout" in method "release" and "stop". Modified: oipf/js/impl/VideoBroadcastObject.js Modified: oipf/js/impl/VideoBroadcastObject.js =================================================================== --- oipf/js/impl/VideoBroadcastObject.js 2015-03-13 16:31:41 UTC (rev 949) +++ oipf/js/impl/VideoBroadcastObject.js 2015-03-13 16:42:16 UTC (rev 950) @@ -94,7 +94,7 @@ * call to bindToCurrentChannel() completes. Applications which do not need to call bindToCurrentChannel() should not do so. The current channel can * be obtained from the currentChannel property on the ApplicationPrivateData object which is the same as that on the video/broadcast object under most normal * conditions. */ - playstate: null, + playState: null, /* * Description: @@ -142,7 +142,7 @@ init: function (requiredCapabilities) { console.log("[INFO] constructor of VideoBroadcast class called."); - this.playstate = 0; + this.playState = 0; if (requiredCapabilities) { this.allocationMethod = STATIC_ALLOCATION_VIDEOBROADCAST; /* TODO: get scarce resources Scarce resources can be claimed by the video/broadcast or A/V Control object at instantiation time by specifying the @@ -296,7 +296,7 @@ var channelConfig = this.getChannelConfig(); var currentChan = channelConfig.currentChannel; var self = this; - switch (this.playstate) { + switch (this.playState) { case 0: //claimed scarce resources @@ -306,15 +306,15 @@ this.currentChannel = currentChan; setTimeout(function () { - this.playstate = 2; - self.onPlayStateChange && self.onPlayStateChange(this.playstate);//Parameter error here equals to 20 but not defined in the norm, means there is no error + self.playState = 2; + self.onPlayStateChange && self.onPlayStateChange(self.playState); }, 0); } else { setTimeout(function () { - this.playstate = 0; - self.onPlayStateChange && self.onPlayStateChange(this.playstate, 100); + self.playState = 0; + self.onPlayStateChange && self.onPlayStateChange(self.playState, 100); }, 0); } break; @@ -322,8 +322,8 @@ case 3: setTimeout(function () { //Make enable video and audio presentation - this.playstate = 1; - self.onPlayStateChange && self.onPlayStateChange(this.playstate); + self.playState = 1; + self.onPlayStateChange && self.onPlayStateChange(self.playState); }, 0); break; @@ -525,15 +525,38 @@ }, /* - * Description: - * The function that is called when a request to switch a tuner to another channel has successfully completed. - * This function may be called either in response to a channel change initiated by the application, or a channel - * change initiated by the OITF (see section 7.13.1.1). The specified function is called with argument channel, - * which is defined as follows: - * - * • Channel channel – the channel to which the tuner switched. This object SHALL have the same properties with the same values as the currentChannel object (see * section 7.13.7). + * Description: (Validation on Transport Stream won't be done here because this criteria not relevant) + * Requests the OITF to switch a (logical or physical) tuner to the channel specified by + * channel and render the received broadcast content in the area of the browser allocated for + * the video/broadcast object. + * + * If the channel specifies an idType attribute value which is not supported by the OITF or a + * combination of properties that does not identify a valid channel, the request to switch + * channel SHALL fail and the OITF SHALL trigger the function specified by the + * onChannelChangeError property, specifying the value 0 (“Channel not supported by + * tuner”) for the errorState , and dispatch the corresponding DOM event (see below). + * + * */ setChannel: function(channel, trickplay, contentAccessDescriptorURL) { + + if ((this.playState >= 1) && (this.playState <= 3) && (!channel)) { + var tuner = verifyASuitableTunerAvailable(this, channel.idType); + + if (tuner) { + + } + + } else { + var self = this; + + setTimeout(function () { + self.playState = 0; + self.release(); + self.onPlayStateChange && self.onPlayStateChange(self.playState); + }, 0); + + } }, /* @@ -683,16 +706,23 @@ * the releasing of resources shall change this to DYNAMIC_ALLOCATION . */ release: function() { - if ((this.playstate >= 1) && (this.playstate <= 3)) { + if ((this.playState >= 1) && (this.playState <= 3)) { /* Call method to : * - release tuner used by this video/broadcast object. * - stop visualization of the video. * - and scarce ressources loaded previously. */ - this.playstate = 0; - this.currentChannel = null; - this.allocationMethod = (this.allocationMethod == STATIC_ALLOCATION_VIDEOBROADCAST) ? DYNAMIC_ALLOCATION_VIDEOBROADCAST : this.allocationMethod; - this.onPlayStateChange && this.onPlayStateChange(0); + var self = this; + console.log("Hey Hey"); + setTimeout(function () { + self.playState = 0; + self.currentChannel = null; + self.allocationMethod = (self.allocationMethod == STATIC_ALLOCATION_VIDEOBROADCAST) ? DYNAMIC_ALLOCATION_VIDEOBROADCAST : self.allocationMethod; + self.onPlayStateChange && self.onPlayStateChange(self.playState); + }, 0); + + this.playState = 0; + } }, @@ -707,14 +737,18 @@ * */ stop: function() { - if ((this.playstate >= 1) && (this.playstate <= 2)) { + if ((this.playState >= 1) && (this.playState <= 2)) { /* Call method to : * - stop the presentation of the video and audio. * - and scarce ressources loaded previously. */ - this.playstate = 3; this.release(); - this.onPlayStateChange && this.onPlayStateChange(3); + var self = this; + console.log("Hey"); + setTimeout(function () { + self.playState = 3; + self.onPlayStateChange && self.onPlayStateChange(self.playState); + }, 0); } }, @@ -724,8 +758,9 @@ var channelConfig = object.getChannelConfig(); var favouriteLists = channelConfig.favouriteLists; + //Verify that OITF maintain channel list or favourite list by itself - if (channelConfig && favouriteLists && (object.playstate > 0) && (object.playstate < 4)) { + if (channelConfig && favouriteLists && (object.playState > 0) && (object.playState < 4)) { //Verify that the currentChannel exists in the channel list of channel configuration if (!channelConfig.channelList.getChannel(object.currentChannel.channelId)) { @@ -734,11 +769,11 @@ self.onChannelChangeError && self.onChannelChangeError(null, 100); }, 0); - if (object.playstate == 1) { + if (object.playState == 1) { self = object; setTimeout(function () { - this.playstate = 0; - self.onPlayStateChange && self.onPlayStateChange(this.playstate, 100); + self.playState = 0; + self.onPlayStateChange && self.onPlayStateChange(self.playState, 100); }, 0); } } else { @@ -765,8 +800,8 @@ object.currentChannel = previousChannel; self = object; setTimeout(function () { - this.playstate = 1; - self.onPlayStateChange && self.onPlayStateChange(this.playstate); + self.playState = 1; + self.onPlayStateChange && self.onPlayStateChange(self.playState); self.onChannelChangeSucceeded && self.onChannelChangeSucceeded(previousChannel); }, 0); }

1 0

r949 - oipf/view
by ygrego＠users.nuiton.org March 13, 2015

March 13, 2015

Author: ygrego Date: 2015-03-13 16:31:41 +0000 (Fri, 13 Mar 2015) New Revision: 949 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/949 Log: Use of "method" field of a test element as identifier of button assigned to execution of this test, modification done in method "addListenerForEachTestButton". Modified: oipf/view/test.html Modified: oipf/view/test.html =================================================================== --- oipf/view/test.html 2015-03-12 10:52:47 UTC (rev 948) +++ oipf/view/test.html 2015-03-13 16:31:41 UTC (rev 949) @@ -13,8 +13,7 @@ <script src="../js/lib/Class.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/lib/Collection.js" type="text/javascript"></script> + <script src="../js/utils/Utils.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> @@ -62,7 +61,7 @@ for (var j = 0, l1 = currentTests.length; j < l1; j++) { var testCase = currentTests[j]; - document.getElementById(testCase["id"] + "Btn").addEventListener("click", testClass.updateTestResult.bind(testClass, testCase, currentElement["object"]), false); + document.getElementById(testCase["method"] + "Btn").addEventListener("click", testClass.updateTestResult.bind(testClass, testCase, currentElement["object"]), false); } } }

1 0

r948 - oipf/js/lib
by ygrego＠users.nuiton.org March 12, 2015

March 12, 2015

Author: ygrego Date: 2015-03-12 10:52:47 +0000 (Thu, 12 Mar 2015) New Revision: 948 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/948 Log: Deletion of file Collection Removed: oipf/js/lib/Collection.js Deleted: oipf/js/lib/Collection.js =================================================================== --- oipf/js/lib/Collection.js 2015-03-12 10:48:11 UTC (rev 947) +++ oipf/js/lib/Collection.js 2015-03-12 10:52:47 UTC (rev 948) @@ -1,28 +0,0 @@ -/*--------------------------------------------TO-DO: True implementation of a collection---------------------------------------- -* Description: The Collection< T > class is a parameterized class whose instances are (possibly zero-length) collections of values of -* type T. The properties and methods defined below SHALL be present on any instance of a Collection< T > class. -* Instances of a Collection< T > class SHALL support the use of array notation to access objects in the collection. -* Instances of a Collection< T > class SHALL be considered to be immutable, except by APIs defined on the collection. -* Attempts to insert items into instances of a Collection< T > class using array notation SHALL fail. -*/ -var Collection = Array.extend({ - /* - * Description: - * Return the item at position index in the collection, or undefined if no item is present at that position. - * - * Argument: - * -index: The index of the item that SHALL be returned - * - */ - item: function(index) { - - return (this.length==0)? null: (this)[index]; - }, - - init: function(elements) { - if (elements) { - this.push(elements); - } - } - -}); \ No newline at end of file

1 0

r947 - oipf/view
by ygrego＠users.nuiton.org March 12, 2015

March 12, 2015

Author: ygrego Date: 2015-03-12 10:48:11 +0000 (Thu, 12 Mar 2015) New Revision: 947 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/947 Log: Deletion of file "tableaux.html". Removed: oipf/view/tableaux.html Deleted: oipf/view/tableaux.html =================================================================== --- oipf/view/tableaux.html 2015-03-12 10:42:19 UTC (rev 946) +++ oipf/view/tableaux.html 2015-03-12 10:48:11 UTC (rev 947) @@ -1,175 +0,0 @@ -<!DOCTYPE html> - -<html> - <head> - <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/tableaux.css"> - <script src="../js/lib/Class.js" type="text/javascript"></script> - <script src="../js/utils/Calculation.js" type="text/javascript"></script> - <script src="../js/utils/ChannelTools.js" type="text/javascript"></script> - <script src="../js/lib/Collection.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="../data/data.js" type="text/javascript"></script> - <script src="../js/impl/model/IntegerCollection.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/LocalSystem.js" type="text/javascript"></script> - <script src="../js/impl/model/TunerCollection.js" type="text/javascript"></script> - <script src="../js/impl/model/constants/VideoBroadcastConstants.js" type="text/javascript"></script> - <script src="../js/impl/model/Channel.js" type="text/javascript"></script> - <script src="../js/impl/model/ChannelList.js" type="text/javascript"></script> - <script src="../js/impl/model/MetadataSearch.js" type="text/javascript"></script> - <script src="../js/impl/model/SearchResults.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/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/Test.js" type="text/javascript"></script> - <script src="../js/initObj/init.js" type="text/javascript"></script> - - <script> - var tests = new Test(); - function start() { - - tests.displayArrayLayout(); - document.getElementById("runAllBtn").addEventListener("click",tests.runAll.bind(tests),false); - } - function hideOrShowTestSection(sectionId) { - var style = document.getElementById(sectionId).style; - style.display = (style.display == "none") ? "block" : "none"; - } - </script> - </head> - <body onload="start()"> - <table id="demo-table"> - <CAPTION>Les océans</CAPTION> - - <THEAD> - <TR> - <TH></TH> - <TH>Surface</TH> - <TH>Profondeur moyenne</TH> - </TR> - <TR> - <TH></TH> - <TH>millions de km<SUP>2</SUP></TH> - <TH>m</TH> - </TR> - </THEAD> - - <TBODY> - <TR> - <TH>Arctique</TH> - <TD>13 000</TD> - <TD>1 200</TD> - </TR> - <TR> - <TH>Atlantique</TH> - <TD>87 000</TD> - <TD>3 900</TD> - </TR> - <TR> - <TH>Pacifique</TH> - <TD>180 000</TD> - <TD>4 000</TD> - </TR> - <TR> - <TH>Indien</TH> - <TD>75 000</TD> - <TD>3 900</TD> - </TR> - <TR> - <TH>Antarctique</TH> - <TD>20 000</TD> - <TD>4 500</TD> - </TR> - </TBODY> - - <TFOOT> - <TR> - <TH>Total</TH> - <TD>361 000</TD> - <TD></TD> - </TR> - <TR> - <TH>Moyenne</TH> - <TD>72 000</TD> - <TD>3 800</TD> - </TR> - </TFOOT> - - </table> - - <table id="demo-table1"> - <CAPTION>Les océans</CAPTION> - -  - - <TBODY> - <TR> - <TH>Arctique</TH> - <TD>13 000</TD> - <TD>1 200</TD> - </TR> - <TR> - <TH>Atlantique</TH> - <TD>87 000</TD> - <TD>3 900</TD> - </TR> - <TR> - <TH>Pacifique</TH> - <TD>180 000</TD> - <TD>4 000</TD> - </TR> - <TR> - <TH>Indien</TH> - <TD>75 000</TD> - <TD>3 900</TD> - </TR> - <TR> - <TH>Antarctique</TH> - <TD>20 000</TD> - <TD>4 500</TD> - </TR> - </TBODY> - - <TFOOT> - <TR> - <TH>Total</TH> - <TD>361 000</TD> - <TD></TD> - </TR> - <TR> - <TH>Moyenne</TH> - <TD>72 000</TD> - <TD>3 800</TD> - </TR> - </TFOOT> - - </table> - - </body> - -</html>

1 0

r946 - oipf/view/css
by ygrego＠users.nuiton.org March 12, 2015

March 12, 2015

Author: ygrego Date: 2015-03-12 10:42:19 +0000 (Thu, 12 Mar 2015) New Revision: 946 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/946 Log: Modification of rule "table th, table td" in order to add border to table cells. Addition of a rule "table tbody td:nth-child(4)" to add a background color to fourth column of table. Modified: oipf/view/css/test.css Modified: oipf/view/css/test.css =================================================================== --- oipf/view/css/test.css 2015-03-12 10:17:51 UTC (rev 945) +++ oipf/view/css/test.css 2015-03-12 10:42:19 UTC (rev 946) @@ -28,8 +28,9 @@ /* shared basics rules */ table th, table td { - text-align: left; + text-align: center; padding-right: .5em; + border: 1px solid #7a7; } table th { @@ -38,7 +39,7 @@ } -/* header not used*/ +/* header of table*/ table > thead > tr:first-child > th { text-align: center; color: blue; @@ -60,11 +61,15 @@ padding:.5em .5em .5em .3em; } +table tbody td:nth-child(4) { + background-color: gainsboro; + } + table tbody th:after { content: " :"; } -/* foot of table */ +/* foot of table not used here*/ table tfoot { font-weight: bold; }

1 0

r945 - oipf/js/utils
by ygrego＠users.nuiton.org March 12, 2015

March 12, 2015

Author: ygrego Date: 2015-03-12 10:17:51 +0000 (Thu, 12 Mar 2015) New Revision: 945 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/945 Log: Renaming file "utils.js" in "Utils.js" Added: oipf/js/utils/Utils.js Removed: oipf/js/utils/utils.js Copied: oipf/js/utils/Utils.js (from rev 944, oipf/js/utils/utils.js) =================================================================== --- oipf/js/utils/Utils.js (rev 0) +++ oipf/js/utils/Utils.js 2015-03-12 10:17:51 UTC (rev 945) @@ -0,0 +1,27 @@ +/* + * Some code based on RFC 4122, section 4.4 + * (Algorithms for Creating a UUID from Truly Random or Pseudo-Random Number). + */ + +function createUUID() { + // http://www.ietf.org/rfc/rfc4122.txt + var s = []; + var hexDigits = "0123456789abcdef"; + for (var i = 0; i < 36; i++) { + s[i] = hexDigits.substr(Math.floor(Math.random() * 0x10), 1); + } + s[14] = "4"; // bits 12-15 of the time_hi_and_version field to 0010 + s[19] = hexDigits.substr((s[19] & 0x3) | 0x8, 1); // bits 6-7 of the clock_seq_hi_and_reserved to 01 + s[8] = s[13] = s[18] = s[23] = "-"; + + var uuid = s.join(""); + return uuid; +} + +/* + * Description: + * Should be use in each test method in anticipation of tests executed on a tv platform. + */ +function isMethodImplemented(object, methodName) { + return object[methodName]; +} Deleted: oipf/js/utils/utils.js =================================================================== --- oipf/js/utils/utils.js 2015-03-12 10:15:02 UTC (rev 944) +++ oipf/js/utils/utils.js 2015-03-12 10:17:51 UTC (rev 945) @@ -1,27 +0,0 @@ -/* - * Some code based on RFC 4122, section 4.4 - * (Algorithms for Creating a UUID from Truly Random or Pseudo-Random Number). - */ - -function createUUID() { - // http://www.ietf.org/rfc/rfc4122.txt - var s = []; - var hexDigits = "0123456789abcdef"; - for (var i = 0; i < 36; i++) { - s[i] = hexDigits.substr(Math.floor(Math.random() * 0x10), 1); - } - s[14] = "4"; // bits 12-15 of the time_hi_and_version field to 0010 - s[19] = hexDigits.substr((s[19] & 0x3) | 0x8, 1); // bits 6-7 of the clock_seq_hi_and_reserved to 01 - s[8] = s[13] = s[18] = s[23] = "-"; - - var uuid = s.join(""); - return uuid; -} - -/* - * Description: - * Should be use in each test method in anticipation of tests executed on a tv platform. - */ -function isMethodImplemented(object, methodName) { - return object[methodName]; -}

1 0