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

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

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

09 Jun '15

Author: ygrego Date: 2015-06-09 12:29:01 +0000 (Tue, 09 Jun 2015) New Revision: 1644 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1644 Log: Transformation of the class CapabilitiesObject in an ES6 class. Modified: oipf/lib/js/impl/CapabilitiesObject.js Modified: oipf/lib/js/impl/CapabilitiesObject.js =================================================================== --- oipf/lib/js/impl/CapabilitiesObject.js 2015-06-09 12:19:40 UTC (rev 1643) +++ oipf/lib/js/impl/CapabilitiesObject.js 2015-06-09 12:29:01 UTC (rev 1644) @@ -1,82 +1,81 @@ /* - * The OITF SHALL support following non-visual embedded object with + * The OITF SHALL support following non-visual embedded object with * the mime type 'application/oipfCapabilities'. */ -var CapabilitiesObject = Class.extend({ - - /* - * Description: - * Returns the OITF’s capability description as an XML Document object using - * the syntax as defined in Annex F without using any namespace - * definitions. - * - * Visibility Type: readonly Document - */ - xmlCapabilities: null, - - /* - * Description: - * This property holds the number of possible additional decodes for - * SD video. Depending on the current usage of system resources this value - * may vary. The value of this property is likely to change if an HD video - * is started. - * - * Adding an A/V Control object or video/broadcast object may still fail, - * even if extraSDVideoDecodes is larger than 0. For A/V Control objects, - * in case of failure the play state for the A/V Control object shall be set - * to 6 ('error') with a detailed error code of 3 - * ('insufficient resources'). For video/broadcast objects, in case of - * failure the play state of the video/broadcast object shall be set to 0 - * ('unrealized') with a detailed error code of 11 - * ('insufficient resources'). - * - * Visibility Type: readonly Number - */ - extraSDVideoDecodes: null, - - /* - * Description: - * This property holds the number of possible additional decodes for - * HD video. Depending on the current usage of system resources this value - * may vary. The value of this property is likely to change if an SD video - * is started. - * - * Adding an A/V Control object or video/broadcast object may still fail, - * even if extraSDVideoDecodes is larger than 0. For A/V Control objects, - * in case of failure the play state for the A/V Control object shall be set - * to 6 ('error') with a detailed error code of 3 - * ('insufficient resources'). For video/broadcast objects, in case of - * failure the play state of the video/broadcast object shall be set to 0 - * ('unrealized') with a detailed error code of 11 - * ('insufficient resources'). - * - * Visibility Type: readonly Number - */ - extraHDVideoDecodes: null, - - - init: function(modelFactory) { +class CapabilitiesObject { + + constructor(modelFactory) { + /* + * Description: + * Returns the OITF’s capability description as an XML Document object using + * the syntax as defined in Annex F without using any namespace + * definitions. + * + * Visibility Type: readonly Document + */ + this.xmlCapabilities = null; + + /* + * Description: + * This property holds the number of possible additional decodes for + * SD video. Depending on the current usage of system resources this value + * may vary. The value of this property is likely to change if an HD video + * is started. + * + * Adding an A/V Control object or video/broadcast object may still fail, + * even if extraSDVideoDecodes is larger than 0. For A/V Control objects, + * in case of failure the play state for the A/V Control object shall be set + * to 6 ('error') with a detailed error code of 3 + * ('insufficient resources'). For video/broadcast objects, in case of + * failure the play state of the video/broadcast object shall be set to 0 + * ('unrealized') with a detailed error code of 11 + * ('insufficient resources'). + * + * Visibility Type: readonly Number + */ + this.extraSDVideoDecodes = null; + + /* + * Description: + * This property holds the number of possible additional decodes for + * HD video. Depending on the current usage of system resources this value + * may vary. The value of this property is likely to change if an SD video + * is started. + * + * Adding an A/V Control object or video/broadcast object may still fail, + * even if extraSDVideoDecodes is larger than 0. For A/V Control objects, + * in case of failure the play state for the A/V Control object shall be set + * to 6 ('error') with a detailed error code of 3 + * ('insufficient resources'). For video/broadcast objects, in case of + * failure the play state of the video/broadcast object shall be set to 0 + * ('unrealized') with a detailed error code of 11 + * ('insufficient resources'). + * + * Visibility Type: readonly Number + */ + this.extraHDVideoDecodes = null; + this.xmlParser = modelFactory.getXmlParser(); this._defaultCapabilities = modelFactory.getCapabilitiesProperties(); this.xmlCapabilities = this.xmlParser .getXmlDocument(this._defaultCapabilities); - }, - + } + /* * Description: * Check if the OITF supports the passed capability. * Returns true if the OITF supports the passed capability, false otherwise. - * + * * Arguments: - * - profileName: + * - profileName: * An OIPF base UI profile string or a UI Profile name fragment string as * defined in section 9.2. * Examples of valid profileName: “ OITF_HD_UIPROF ” or “ +PVR ”. - * + * * Return: Boolean */ - hasCapability: function(profileName) { + hasCapability(profileName) { return this._defaultCapabilities.hasCapablity(profileName); } -}); \ No newline at end of file +}

1 0

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

09 Jun '15

Author: ygrego Date: 2015-06-09 12:19:40 +0000 (Tue, 09 Jun 2015) New Revision: 1643 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1643 Log: Transformation of the class "ApplicationManagerObject" in an ES6 class. Modified: oipf/lib/js/impl/ApplicationManagerObject.js Modified: oipf/lib/js/impl/ApplicationManagerObject.js =================================================================== --- oipf/lib/js/impl/ApplicationManagerObject.js 2015-06-09 12:17:18 UTC (rev 1642) +++ oipf/lib/js/impl/ApplicationManagerObject.js 2015-06-09 12:19:40 UTC (rev 1643) @@ -4,194 +4,193 @@ * and management that is provided by the application model defined in this section. * If one of the methods on the application/oipfApplicationManager is called by a webpage that is not a * privileged DAE application, the OITF SHALL throw an error as defined in section 10.1.1. - */ -var ApplicationManagerObject = Class.extend({ + */ +class ApplicationManagerObject { - _currentApplication: null, - - _rootApplication: null, - - _hiddenSystemRootNode: null, - - _activeApplicationsList: null, - - _visibleApplicationsList: null, - - addEventListener: function(type, listener) { + addEventListener(type, listener) { this._eventManager.addEventListener(type, listener, this); - }, - - removeEventListener: function(type, listener) { + } + + removeEventListener(type, listener) { this._eventManager.removeEventListener(type, listener, this); - }, - - _getCallback : function(type) { - if(this._callbacks) { + } + + _getCallback(type) { + if (this._callbacks) { return this._callbacks[type]; } - }, - - _setCallback: function(type, callback) { - if(this._callbacks) { + } + + _setCallback(type, callback) { + if (this._callbacks) { this._callbacks[type] = callback; } - }, - + } + /* * Description: - * The function that is called when the OITF is running low on available + * The function that is called when the OITF is running low on available * memory for running DAE applications. - * The exact criteria determining when to generate such an event is + * The exact criteria determining when to generate such an event is * implementation specific. */ get onLowMemory() { return this._getCallback("LowMemory"); - }, + } set onLowMemory(callback) { this._setCallback("LowMemory", callback); - }, - + } + /* * Description: - * The function that is called immediately prior to a load event being - * generated in the affected application. The specified function is called - * with one argument appl , which provides a reference to the affected + * The function that is called immediately prior to a load event being + * generated in the affected application. The specified function is called + * with one argument appl , which provides a reference to the affected * application. */ get onApplicationLoaded() { return this._getCallback("ApplicationLoaded"); - }, + } set onApplicationLoaded(callback) { this._setCallback("ApplicationLoaded", callback); - }, - + } + /* * Description: - * The function that is called immediately prior to an unload event being - * generated in the affected application. The specified function is called - * with one argument appl , which provides a reference to the affected + * The function that is called immediately prior to an unload event being + * generated in the affected application. The specified function is called + * with one argument appl , which provides a reference to the affected * application. */ get onApplicationUnloaded() { return this._getCallback("ApplicationUnloaded"); - }, + } set onApplicationUnloaded(callback) { this._setCallback("ApplicationUnloaded", callback); - }, - + } + /* * Description: - * The function that is called when the OITF fails to load either the file + * The function that is called when the OITF fails to load either the file * containing the initial HTML document of an application or an XML AIT file * (e.g. due to an HTTP 404 error, an HTTP timeout, being unable to load the * file from a DSM-CC object carousel or due to the file not being either an - * HTML file or a XML AIT file as appropriate), All properties of + * HTML file or a XML AIT file as appropriate), All properties of * the Application object referred to by appl SHALL have the value undefined * and calling any methods on that object SHALL fail. */ get onApplicationLoadError() { return this._getCallback("ApplicationLoadError"); - }, + } set onApplicationLoadError(callback) { this._setCallback("ApplicationLoadError", callback); - }, - + } + /* * Description: - * The callback function that is called during the installation process of + * The callback function that is called during the installation process of * a Widget. The function is called with three arguments: - * - * WidgetDescriptor wd - the WidgetDescriptor for the installed Widget. + * + * WidgetDescriptor wd - the WidgetDescriptor for the installed Widget. * Some attributes of this argument may not have been initialised and may be - * null when the function is called until the Widget is successfully - * installed. - * - * Integer state - the state of the installation; valid values are: - * WIDGET_INSTALLATION_STARTED - * WIDGET_INSTALLATION_COMPLETED - * WIDGET_INSTALLATION_FAILED + * null when the function is called until the Widget is successfully + * installed. + * + * Integer state - the state of the installation; valid values are: + * WIDGET_INSTALLATION_STARTED + * WIDGET_INSTALLATION_COMPLETED + * WIDGET_INSTALLATION_FAILED * as defined in section 7.2.1.1. - * - * Integer reason: indicates the reason for installation failure. - * This is only valid if the value of the state argument is - * WIDGET_INSTALLATION_FAILED otherwise this argument SHALL be null. - * Valid values for this field are: - * WIDGET_ERROR_STORAGE_AREA_FULL - * WIDGET_ERROR_DOWNLOAD - * WIDGET_ERROR_INVALID_ZIP_ARCHIVE - * WIDGET_ERROR_INVALID_SIGNATURE - * WIDGET_ERROR_GENERIC - * WIDGET_ERROR_SIZE_EXCEEDED - * WIDGET_ERROR_PERMISSION_DENIED + * + * Integer reason: indicates the reason for installation failure. + * This is only valid if the value of the state argument is + * WIDGET_INSTALLATION_FAILED otherwise this argument SHALL be null. + * Valid values for this field are: + * WIDGET_ERROR_STORAGE_AREA_FULL + * WIDGET_ERROR_DOWNLOAD + * WIDGET_ERROR_INVALID_ZIP_ARCHIVE + * WIDGET_ERROR_INVALID_SIGNATURE + * WIDGET_ERROR_GENERIC + * WIDGET_ERROR_SIZE_EXCEEDED + * WIDGET_ERROR_PERMISSION_DENIED * as defined in section 7.2.1.1. */ get onWidgetInstallation() { return this._getCallback("WidgetInstallation"); - }, + } set onWidgetInstallation(callback) { this._setCallback("WidgetInstallation", callback); - }, - + } + /* * Description: - * The function that is called during the uninstallation process of - * a Widget. The function is called with two arguments, defined below: - * - * WidgetDescriptor wd - the WidgetDescriptor of the Widget - * to be uninstalled. - * - * Integer state - the state of the installation; valid values are: - * WIDGET_UNINSTALLATION_STARTED - * WIDGET_UNINSTALLATION_COMPLETED + * The function that is called during the uninstallation process of + * a Widget. The function is called with two arguments, defined below: + * + * WidgetDescriptor wd - the WidgetDescriptor of the Widget + * to be uninstalled. + * + * Integer state - the state of the installation; valid values are: + * WIDGET_UNINSTALLATION_STARTED + * WIDGET_UNINSTALLATION_COMPLETED * WIDGET_UNINSTALLATION_FAILED * as defined in section 7.2.1.1. */ get onWidgetUninstallation() { return this._getCallback("WidgetUninstallation"); - }, + } set onWidgetUninstallation(callback) { this._setCallback("WidgetUninstallation", callback); - }, - - /* - * Description: - * A collection of WidgetDescriptor objects for the Widgets currently - * installed on the OITF. - * - * Visibilité Type: readonly WidgetDescriptorCollection - */ - widgets: null, - - init : function(applicationVisualizationMode) { + } + + constructor(applicationVisualizationMode) { + /* + * Description: + * A collection of WidgetDescriptor objects for the Widgets + * currently installed on the OITF. + * + * Visibility type: readonly WidgetDescriptorCollection + */ + this.widgets = null; + + this._currentApplication = null; + + this._rootApplication = null; + + this._hiddenSystemRootNode = null; + + this._activeApplicationsList = null; + + this._visibleApplicationsList = null; this._applicationVisualizationMode = applicationVisualizationMode; this._listeners = {}; this._callbacks = {}; this._eventManager = new EventManager(); - + this._timerManager = new TimerManager(); this._timeout = this._timerManager.createTimer.bind(this._timerManager, 0); this._hiddenSystemRootNode = []; this._activeApplicationsList = new ApplicationCollection(); this._createRootApplication(); - }, - - _createRootApplication: function() { + } + + _createRootApplication() { this._rootApplication = new Application(window, this); - }, - - _fireEvent: function(type, params) { - var event = createCustomEvent(type, params); + } + + _fireEvent(type, params) { + var event = this._eventManager.createCustomEvent(type, params); this._eventManager.fireEvent(event, this); - }, - - getApplicationVisualizationMode: function() { + } + + getApplicationVisualizationMode() { return this._applicationVisualizationMode; - }, + } -}); \ No newline at end of file +}

1 0

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

09 Jun '15

Author: ygrego Date: 2015-06-09 12:17:18 +0000 (Tue, 09 Jun 2015) New Revision: 1642 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1642 Log: Transformation of the class "IMSObject" in an ES6 class. Modified: oipf/lib/js/impl/IMSObject.js Modified: oipf/lib/js/impl/IMSObject.js =================================================================== --- oipf/lib/js/impl/IMSObject.js 2015-06-09 12:16:27 UTC (rev 1641) +++ oipf/lib/js/impl/IMSObject.js 2015-06-09 12:17:18 UTC (rev 1642) @@ -1,7 +1,6 @@ -var IMSObject = Class.extend({ +class IMSObject { - init : function(){ - + constructor() { } -}); \ No newline at end of file +}

1 0

r1641 - in oipf: lib/configuration test test/js test/view
by jruchaud＠users.nuiton.org 09 Jun '15

09 Jun '15

Author: jruchaud Date: 2015-06-09 12:16:27 +0000 (Tue, 09 Jun 2015) New Revision: 1641 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1641 Log: Fix dependency for test Added: oipf/test/js/TestConfig.js Removed: oipf/lib/configuration/TestConfig.js Modified: oipf/test/server.js oipf/test/view/test.html Deleted: oipf/lib/configuration/TestConfig.js =================================================================== --- oipf/lib/configuration/TestConfig.js 2015-06-09 12:09:46 UTC (rev 1640) +++ oipf/lib/configuration/TestConfig.js 2015-06-09 12:16:27 UTC (rev 1641) @@ -1,226 +0,0 @@ -/* - * 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. - */ - -if (!String.prototype.includes) { - String.prototype.includes = function() {'use strict'; - return String.prototype.indexOf.apply(this, arguments) !== -1; - }; -} - -var userAgent = navigator.userAgent; - -if (userAgent.includes("HbbTV") || userAgent.includes("SmartTv")) { - - console.log("OIPF TESTS ON TV PLATFORM"); - var hbbTv = ApplicationManager.getWindows[2]; - hbbTv && hbbTv.deactivate(); - var ui = ApplicationManager.getWindows()[0]; //or getWindowsByName - ui && ui.keySet.setValue(0x10, []); - !ui.visible && ui.show(); - ui.activate(); - - var VideoBroadcastManager = VideoBroadcastTest.extend({ - - init: function() { -// this.superBeforeTest = VideoBroadcastTest.prototype.super.beforeTest; - this.vidBroadObj = oipfObjectFactory.createVideoBroadcastObject(); - - this.superBeforeTest = this.super.beforeTest; - this.superOnChangeState = this.super.onChangeState; - }, - - onChangeState: function(resolve, reject, event) { - this.superOnChangeState.call(this, - resolve, reject, event.state, event.error); - }, - - beforeTest: function(resolve, reject) { - this.onPlayStateChange = this.onChangeState.bind(this, resolve, reject); - this.vidBroadObj.addEventListener("PlayStateChange", this.onPlayStateChange, false); - this.transitions = []; - this.previousState = this.vidBroadObj.playState; - this.currentIndex = 0; - this.channel = null; - this.timerManager = new TimerManager(); - this.timeout = this.timerManager.createTimer.bind(this.timerManager); - logTest("State: Pending"); - this.cancel = true; - }, - - unrealizedToConnecting: function(begin, end, callback) { - if (callback) { - throw ("Untestable Case."); - } - }, - - connectingToPresenting: function(begin, end, callback) { - /** - * Avoid that the future transition C->P be canceled. - * More extend super method beforeTest in order to reset - * 'startEndStates' property. - */ - if (this.cancel) { - callback && this.timeout().then(callback).then(console.log.bind(console, "TOTO")); - this.cancel = false; - } else { - this.pushTransition(begin, end, callback, null); - } - }, - - unrealizedToUnrealized: function(begin, end, callback) { - this.reject("Untestable Case."); - }, - - stopToStop: function(begin, end, callback) { - this.reject("Untestable Case."); - }, - - noStatesDefined: function(begin, end, callback) { - this.reject("Untestable Case."); - }, - - startEndStates: { - - "00": "unrealizedToUnrealized", - "01": "unrealizedToConnecting", - "12": "connectingToPresenting", - "33": "stopToStop", - "nullnull": "noStatesDefined" - }, - - pushTransition: function(begin, end, callback, error) { - this.transitions.push({ - begin: begin, - end: end, - error: error, - callback: callback - }); - }, - - pushTransitionWithError: function(begin, end, callback, error) { - var method = this.startEndStates[""+begin+end]; - if (method) { - this[method].call(this, begin, end, callback); - } else { - this.pushTransition(begin, end, callback, error); - } - }, - - addTransition: function(begin, end, callback) { - this.addTransitionWithError(begin, end, callback, null); - }, - - addTransitionWithError: function(begin, end, callback, error) { - this.pushTransitionWithError(begin, end, callback, error); - } - }); - - var VideoBroadcastTest = VideoBroadcastManager.extend({ - - init: function() { - this.super.init(); - } - - }); - - var SearchManagerTest = SearchManagerTest.extend({ - init: function() { - this.searchManagerObj = oipfObjectFactory.createSearchManagerObject(); - this.super.init(); - }, - - beforeTest: function(resolve, reject) { - this.super.beforeTest(resolve, reject); - this.cancel = true; - }, - - noStatesDefined: function(begin, end, callback) { - this.reject("Untestable Case."); - }, - - unrealizedToConnecting: function(begin, end, callback) { - if (callback) { - throw ("Untestable Case."); - } - }, - - connectingToPresenting: function(begin, end, callback) { - /** - * Avoid that the future transition C->P be canceled. - * More extend super method beforeTest in order to reset - * 'startEndStates' property. - */ - if (this.cancel) { - callback && this.timeout().then(callback).then(console.log.bind(console, "TOTO")); - this.cancel = false; - } else { - this.pushTransition(begin, end, callback, null); - } - }, - - startEndStates: { - - "00": "unrealizedToUnrealized", - "01": "unrealizedToConnecting", - "12": "connectingToPresenting", - "33": "stopToStop", - "nullnull": "noStatesDefined" - }, - - pushTransition: function(begin, end, callback, error) { - this.transitions.push({ - begin: begin, - end: end, - error: error, - callback: callback - }); - }, - - pushTransitionWithError: function(begin, end, callback, error) { - var method = this.startEndStates[""+begin+end]; - if (method) { - this[method].call(this, begin, end, callback); - } else { - this.pushTransition(begin, end, callback, error); - } - }, - - addTransition: function(begin, end, callback) { - this.addTransitionWithError(begin, end, callback, null); - }, - - addTransitionWithError: function(begin, end, callback, error) { - this.pushTransitionWithError(begin, end, callback, error); - } - }); - - var RecordingSchedulerTest = RecordingSchedulerTest.extend({ - - init: function() { - this.super.init(); - this.blocked = function() {}; - this.bindToCurrentChannel = this.blocked; - this.onChangeState = this.blocked; - this.createVideoBroadcast = function() { - if (!this.vidBroadObj) { - this.vidBroadObj = oipfObjectFactory.createVideoBroadcastObject(); - } - } - }, - - onPVREvent: function(resolve, reject, event) { - console.log("beforeTest"); - this.super.onPVREvent(resolve, reject, event.state, event.recording); - }, - - beforeTest: function(resolve, reject) { - console.log("beforeTest"); - this.super.beforeTest(resolve, reject); - } - - }); - -} Copied: oipf/test/js/TestConfig.js (from rev 1634, oipf/lib/configuration/TestConfig.js) =================================================================== --- oipf/test/js/TestConfig.js (rev 0) +++ oipf/test/js/TestConfig.js 2015-06-09 12:16:27 UTC (rev 1641) @@ -0,0 +1,226 @@ +/* + * 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. + */ + +if (!String.prototype.includes) { + String.prototype.includes = function() {'use strict'; + return String.prototype.indexOf.apply(this, arguments) !== -1; + }; +} + +var userAgent = navigator.userAgent; + +if (userAgent.includes("HbbTV") || userAgent.includes("SmartTv")) { + + console.log("OIPF TESTS ON TV PLATFORM"); + var hbbTv = ApplicationManager.getWindows[2]; + hbbTv && hbbTv.deactivate(); + var ui = ApplicationManager.getWindows()[0]; //or getWindowsByName + ui && ui.keySet.setValue(0x10, []); + !ui.visible && ui.show(); + ui.activate(); + + var VideoBroadcastManager = VideoBroadcastTest.extend({ + + init: function() { +// this.superBeforeTest = VideoBroadcastTest.prototype.super.beforeTest; + this.vidBroadObj = oipfObjectFactory.createVideoBroadcastObject(); + + this.superBeforeTest = this.super.beforeTest; + this.superOnChangeState = this.super.onChangeState; + }, + + onChangeState: function(resolve, reject, event) { + this.superOnChangeState.call(this, + resolve, reject, event.state, event.error); + }, + + beforeTest: function(resolve, reject) { + this.onPlayStateChange = this.onChangeState.bind(this, resolve, reject); + this.vidBroadObj.addEventListener("PlayStateChange", this.onPlayStateChange, false); + this.transitions = []; + this.previousState = this.vidBroadObj.playState; + this.currentIndex = 0; + this.channel = null; + this.timerManager = new TimerManager(); + this.timeout = this.timerManager.createTimer.bind(this.timerManager); + logTest("State: Pending"); + this.cancel = true; + }, + + unrealizedToConnecting: function(begin, end, callback) { + if (callback) { + throw ("Untestable Case."); + } + }, + + connectingToPresenting: function(begin, end, callback) { + /** + * Avoid that the future transition C->P be canceled. + * More extend super method beforeTest in order to reset + * 'startEndStates' property. + */ + if (this.cancel) { + callback && this.timeout().then(callback).then(console.log.bind(console, "TOTO")); + this.cancel = false; + } else { + this.pushTransition(begin, end, callback, null); + } + }, + + unrealizedToUnrealized: function(begin, end, callback) { + this.reject("Untestable Case."); + }, + + stopToStop: function(begin, end, callback) { + this.reject("Untestable Case."); + }, + + noStatesDefined: function(begin, end, callback) { + this.reject("Untestable Case."); + }, + + startEndStates: { + + "00": "unrealizedToUnrealized", + "01": "unrealizedToConnecting", + "12": "connectingToPresenting", + "33": "stopToStop", + "nullnull": "noStatesDefined" + }, + + pushTransition: function(begin, end, callback, error) { + this.transitions.push({ + begin: begin, + end: end, + error: error, + callback: callback + }); + }, + + pushTransitionWithError: function(begin, end, callback, error) { + var method = this.startEndStates[""+begin+end]; + if (method) { + this[method].call(this, begin, end, callback); + } else { + this.pushTransition(begin, end, callback, error); + } + }, + + addTransition: function(begin, end, callback) { + this.addTransitionWithError(begin, end, callback, null); + }, + + addTransitionWithError: function(begin, end, callback, error) { + this.pushTransitionWithError(begin, end, callback, error); + } + }); + + var VideoBroadcastTest = VideoBroadcastManager.extend({ + + init: function() { + this.super.init(); + } + + }); + + var SearchManagerTest = SearchManagerTest.extend({ + init: function() { + this.searchManagerObj = oipfObjectFactory.createSearchManagerObject(); + this.super.init(); + }, + + beforeTest: function(resolve, reject) { + this.super.beforeTest(resolve, reject); + this.cancel = true; + }, + + noStatesDefined: function(begin, end, callback) { + this.reject("Untestable Case."); + }, + + unrealizedToConnecting: function(begin, end, callback) { + if (callback) { + throw ("Untestable Case."); + } + }, + + connectingToPresenting: function(begin, end, callback) { + /** + * Avoid that the future transition C->P be canceled. + * More extend super method beforeTest in order to reset + * 'startEndStates' property. + */ + if (this.cancel) { + callback && this.timeout().then(callback).then(console.log.bind(console, "TOTO")); + this.cancel = false; + } else { + this.pushTransition(begin, end, callback, null); + } + }, + + startEndStates: { + + "00": "unrealizedToUnrealized", + "01": "unrealizedToConnecting", + "12": "connectingToPresenting", + "33": "stopToStop", + "nullnull": "noStatesDefined" + }, + + pushTransition: function(begin, end, callback, error) { + this.transitions.push({ + begin: begin, + end: end, + error: error, + callback: callback + }); + }, + + pushTransitionWithError: function(begin, end, callback, error) { + var method = this.startEndStates[""+begin+end]; + if (method) { + this[method].call(this, begin, end, callback); + } else { + this.pushTransition(begin, end, callback, error); + } + }, + + addTransition: function(begin, end, callback) { + this.addTransitionWithError(begin, end, callback, null); + }, + + addTransitionWithError: function(begin, end, callback, error) { + this.pushTransitionWithError(begin, end, callback, error); + } + }); + + var RecordingSchedulerTest = RecordingSchedulerTest.extend({ + + init: function() { + this.super.init(); + this.blocked = function() {}; + this.bindToCurrentChannel = this.blocked; + this.onChangeState = this.blocked; + this.createVideoBroadcast = function() { + if (!this.vidBroadObj) { + this.vidBroadObj = oipfObjectFactory.createVideoBroadcastObject(); + } + } + }, + + onPVREvent: function(resolve, reject, event) { + console.log("beforeTest"); + this.super.onPVREvent(resolve, reject, event.state, event.recording); + }, + + beforeTest: function(resolve, reject) { + console.log("beforeTest"); + this.super.beforeTest(resolve, reject); + } + + }); + +} Modified: oipf/test/server.js =================================================================== --- oipf/test/server.js 2015-06-09 12:09:46 UTC (rev 1640) +++ oipf/test/server.js 2015-06-09 12:16:27 UTC (rev 1641) @@ -8,4 +8,4 @@ }); app.listen(3000); -console.log("Server running at http://192.168.99.190:3000/"); +console.log("Server running at http://localhost:3000/"); Modified: oipf/test/view/test.html =================================================================== --- oipf/test/view/test.html 2015-06-09 12:09:46 UTC (rev 1640) +++ oipf/test/view/test.html 2015-06-09 12:16:27 UTC (rev 1641) @@ -8,91 +8,24 @@ <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/test.css"/> - <script src="../js/utils/es6-promises.js" type="text/javascript"></script> - <script> - var Promise = Promise || ES6Promise.Promise; - </script> - <script src="../js/impl/model/constants/VideoBroadcastConstants.js" type="text/javascript"></script> - <script src="../js/impl/model/constants/ParentalControlManagerConstants.js" type="text/javascript"></script> - <script src="../js/impl/model/constants/RecordingSchedulerConstants.js" type="text/javascript"></script> - <script src="../js/impl/model/constants/ConfigurationConstants.js" type="text/javascript"></script> - <script src="../js/impl/model/constants/MetadataSearchConstants.js" type="text/javascript"></script> - <script src="../js/impl/model/constants/DaeMimeType.js" type="text/javascript"></script> - <script src="../js/impl/model/constants/IdType.js" type="text/javascript"></script> - - <script src="../js/lib/Class.js" type="text/javascript"></script> - <script src="../js/utils/Timeout.js" type="text/javascript"></script> - <script src="../js/utils/Calculation.js" type="text/javascript"></script> - <script src="../js/utils/ChannelUtils.js" type="text/javascript"></script> - <script src="../js/utils/Utils.js" type="text/javascript"></script> - <script src="../js/utils/EventManager.js" type="text/javascript"></script> - <script src="../js/utils/TimerManager.js" type="text/javascript"></script> - <script src="../js/utils/TimerRecordingManager.js" type="text/javascript"></script> - <script src="../js/utils/MetadataManager.js" type="text/javascript"></script> - <script src="../js/utils/DateUtils.js" type="text/javascript"></script> - <script src="../js/utils/XmlParser.js" type="text/javascript"></script> - <script src="../js/utils/ProgrammeService.js" type="text/javascript"></script> - <script src="../js/utils/XmlToJson.js" type="text/javascript"></script> - <script src="../js/utils/ProgrammeHelper.js" type="text/javascript"></script> - - <script src="../configuration/ConfigDefaultProperties.js" type="text/javascript"></script> - <script src="../configuration/CapabilitiesProperties.js" type="text/javascript"></script> - <script src="../configuration/OipfConfiguration.js" type="text/javascript"></script> - - <script src="../js/impl/model/Collection.js" type="text/javascript"></script> - <script src="../js/impl/model/SignalInfo.js" type="text/javascript"></script> - <script src="../js/impl/model/LNBInfo.js" type="text/javascript"></script> - <script src="../js/impl/model/NetworkInterface.js" type="text/javascript"></script> - <script src="../js/impl/model/FavouriteList.js" type="text/javascript"></script> - <script src="../js/impl/model/Programme.js" type="text/javascript"></script> - <script src="../js/impl/model/AVOutput.js" type="text/javascript"></script> - <script src="../js/impl/model/Tuner.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/TunerCollection.js" type="text/javascript"></script> - <script src="../js/impl/model/NetworkInterfaceCollection.js" type="text/javascript"></script> - <script src="../js/impl/model/FavouriteListCollection.js" type="text/javascript"></script> - <script src="../js/impl/model/ScheduledRecordingCollection.js" type="text/javascript"></script> - <script src="../js/impl/model/Query.js" type="text/javascript"></script> - <script src="../js/impl/model/Configuration.js" type="text/javascript"></script> - <script src="../js/impl/model/LocalSystem.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/model/ScheduledRecording.js" type="text/javascript"></script> - <script src="../js/impl/model/Recording.js" type="text/javascript"></script> - <script src="../js/impl/model/Application.js" type="text/javascript"></script> - <script src="../js/impl/model/ApplicationCollection.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/impl/RecordingSchedulerObject.js" type="text/javascript"></script> - <script src="../js/impl/CapabilitiesObject.js" type="text/javascript"></script> - <script src="../js/impl/ParentalControlManagerObject.js" type="text/javascript"></script> - <script src="../js/impl/ApplicationManagerObject.js" type="text/javascript"></script> - - <script src="../js/utils/ChannelService.js" type="text/javascript"></script> - <script src="../js/impl/model/ModelFactory.js" type="text/javascript"></script> - <script src="../init/init.js" type="text/javascript"></script> - - <script src="../js/test/TestCase.js" type="text/javascript"></script> - <script src="../js/test/ApplicationManagerTest.js" type="text/javascript"></script> - <script src="../js/test/CapabilitiesTest.js" type="text/javascript"></script> - <script src="../js/test/ParentalControlManagerTest.js" type="text/javascript"></script> - <script src="../js/test/RecordingSchedulerTest.js" type="text/javascript"></script> - <script src="../js/test/ConfigurationTest.js" type="text/javascript"></script> - <script src="../js/test/SearchManagerTest.js" type="text/javascript"></script> - <script src="../js/test/VideoBroadcastTest.js" type="text/javascript"></script> - <script src="../js/test/OipfFactoryTest.js" type="text/javascript"></script> - <script src="../configuration/TestConfig.js" type="text/javascript"></script> - <script src="../js/test/Test.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> var tests = new Test(); var displayConfig = {

1 0

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

09 Jun '15

Author: smaisonneuve Date: 2015-06-09 12:09:46 +0000 (Tue, 09 Jun 2015) New Revision: 1640 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1640 Log: [Build] - Adding data and configuration directory into the build Modified: oipf/lib/gulpfile.js Modified: oipf/lib/gulpfile.js =================================================================== --- oipf/lib/gulpfile.js 2015-06-09 12:06:14 UTC (rev 1639) +++ oipf/lib/gulpfile.js 2015-06-09 12:09:46 UTC (rev 1640) @@ -9,6 +9,7 @@ var util = require("gulp-util"); var conf = { + src: ["js/**/*.js", "data/*.js", "configuration/*.js"], buildFile: "oipf-lib.js", buildDir: "build" }; @@ -24,7 +25,7 @@ }); gulp.task("javascript", function() { - return gulp.src("js/**/*.js") + return gulp.src(conf.src) .pipe(sourcemaps.init()) .pipe(babel({ blacklist: [

1 0

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

09 Jun '15

Author: jruchaud Date: 2015-06-09 12:06:14 +0000 (Tue, 09 Jun 2015) New Revision: 1639 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1639 Log: Useless file Removed: oipf/lib/js/utils/es6-promises.js Deleted: oipf/lib/js/utils/es6-promises.js =================================================================== --- oipf/lib/js/utils/es6-promises.js 2015-06-09 12:05:51 UTC (rev 1638) +++ oipf/lib/js/utils/es6-promises.js 2015-06-09 12:06:14 UTC (rev 1639) @@ -1,18 +0,0 @@ -/*! - * @overview es6-promise - a tiny implementation of Promises/A+. - * @copyright Copyright (c) 2014 Yehuda Katz, Tom Dale, Stefan Penner and contributors (Conversion to ES6 API by Jake Archibald) - * @license Licensed under MIT license - * See https://raw.githubusercontent.com/jakearchibald/es6-promise/master/LICENSE - * @version 2.0.0 - */ - -(function(){function r(a,b){n[l]=a;n[l+1]=b;l+=2;2===l&&A()}function s(a){return"function"===typeof a}function F(){return function(){process.nextTick(t)}}function G(){var a=0,b=new B(t),c=document.createTextNode("");b.observe(c,{characterData:!0});return function(){c.data=a=++a%2}}function H(){var a=new MessageChannel;a.port1.onmessage=t;return function(){a.port2.postMessage(0)}}function I(){return function(){setTimeout(t,1)}}function t(){for(var a=0;a<l;a+=2)(0,n[a])(n[a+1]),n[a]=void 0,n[a+1]=void 0; -l=0}function p(){}function J(a,b,c,d){try{a.call(b,c,d)}catch(e){return e}}function K(a,b,c){r(function(a){var e=!1,f=J(c,b,function(c){e||(e=!0,b!==c?q(a,c):m(a,c))},function(b){e||(e=!0,g(a,b))});!e&&f&&(e=!0,g(a,f))},a)}function L(a,b){1===b.a?m(a,b.b):2===a.a?g(a,b.b):u(b,void 0,function(b){q(a,b)},function(b){g(a,b)})}function q(a,b){if(a===b)g(a,new TypeError("You cannot resolve a promise with itself"));else if("function"===typeof b||"object"===typeof b&&null!==b)if(b.constructor===a.constructor)L(a, -b);else{var c;try{c=b.then}catch(d){v.error=d,c=v}c===v?g(a,v.error):void 0===c?m(a,b):s(c)?K(a,b,c):m(a,b)}else m(a,b)}function M(a){a.f&&a.f(a.b);x(a)}function m(a,b){void 0===a.a&&(a.b=b,a.a=1,0!==a.e.length&&r(x,a))}function g(a,b){void 0===a.a&&(a.a=2,a.b=b,r(M,a))}function u(a,b,c,d){var e=a.e,f=e.length;a.f=null;e[f]=b;e[f+1]=c;e[f+2]=d;0===f&&a.a&&r(x,a)}function x(a){var b=a.e,c=a.a;if(0!==b.length){for(var d,e,f=a.b,g=0;g<b.length;g+=3)d=b[g],e=b[g+c],d?C(c,d,e,f):e(f);a.e.length=0}}function D(){this.error= -null}function C(a,b,c,d){var e=s(c),f,k,h,l;if(e){try{f=c(d)}catch(n){y.error=n,f=y}f===y?(l=!0,k=f.error,f=null):h=!0;if(b===f){g(b,new TypeError("A promises callback cannot return that same promise."));return}}else f=d,h=!0;void 0===b.a&&(e&&h?q(b,f):l?g(b,k):1===a?m(b,f):2===a&&g(b,f))}function N(a,b){try{b(function(b){q(a,b)},function(b){g(a,b)})}catch(c){g(a,c)}}function k(a,b,c,d){this.n=a;this.c=new a(p,d);this.i=c;this.o(b)?(this.m=b,this.d=this.length=b.length,this.l(),0===this.length?m(this.c, -this.b):(this.length=this.length||0,this.k(),0===this.d&&m(this.c,this.b))):g(this.c,this.p())}function h(a){O++;this.b=this.a=void 0;this.e=[];if(p!==a){if(!s(a))throw new TypeError("You must pass a resolver function as the first argument to the promise constructor");if(!(this instanceof h))throw new TypeError("Failed to construct 'Promise': Please use the 'new' operator, this object constructor cannot be called as a function.");N(this,a)}}var E=Array.isArray?Array.isArray:function(a){return"[object Array]"=== -Object.prototype.toString.call(a)},l=0,w="undefined"!==typeof window?window:{},B=w.MutationObserver||w.WebKitMutationObserver,w="undefined"!==typeof Uint8ClampedArray&&"undefined"!==typeof importScripts&&"undefined"!==typeof MessageChannel,n=Array(1E3),A;A="undefined"!==typeof process&&"[object process]"==={}.toString.call(process)?F():B?G():w?H():I();var v=new D,y=new D;k.prototype.o=function(a){return E(a)};k.prototype.p=function(){return Error("Array Methods must be provided an Array")};k.prototype.l= -function(){this.b=Array(this.length)};k.prototype.k=function(){for(var a=this.length,b=this.c,c=this.m,d=0;void 0===b.a&&d<a;d++)this.j(c[d],d)};k.prototype.j=function(a,b){var c=this.n;"object"===typeof a&&null!==a?a.constructor===c&&void 0!==a.a?(a.f=null,this.g(a.a,b,a.b)):this.q(c.resolve(a),b):(this.d--,this.b[b]=this.h(a))};k.prototype.g=function(a,b,c){var d=this.c;void 0===d.a&&(this.d--,this.i&&2===a?g(d,c):this.b[b]=this.h(c));0===this.d&&m(d,this.b)};k.prototype.h=function(a){return a}; -k.prototype.q=function(a,b){var c=this;u(a,void 0,function(a){c.g(1,b,a)},function(a){c.g(2,b,a)})};var O=0;h.all=function(a,b){return(new k(this,a,!0,b)).c};h.race=function(a,b){function c(a){q(e,a)}function d(a){g(e,a)}var e=new this(p,b);if(!E(a))return (g(e,new TypeError("You must pass an array to race.")), e);for(var f=a.length,h=0;void 0===e.a&&h<f;h++)u(this.resolve(a[h]),void 0,c,d);return e};h.resolve=function(a,b){if(a&&"object"===typeof a&&a.constructor===this)return a;var c=new this(p,b); -q(c,a);return c};h.reject=function(a,b){var c=new this(p,b);g(c,a);return c};h.prototype={constructor:h,then:function(a,b){var c=this.a;if(1===c&&!a||2===c&&!b)return this;var d=new this.constructor(p),e=this.b;if(c){var f=arguments[c-1];r(function(){C(c,d,f,e)})}else u(this,d,a,b);return d},"catch":function(a){return this.then(null,a)}};var z={Promise:h,polyfill:function(){var a;a="undefined"!==typeof global?global:"undefined"!==typeof window&&window.document?window:self;"Promise"in a&&"resolve"in -a.Promise&&"reject"in a.Promise&&"all"in a.Promise&&"race"in a.Promise&&function(){var b;new a.Promise(function(a){b=a});return s(b)}()||(a.Promise=h)}};"function"===typeof define&&define.amd?define(function(){return z}):"undefined"!==typeof module&&module.exports?module.exports=z:"undefined"!==typeof this&&(this.ES6Promise=z)}).call(this); \ No newline at end of file

1 0