branch support-webpack updated (ff56fef -> b8d5023)
This is an automated email from the git hooks/post-receive script. New change to branch support-webpack in repository oipf-stub. See https://gitlab.nuiton.org/codelutin/oipf-stub.git from ff56fef [JsonTvProvider] - Adding a default endpoint for json format new b8d5023 Change require system The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit b8d50235e8d6bd1aff09feb56a7ee4ff881a0c09 Author: Julien Ruchaud <ruchaud@codelutin.com> Date: Fri Mar 3 17:41:31 2017 +0100 Change require system Summary of changes: src/OipfObjectFactory.js | 17 +++++++---------- src/OipfStubContext.js | 6 ++---- src/application/Application.js | 8 ++------ src/application/ApplicationCollection.js | 6 +----- src/application/ApplicationManagerObject.js | 8 ++------ src/application/ApplicationPrivateData.js | 5 +---- src/application/KeyHandlingStrategy.js | 7 +------ src/application/Keyset.js | 6 +----- src/application/WidgetDescriptorCollection.js | 6 +----- src/broadcast/ATSCTChannelScanParameters.js | 5 +---- src/broadcast/ChannelConfig.js | 8 ++------ src/broadcast/ChannelList.js | 5 +---- src/broadcast/ChannelScanOptions.js | 5 +---- src/broadcast/DVBCChannelScanParameters.js | 5 +---- src/broadcast/DVBSChannelScanParameters.js | 5 +---- src/broadcast/DVBTChannelScanParameters.js | 5 +---- src/broadcast/FavouriteList.js | 5 +---- src/broadcast/FavouriteListCollection.js | 7 ++----- src/broadcast/VideoBroadcastObject.js | 6 +----- src/configuration/ConfigurationObject.js | 9 ++------- src/configuration/LocalSystem.js | 11 ++++------- src/configuration/Tuner.js | 5 +---- src/configuration/TunerCollection.js | 4 +--- src/extensions/opera/OipfObjectFactory.js | 9 +++------ src/extensions/opera/Register.js | 5 ----- src/extensions/opera/application/Application.js | 6 +----- .../opera/application/ApplicationManagerObject.js | 9 ++------- src/extensions/opera/application/KeyHandlingStrategy.js | 9 ++------- src/extensions/opera/broadcast/VideoBroadcastObject.js | 6 +----- src/extensions/opera/configuration/AVInputCollection.js | 4 +--- src/extensions/opera/configuration/Configuration.js | 5 +---- src/extensions/opera/configuration/LocalSystem.js | 9 +++------ src/extensions/opera/reminder/ReminderCollection.js | 6 +----- src/extensions/opera/reminder/ReminderManagerObject.js | 7 ++----- src/extensions/opera/shared/DiscInfo.js | 5 +---- src/extensions/opera/shared/NetworkInterface.js | 9 ++++----- .../opera/shared/WifiNetworkInterfaceCollection.js | 4 +--- .../ParentalControlManagerObject.js | 8 +++----- src/parentalControlManager/ParentalRatingCollection.js | 8 ++------ .../ParentalRatingSchemeCollection.js | 8 ++------ src/provider/OipfDataProvider.js | 2 -- src/recording/Recording.js | 5 +---- src/recording/RecordingCollection.js | 4 +--- src/recording/RecordingSchedulerObject.js | 14 ++++++-------- src/recording/ScheduledRecording.js | 5 +---- src/recording/ScheduledRecordingCollection.js | 4 +--- src/searchManager/MetadataSearch.js | 7 ++----- src/searchManager/SearchManagerObject.js | 5 +---- src/searchManager/SearchResults.js | 5 +---- src/shared/AVAudioComponent.js | 4 +--- src/shared/AVComponentCollection.js | 5 +---- src/shared/AVOutputCollection.js | 4 +--- src/shared/AVSubtitleComponent.js | 5 +---- src/shared/AVVideoComponent.js | 5 +---- src/shared/IntegerCollection.js | 5 +---- src/shared/NetworkInterfaceCollection.js | 4 +--- src/shared/ProgrammeCollection.js | 6 +----- 57 files changed, 90 insertions(+), 270 deletions(-) -- To stop receiving notification emails like this one, please contact SCM administrator <admin+scm@forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch support-webpack in repository oipf-stub. See https://gitlab.nuiton.org/codelutin/oipf-stub.git commit b8d50235e8d6bd1aff09feb56a7ee4ff881a0c09 Author: Julien Ruchaud <ruchaud@codelutin.com> Date: Fri Mar 3 17:41:31 2017 +0100 Change require system --- src/OipfObjectFactory.js | 17 +++++++---------- src/OipfStubContext.js | 6 ++---- src/application/Application.js | 8 ++------ src/application/ApplicationCollection.js | 6 +----- src/application/ApplicationManagerObject.js | 8 ++------ src/application/ApplicationPrivateData.js | 5 +---- src/application/KeyHandlingStrategy.js | 7 +------ src/application/Keyset.js | 6 +----- src/application/WidgetDescriptorCollection.js | 6 +----- src/broadcast/ATSCTChannelScanParameters.js | 5 +---- src/broadcast/ChannelConfig.js | 8 ++------ src/broadcast/ChannelList.js | 5 +---- src/broadcast/ChannelScanOptions.js | 5 +---- src/broadcast/DVBCChannelScanParameters.js | 5 +---- src/broadcast/DVBSChannelScanParameters.js | 5 +---- src/broadcast/DVBTChannelScanParameters.js | 5 +---- src/broadcast/FavouriteList.js | 5 +---- src/broadcast/FavouriteListCollection.js | 7 ++----- src/broadcast/VideoBroadcastObject.js | 6 +----- src/configuration/ConfigurationObject.js | 9 ++------- src/configuration/LocalSystem.js | 11 ++++------- src/configuration/Tuner.js | 5 +---- src/configuration/TunerCollection.js | 4 +--- src/extensions/opera/OipfObjectFactory.js | 9 +++------ src/extensions/opera/Register.js | 5 ----- src/extensions/opera/application/Application.js | 6 +----- .../opera/application/ApplicationManagerObject.js | 9 ++------- src/extensions/opera/application/KeyHandlingStrategy.js | 9 ++------- src/extensions/opera/broadcast/VideoBroadcastObject.js | 6 +----- src/extensions/opera/configuration/AVInputCollection.js | 4 +--- src/extensions/opera/configuration/Configuration.js | 5 +---- src/extensions/opera/configuration/LocalSystem.js | 9 +++------ src/extensions/opera/reminder/ReminderCollection.js | 6 +----- src/extensions/opera/reminder/ReminderManagerObject.js | 7 ++----- src/extensions/opera/shared/DiscInfo.js | 5 +---- src/extensions/opera/shared/NetworkInterface.js | 9 ++++----- .../opera/shared/WifiNetworkInterfaceCollection.js | 4 +--- .../ParentalControlManagerObject.js | 8 +++----- src/parentalControlManager/ParentalRatingCollection.js | 8 ++------ .../ParentalRatingSchemeCollection.js | 8 ++------ src/provider/OipfDataProvider.js | 2 -- src/recording/Recording.js | 5 +---- src/recording/RecordingCollection.js | 4 +--- src/recording/RecordingSchedulerObject.js | 14 ++++++-------- src/recording/ScheduledRecording.js | 5 +---- src/recording/ScheduledRecordingCollection.js | 4 +--- src/searchManager/MetadataSearch.js | 7 ++----- src/searchManager/SearchManagerObject.js | 5 +---- src/searchManager/SearchResults.js | 5 +---- src/shared/AVAudioComponent.js | 4 +--- src/shared/AVComponentCollection.js | 5 +---- src/shared/AVOutputCollection.js | 4 +--- src/shared/AVSubtitleComponent.js | 5 +---- src/shared/AVVideoComponent.js | 5 +---- src/shared/IntegerCollection.js | 5 +---- src/shared/NetworkInterfaceCollection.js | 4 +--- src/shared/ProgrammeCollection.js | 6 +----- 57 files changed, 90 insertions(+), 270 deletions(-) diff --git a/src/OipfObjectFactory.js b/src/OipfObjectFactory.js index b2adff5..07628de 100644 --- a/src/OipfObjectFactory.js +++ b/src/OipfObjectFactory.js @@ -15,19 +15,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -let requireJS = require; let videobcastCount = 0; module.exports = function(ctx) { - let require = ctx.require.bind(ctx, requireJS); - - let ConfigurationObject = require("./configuration/ConfigurationObject"); - let ParentalControlManagerObject = require("./parentalControlManager/ParentalControlManagerObject"); - let SearchManagerObject = require("./searchManager/SearchManagerObject"); - let VideoBroadcastObject = require("./broadcast/VideoBroadcastObject"); - let ChannelConfig = require("./broadcast/ChannelConfig"); - let ApplicationManagerObject = require("./application/ApplicationManagerObject"); - let RecordingSchedulerObject = require("./recording/RecordingSchedulerObject"); + let ConfigurationObject = ctx.requireJS("./configuration/ConfigurationObject", require("./configuration/ConfigurationObject")); + let ParentalControlManagerObject = ctx.requireJS("./parentalControlManager/ParentalControlManagerObject", require("./parentalControlManager/ParentalControlManagerObject")); + let SearchManagerObject = ctx.requireJS("./searchManager/SearchManagerObject", require("./searchManager/SearchManagerObject")); + let VideoBroadcastObject = ctx.requireJS("./broadcast/VideoBroadcastObject", require("./broadcast/VideoBroadcastObject")); + let ChannelConfig = ctx.requireJS("./broadcast/ChannelConfig", require("./broadcast/ChannelConfig")); + let ApplicationManagerObject = ctx.requireJS("./application/ApplicationManagerObject", require("./application/ApplicationManagerObject")); + let RecordingSchedulerObject = ctx.requireJS("./recording/RecordingSchedulerObject", require("./recording/RecordingSchedulerObject")); return class OipfObjectFactory { diff --git a/src/OipfStubContext.js b/src/OipfStubContext.js index 8f2f62f..7642482 100644 --- a/src/OipfStubContext.js +++ b/src/OipfStubContext.js @@ -199,14 +199,12 @@ module.exports = class OipfStubContext { this.__internal__.init = init.bind(init, undefined); // force no name this.__internal__.requireMap = new Map(); - - this.__internal__.requireBound = this.require.bind(this, require); } - require(requireJs, className, noCacheForExtends) { + requireJS(className, classFromRequire, noCacheForExtends) { let result = this.__internal__.requireMap.get(className); if (!result || noCacheForExtends) { - result = requireJs(className)(this, this.__internal__.requireBound); + result = classFromRequire(this, this.__internal__.requireBound); this.__internal__.requireMap.set(className, result); } return result; diff --git a/src/application/Application.js b/src/application/Application.js index b8e5dd3..d4a034a 100644 --- a/src/application/Application.js +++ b/src/application/Application.js @@ -28,14 +28,10 @@ * - Events ApplicationTopmost, ApplicationNotTopmost, ApplicationDestroyRequest and ApplicationHibernateRequest * - Handle z-index */ -let requireJS = require; module.exports = function(ctx) { - - let require = ctx.require.bind(ctx, requireJS); - - let ApplicationPrivateData = require("./ApplicationPrivateData"); - let KeyHandlingStrategy = require("./KeyHandlingStrategy"); + let ApplicationPrivateData = ctx.requireJS("./ApplicationPrivateData", require("./ApplicationPrivateData")); + let KeyHandlingStrategy = ctx.requireJS("./KeyHandlingStrategy", require("./KeyHandlingStrategy")); return class Application { diff --git a/src/application/ApplicationCollection.js b/src/application/ApplicationCollection.js index 5dd96ec..537fc63 100644 --- a/src/application/ApplicationCollection.js +++ b/src/application/ApplicationCollection.js @@ -16,15 +16,11 @@ * limitations under the License. */ -let requireJS = require; - /* * The ApplicationCollection class represents a collection of Application objects. */ module.exports = function(ctx) { - let require = ctx.require.bind(ctx, requireJS); - - let Collection = require("../shared/Collection.js"); + let Collection = ctx.requireJS("../shared/Collection", require("../shared/Collection")); return class ApplicationCollection extends Collection { diff --git a/src/application/ApplicationManagerObject.js b/src/application/ApplicationManagerObject.js index 3e4323c..5eb4799 100644 --- a/src/application/ApplicationManagerObject.js +++ b/src/application/ApplicationManagerObject.js @@ -27,14 +27,10 @@ * - Manage memory * - Application visualization mode */ -let requireJS = require; module.exports = function(ctx) { - - let require = ctx.require.bind(ctx, requireJS); - - let Application = require("./Application"); - let ApplicationCollection = require("./ApplicationCollection"); + let Application = ctx.requireJS("./Application", require("./Application")); + let ApplicationCollection = ctx.requireJS("./ApplicationCollection", require("./ApplicationCollection")); return class ApplicationManagerObject { diff --git a/src/application/ApplicationPrivateData.js b/src/application/ApplicationPrivateData.js index 503de72..d973473 100644 --- a/src/application/ApplicationPrivateData.js +++ b/src/application/ApplicationPrivateData.js @@ -21,12 +21,9 @@ * - Wake-up * - Current channel */ -let requireJS = require; module.exports = function(ctx) { - let require = ctx.require.bind(ctx, requireJS); - - let Keyset = require("./Keyset"); + let Keyset = ctx.requireJS("./Keyset", require("./Keyset")); return class ApplicationPrivateData { constructor() { diff --git a/src/application/KeyHandlingStrategy.js b/src/application/KeyHandlingStrategy.js index 7054661..560b835 100644 --- a/src/application/KeyHandlingStrategy.js +++ b/src/application/KeyHandlingStrategy.js @@ -16,13 +16,8 @@ * limitations under the License. */ -let requireJS = require; - module.exports = function(ctx) { - - let require = ctx.require.bind(ctx, requireJS); - - let EventFactory = require("./EventFactory"); + let EventFactory = ctx.requireJS("./EventFactory", require("./EventFactory")); return class KeyHandlingStrategy { diff --git a/src/application/Keyset.js b/src/application/Keyset.js index 408e2e6..9229ff0 100644 --- a/src/application/Keyset.js +++ b/src/application/Keyset.js @@ -17,8 +17,6 @@ * limitations under the License. */ -let requireJS = require; - /* * The Keyset object permits applications to define which key events they request * to receive. There are two means of defining this. Common key events are @@ -37,9 +35,7 @@ let requireJS = require; * by the OITF excluding those indicated by OTHER. */ module.exports = function(ctx) { - let require = ctx.require.bind(ctx, requireJS); - - let VKCodes = require("./VKCodes.js"); + let VKCodes = ctx.requireJS("./VKCodes", require("./VKCodes")); return class Keyset { diff --git a/src/application/WidgetDescriptorCollection.js b/src/application/WidgetDescriptorCollection.js index 5c3952c..f4bddcf 100644 --- a/src/application/WidgetDescriptorCollection.js +++ b/src/application/WidgetDescriptorCollection.js @@ -16,15 +16,11 @@ * limitations under the License. */ -let requireJS = require; - /* * The WidgetDescriptorCollection class represents a collection of WidgetDescriptor objects. */ module.exports = function(ctx) { - let require = ctx.require.bind(ctx, requireJS); - - let Collection = require("./Collection.js"); + let Collection = ctx.requireJS("./Collection", require("./Collection")); return class WidgetDescriptorCollection extends Collection { diff --git a/src/broadcast/ATSCTChannelScanParameters.js b/src/broadcast/ATSCTChannelScanParameters.js index c20475a..67766b6 100644 --- a/src/broadcast/ATSCTChannelScanParameters.js +++ b/src/broadcast/ATSCTChannelScanParameters.js @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -let requireJS = require; /** * 7.13.22 The ATSCTChannelScanParameters class @@ -25,9 +24,7 @@ let requireJS = require; * The properties that are undefined when performing startScan() are considered to be auto detected. */ module.exports = function(ctx) { - let require = ctx.require.bind(ctx, requireJS); - - let Channel = require("./ChannelScanParameters"); + let Channel = ctx.requireJS("./ChannelScanParameters", require("./ChannelScanParameters")); return class ATSCTChannelScanParameters { diff --git a/src/broadcast/ChannelConfig.js b/src/broadcast/ChannelConfig.js index 6f37bc2..d7cd2c8 100644 --- a/src/broadcast/ChannelConfig.js +++ b/src/broadcast/ChannelConfig.js @@ -37,13 +37,9 @@ * defined in section 9.3.6. | | */ -let requireJS = require; - module.exports = function(ctx) { - let require = ctx.require.bind(ctx, requireJS); - - let ChannelList = require("./ChannelList"); - let Channel = require("./Channel"); + let ChannelList = ctx.requireJS("./ChannelList", require("./ChannelList")); + let Channel = ctx.requireJS("./Channel", require("./Channel")); return class ChannelConfig { diff --git a/src/broadcast/ChannelList.js b/src/broadcast/ChannelList.js index 54a821e..5fbe4e7 100644 --- a/src/broadcast/ChannelList.js +++ b/src/broadcast/ChannelList.js @@ -21,12 +21,9 @@ * In addition to the methods and properties defined for generic collections, the ChannelList class supports the additional * properties and methods defined below. */ -let requireJS = require; module.exports = function(ctx) { - let require = ctx.require.bind(ctx, requireJS); - - let Collection = require("../shared/Collection"); + let Collection = ctx.requireJS("../shared/Collection", require("../shared/Collection")); return class ChannelList extends Collection { diff --git a/src/broadcast/ChannelScanOptions.js b/src/broadcast/ChannelScanOptions.js index 821c12a..3460ece 100644 --- a/src/broadcast/ChannelScanOptions.js +++ b/src/broadcast/ChannelScanOptions.js @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -let requireJS = require; /** * 7.13.16 The ChannelScanOptions class @@ -24,9 +23,7 @@ let requireJS = require; * class does not define parameters for the channel scan itself. */ module.exports = function(ctx) { - let require = ctx.require.bind(ctx, requireJS); - - let Channel = require("./Channel"); + let Channel = ctx.requireJS("./Channel", require("./Channel")); return class ChannelScanOptions { diff --git a/src/broadcast/DVBCChannelScanParameters.js b/src/broadcast/DVBCChannelScanParameters.js index f9105f6..8a97d3a 100644 --- a/src/broadcast/DVBCChannelScanParameters.js +++ b/src/broadcast/DVBCChannelScanParameters.js @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -let requireJS = require; /** * 7.13.20 The DVBCChannelScanParameters class @@ -27,9 +26,7 @@ let requireJS = require; *The properties that are undefined when performing startScan() are considered to be auto detected. */ module.exports = function(ctx) { - let require = ctx.require.bind(ctx, requireJS); - - let Channel = require("./ChannelScanParameters"); + let Channel = ctx.requireJS("./ChannelScanParameters", require("./ChannelScanParameters")); return class DVBCChannelScanParameters { diff --git a/src/broadcast/DVBSChannelScanParameters.js b/src/broadcast/DVBSChannelScanParameters.js index 116a275..56700f0 100644 --- a/src/broadcast/DVBSChannelScanParameters.js +++ b/src/broadcast/DVBSChannelScanParameters.js @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -let requireJS = require; /** * 7.13.19 The DVBSChannelScanParameters class @@ -27,9 +26,7 @@ let requireJS = require; * The properties that are undefined when performing startScan() are considered to be auto detected. */ module.exports = function(ctx) { - let require = ctx.require.bind(ctx, requireJS); - - let Channel = require("./ChannelScanParameters"); + let Channel = ctx.requireJS("./ChannelScanParameters", require("./ChannelScanParameters")); return class DVBSChannelScanParameters { diff --git a/src/broadcast/DVBTChannelScanParameters.js b/src/broadcast/DVBTChannelScanParameters.js index 22a0c07..3299ff9 100644 --- a/src/broadcast/DVBTChannelScanParameters.js +++ b/src/broadcast/DVBTChannelScanParameters.js @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -let requireJS = require; /** * 7.13.18 The DVBTChannelScanParameters class @@ -26,9 +25,7 @@ let requireJS = require; * The properties that are undefined when performing startScan() are considered to be auto detected. */ module.exports = function(ctx) { - let require = ctx.require.bind(ctx, requireJS); - - let Channel = require("./ChannelScanParameters"); + let Channel = ctx.requireJS("./ChannelScanParameters", require("./ChannelScanParameters")); return class DVBTChannelScanParameters { diff --git a/src/broadcast/FavouriteList.js b/src/broadcast/FavouriteList.js index 200c927..0c8b745 100644 --- a/src/broadcast/FavouriteList.js +++ b/src/broadcast/FavouriteList.js @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -let requireJS = require; /** * 7.13.13 The FavouriteList class @@ -30,9 +29,7 @@ let requireJS = require; * SHALL return the FavouriteList.id for FavouriteList objects. */ module.exports = function(ctx) { - let require = ctx.require.bind(ctx, requireJS); - - let Collection = require("../shared/Collection"); + let Collection = ctx.requireJS("../shared/Collection", require("../shared/Collection")); return class FavouriteList extends Collection { diff --git a/src/broadcast/FavouriteListCollection.js b/src/broadcast/FavouriteListCollection.js index 6ab2bbc..6911c34 100644 --- a/src/broadcast/FavouriteListCollection.js +++ b/src/broadcast/FavouriteListCollection.js @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -let requireJS = require; /** * 7.13.12 The FavouriteListCollection class @@ -27,10 +26,8 @@ let requireJS = require; * FavouriteListCollection class supports the additional methods defined below. */ module.exports = function(ctx) { - let require = ctx.require.bind(ctx, requireJS); - - let Collection = require("../shared/Collection"); - let FavouriteList = require("./FavouriteList"); + let Collection = ctx.requireJS("../shared/Collection", require("../shared/Collection")); + let FavouriteList = ctx.requireJS("./FavouriteList", require("./FavouriteList")); return class FavouriteListCollection extends Collection { diff --git a/src/broadcast/VideoBroadcastObject.js b/src/broadcast/VideoBroadcastObject.js index 6f2298a..8dcef09 100644 --- a/src/broadcast/VideoBroadcastObject.js +++ b/src/broadcast/VideoBroadcastObject.js @@ -44,13 +44,9 @@ * allocationMethod property SHALL be set to DYNAMIC_ALLOCATION . */ let Utils = require("../OipfStubUtils"); -let requireJS = require; module.exports = function(ctx) { - - let require = ctx.require.bind(ctx, requireJS); - - let Channel = require("./Channel"); + let Channel = ctx.requireJS("./Channel", require("./Channel")); class VideoBroadcastObject extends HTMLObjectElement { diff --git a/src/configuration/ConfigurationObject.js b/src/configuration/ConfigurationObject.js index 95a0381..91fef00 100644 --- a/src/configuration/ConfigurationObject.js +++ b/src/configuration/ConfigurationObject.js @@ -20,14 +20,9 @@ * 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. */ -let requireJS = require; - module.exports = function(ctx) { - - let require = ctx.require.bind(ctx, requireJS); - - let Configuration = require("./Configuration"); - let LocalSystem = require("./LocalSystem"); + let Configuration = ctx.requireJS("./Configuration", require("./Configuration")); + let LocalSystem = ctx.requireJS("./LocalSystem", require("./LocalSystem")); return class ConfigurationObject { diff --git a/src/configuration/LocalSystem.js b/src/configuration/LocalSystem.js index 015b79d..72dc642 100644 --- a/src/configuration/LocalSystem.js +++ b/src/configuration/LocalSystem.js @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -let requireJS = require; /* * Description: @@ -24,12 +23,10 @@ let requireJS = require; * Note: The standbyState property has been removed from this class. */ module.exports = function(ctx) { - - let require = ctx.require.bind(ctx, requireJS); - let AVOutput = require("../shared/AVOutput"); - let AVOutputCollection = require("../shared/AVOutputCollection"); - let NetworkInterface = require("../shared/NetworkInterface"); - let NetworkInterfaceCollection = require("../shared/NetworkInterfaceCollection"); + let AVOutput = ctx.requireJS("../shared/AVOutput", require("../shared/AVOutput")); + let AVOutputCollection = ctx.requireJS("../shared/AVOutputCollection", require("../shared/AVOutputCollection")); + let NetworkInterface = ctx.requireJS("../shared/NetworkInterface", require("../shared/NetworkInterface")); + let NetworkInterfaceCollection = ctx.requireJS("../shared/NetworkInterfaceCollection", require("../shared/NetworkInterfaceCollection")); return class LocalSystem { diff --git a/src/configuration/Tuner.js b/src/configuration/Tuner.js index c17a3a4..d75b924 100644 --- a/src/configuration/Tuner.js +++ b/src/configuration/Tuner.js @@ -35,12 +35,9 @@ * into multiple Tuner objects to fit the restrictions on the <video_broadcast> * element outlined above and in section 9.3.1. */ -let requireJS = require; module.exports = function(ctx) { - let require = ctx.require.bind(ctx, requireJS); - - let IntegerCollection = require("./shared/IntegerCollection"); + let IntegerCollection = ctx.requireJS("./shared/IntegerCollection", require("./shared/IntegerCollection")); return class Tuner { diff --git a/src/configuration/TunerCollection.js b/src/configuration/TunerCollection.js index b16774a..880c974 100644 --- a/src/configuration/TunerCollection.js +++ b/src/configuration/TunerCollection.js @@ -15,14 +15,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -let requireJS = require; /* * The StringCollection class represents a collection of String objects. */ module.exports = function(ctx) { - let require = ctx.require.bind(ctx, requireJS); - let Collection = require("../shared/Collection.js"); + let Collection = ctx.requireJS("../shared/Collection", require("../shared/Collection")); return class TunerCollection extends Collection { diff --git a/src/extensions/opera/OipfObjectFactory.js b/src/extensions/opera/OipfObjectFactory.js index 4caf511..0c38fef 100644 --- a/src/extensions/opera/OipfObjectFactory.js +++ b/src/extensions/opera/OipfObjectFactory.js @@ -15,16 +15,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -let requireJS = require; let videoinputCount = 0; module.exports = function(ctx) { - let require = ctx.require.bind(ctx, requireJS); - let _OipfObjectFactory = require("../../OipfObjectFactory", true); - - let ReminderManagerObject = require("./reminder/ReminderManagerObject"); - let VideoInputObject = require("./broadcast/VideoInputObject"); + let _OipfObjectFactory = ctx.requireJS("../../OipfObjectFactory", require("../../OipfObjectFactory"), true); + let ReminderManagerObject = ctx.requireJS("./reminder/ReminderManagerObject", require("./reminder/ReminderManagerObject")); + let VideoInputObject = ctx.requireJS("./broadcast/VideoInputObject", require("./broadcast/VideoInputObject")); return class OipfObjectFactory extends _OipfObjectFactory { diff --git a/src/extensions/opera/Register.js b/src/extensions/opera/Register.js index 4c1cf4e..dc7ab63 100644 --- a/src/extensions/opera/Register.js +++ b/src/extensions/opera/Register.js @@ -15,13 +15,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - -let requireJS = require; - module.exports = function(ctx) { - let require = ctx.require.bind(ctx, requireJS); - return class Register { /** diff --git a/src/extensions/opera/application/Application.js b/src/extensions/opera/application/Application.js index 3621e89..d9fb615 100644 --- a/src/extensions/opera/application/Application.js +++ b/src/extensions/opera/application/Application.js @@ -16,12 +16,8 @@ * limitations under the License. */ -let requireJS = require; - module.exports = function(ctx) { - - let require = ctx.require.bind(ctx, requireJS); - let _Application = require("../../../application/Application", true); + let _Application = ctx.requireJS("../../../application/Application", require("../../../application/Application", true)); return class Application extends _Application { diff --git a/src/extensions/opera/application/ApplicationManagerObject.js b/src/extensions/opera/application/ApplicationManagerObject.js index 95da219..61c62e8 100644 --- a/src/extensions/opera/application/ApplicationManagerObject.js +++ b/src/extensions/opera/application/ApplicationManagerObject.js @@ -16,14 +16,9 @@ * limitations under the License. */ -let requireJS = require; - module.exports = function(ctx) { - - let require = ctx.require.bind(ctx, requireJS); - - let ApplicationCollection = require("../../../application/ApplicationCollection"); - let _ApplicationManagerObject = require("../../../application/ApplicationManagerObject", true); + let ApplicationCollection = ctx.requireJS("../../../application/ApplicationCollection", require("../../../application/ApplicationCollection")); + let _ApplicationManagerObject = ctx.requireJS("../../../application/ApplicationManagerObject", require("../../../application/ApplicationManagerObject"), true); return class ApplicationManagerObject extends _ApplicationManagerObject { diff --git a/src/extensions/opera/application/KeyHandlingStrategy.js b/src/extensions/opera/application/KeyHandlingStrategy.js index c458986..71fc9e5 100644 --- a/src/extensions/opera/application/KeyHandlingStrategy.js +++ b/src/extensions/opera/application/KeyHandlingStrategy.js @@ -18,14 +18,9 @@ * limitations under the License. */ -let requireJS = require; - module.exports = function(ctx) { - - let require = ctx.require.bind(ctx, requireJS); - - let _KeyHandlingStrategy = require("../../../application/KeyHandlingStrategy", true); - let EventFactory = require("../../../application/EventFactory"); + let _KeyHandlingStrategy = ctx.requireJS("../../../application/KeyHandlingStrategy", require("../../../application/KeyHandlingStrategy"), true); + let EventFactory = ctx.requireJS("../../../application/EventFactory", require("../../../application/EventFactory")); return class KeyHandlingStrategy extends _KeyHandlingStrategy { diff --git a/src/extensions/opera/broadcast/VideoBroadcastObject.js b/src/extensions/opera/broadcast/VideoBroadcastObject.js index 659ddbb..1a5efbd 100644 --- a/src/extensions/opera/broadcast/VideoBroadcastObject.js +++ b/src/extensions/opera/broadcast/VideoBroadcastObject.js @@ -15,13 +15,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -let requireJS = require; module.exports = function(ctx) { - - let require = ctx.require.bind(ctx, requireJS); - - let _VideoBroadcastObject = require("../../../broadcast/VideoBroadcastObject"); + let _VideoBroadcastObject = ctx.requireJS("../../../broadcast/VideoBroadcastObject", require("../../../broadcast/VideoBroadcastObject")); class VideoBroadcastObject extends _VideoBroadcastObject { diff --git a/src/extensions/opera/configuration/AVInputCollection.js b/src/extensions/opera/configuration/AVInputCollection.js index df583d7..088a892 100644 --- a/src/extensions/opera/configuration/AVInputCollection.js +++ b/src/extensions/opera/configuration/AVInputCollection.js @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -let requireJS = require; /** @@ -27,8 +26,7 @@ let requireJS = require; * the collection template. */ module.exports = function(ctx) { - let require = ctx.require.bind(ctx, requireJS); - let Collection = require("../../../shared/Collection.js"); + let Collection = ctx.requireJS("../../../shared/Collection", require("../../../shared/Collection")); return class AVInputCollection extends Collection { diff --git a/src/extensions/opera/configuration/Configuration.js b/src/extensions/opera/configuration/Configuration.js index 8fd2b5f..43181cc 100644 --- a/src/extensions/opera/configuration/Configuration.js +++ b/src/extensions/opera/configuration/Configuration.js @@ -15,12 +15,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -let requireJS = require; module.exports = function(ctx) { - - let require = ctx.require.bind(ctx, requireJS); - let _Configuration = require("../../../configuration/Configuration", true); + let _Configuration = ctx.requireJS("../../../configuration/Configuration", require("../../../configuration/Configuration"), true); return class Configuration extends _Configuration { diff --git a/src/extensions/opera/configuration/LocalSystem.js b/src/extensions/opera/configuration/LocalSystem.js index e1542f2..90c8dee 100644 --- a/src/extensions/opera/configuration/LocalSystem.js +++ b/src/extensions/opera/configuration/LocalSystem.js @@ -15,14 +15,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -let requireJS = require; module.exports = function(ctx) { - - let require = ctx.require.bind(ctx, requireJS); - let _LocalSystem = require("../../../configuration/LocalSystem"); - let AVInputCollection = require("./AVInputCollection"); - let AVInput = require("./AVInput"); + let _LocalSystem = ctx.requireJS("../../../configuration/LocalSystem", require("../../../configuration/LocalSystem")); + let AVInputCollection = ctx.requireJS("./AVInputCollection", require("./AVInputCollection")); + let AVInput = ctx.requireJS("./AVInput", require("./AVInput")); return class LocalSystem extends _LocalSystem { diff --git a/src/extensions/opera/reminder/ReminderCollection.js b/src/extensions/opera/reminder/ReminderCollection.js index 01af886..fe571f7 100644 --- a/src/extensions/opera/reminder/ReminderCollection.js +++ b/src/extensions/opera/reminder/ReminderCollection.js @@ -16,15 +16,11 @@ * limitations under the License. */ -let requireJS = require; - /* * The ProgrammeCollection class represents a collection of Programme objects. */ module.exports = function(ctx) { - let require = ctx.require.bind(ctx, requireJS); - - let Collection = require("../../../shared/Collection"); + let Collection = ctx.requireJS("../../../shared/Collection", require("../../../shared/Collection")); return class ReminderCollection extends Collection { diff --git a/src/extensions/opera/reminder/ReminderManagerObject.js b/src/extensions/opera/reminder/ReminderManagerObject.js index f981e30..93c156c 100644 --- a/src/extensions/opera/reminder/ReminderManagerObject.js +++ b/src/extensions/opera/reminder/ReminderManagerObject.js @@ -16,13 +16,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -let requireJS = require; module.exports = function(ctx) { - - let require = ctx.require.bind(ctx, requireJS); - let ReminderCollection = require("./ReminderCollection"); - let Reminder = require("./Reminder"); + let ReminderCollection = ctx.requireJS("./ReminderCollection", require("./ReminderCollection")); + let Reminder = ctx.requireJS("./Reminder", require("./Reminder")); return class ReminderManagerObject { diff --git a/src/extensions/opera/shared/DiscInfo.js b/src/extensions/opera/shared/DiscInfo.js index 116b4de..4a86688 100644 --- a/src/extensions/opera/shared/DiscInfo.js +++ b/src/extensions/opera/shared/DiscInfo.js @@ -16,7 +16,6 @@ * limitations under the License. */ -let requireJS = require; /** * The DiscInfo class provides details of the storage usage and capacity in the OITF. @@ -28,9 +27,7 @@ let requireJS = require; * they were obtained. */ module.exports = function(ctx) { - - let require = ctx.require.bind(ctx, requireJS); - let _DiscInfo = require("../../../shared/DiscInfo", true); + let _DiscInfo = ctx.requireJS("../../../shared/DiscInfo", require("../../../shared/DiscInfo")); return class DiscInfo extends _DiscInfo { diff --git a/src/extensions/opera/shared/NetworkInterface.js b/src/extensions/opera/shared/NetworkInterface.js index 8bdfe13..e37cf10 100644 --- a/src/extensions/opera/shared/NetworkInterface.js +++ b/src/extensions/opera/shared/NetworkInterface.js @@ -15,16 +15,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -let requireJS = require; /** * The NetworkInterface class represents a physical or logical network interface in the receiver. */ module.exports = function(ctx) { - let require = ctx.require.bind(ctx, requireJS); - let _NetworkInterface = require("../../../shared/NetworkInterface.js"); - let WifiNetworkInterface = require("./WifiNetworkInterface.js"); - let WifiNetworkInterfaceCollection = require("./WifiNetworkInterfaceCollection.js"); + let _NetworkInterface = ctx.requireJS("../../../shared/NetworkInterface.js", require("../../../shared/NetworkInterface.js")); + let WifiNetworkInterface = ctx.requireJS("./WifiNetworkInterface", require("./WifiNetworkInterface")); + let WifiNetworkInterfaceCollection = ctx.requireJS("./WifiNetworkInterfaceCollection", require("./WifiNetworkInterfaceCollection")); + return class NetworkInterface extends _NetworkInterface { diff --git a/src/extensions/opera/shared/WifiNetworkInterfaceCollection.js b/src/extensions/opera/shared/WifiNetworkInterfaceCollection.js index afe2cfd..e255832 100644 --- a/src/extensions/opera/shared/WifiNetworkInterfaceCollection.js +++ b/src/extensions/opera/shared/WifiNetworkInterfaceCollection.js @@ -15,15 +15,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -let requireJS = require; /** * The WifiNetworkCollection class represents a collection of WifiNetwork objects. See OIPF 2.3 Annex K for the * definition of the collection template. */ module.exports = function(ctx) { - let require = ctx.require.bind(ctx, requireJS); - let Collection = require("../../../shared/Collection.js"); + let Collection = ctx.requireJS("../../../shared/Collection.js", require("../../../shared/Collection.js")); return class WifiNetworkInterfaceCollection extends Collection { diff --git a/src/parentalControlManager/ParentalControlManagerObject.js b/src/parentalControlManager/ParentalControlManagerObject.js index 9a38092..a8eaaa9 100644 --- a/src/parentalControlManager/ParentalControlManagerObject.js +++ b/src/parentalControlManager/ParentalControlManagerObject.js @@ -22,13 +22,11 @@ *section 9.3.5) in its capability profile, the OITF SHALL support the *application/oipfParentalControlManager object with the following interface. */ -let requireJS = require; + // FIXME to implement module.exports = function(ctx) { - let require = ctx.require.bind(ctx, requireJS); - - let ParentalRating = require("./ParentalRating"); - let ParentalRatingCollection = require("./ParentalRatingCollection"); + let ParentalRating = ctx.requireJS("./ParentalRating", require("./ParentalRating")); + let ParentalRatingCollection = ctx.requireJS("./ParentalRatingCollection", require("./ParentalRatingCollection")); return class ParentalControlManagerObject { diff --git a/src/parentalControlManager/ParentalRatingCollection.js b/src/parentalControlManager/ParentalRatingCollection.js index 86dbe07..e96b548 100644 --- a/src/parentalControlManager/ParentalRatingCollection.js +++ b/src/parentalControlManager/ParentalRatingCollection.js @@ -16,8 +16,6 @@ * limitations under the License. */ -let requireJS = require; - /** * 7.9.5 The ParentalRatingCollection class * @@ -28,10 +26,8 @@ let requireJS = require; * supports the additional properties and methods defined below. */ module.exports = function(ctx) { - let require = ctx.require.bind(ctx, requireJS); - - let Collection = require("../shared/Collection.js"); - let ParentalRating = require("./ParentalRating"); + let Collection = ctx.requireJS("../shared/Collection.js", require("../shared/Collection.js")); + let ParentalRating = ctx.requireJS("../ParentalRating.js", require("../ParentalRating.js")); return class ParentalRatingCollection extends Collection { diff --git a/src/parentalControlManager/ParentalRatingSchemeCollection.js b/src/parentalControlManager/ParentalRatingSchemeCollection.js index 824972d..96e4f3d 100644 --- a/src/parentalControlManager/ParentalRatingSchemeCollection.js +++ b/src/parentalControlManager/ParentalRatingSchemeCollection.js @@ -16,8 +16,6 @@ * limitations under the License. */ -let requireJS = require; - /** * 7.9.3 The ParentalRatingSchemeCollection class * @@ -33,10 +31,8 @@ let requireJS = require; * below. */ module.exports = function(ctx) { - let require = ctx.require.bind(ctx, requireJS); - - let Collection = require("../shared/Collection"); - let ParentalRatingScheme = require("./ParentalRatingScheme"); + let Collection = ctx.requireJS("../shared/Collection.js", require("../shared/Collection.js")); + let ParentalRatingScheme = ctx.requireJS("../ParentalRatingScheme.js", require("../ParentalRatingScheme.js")); return class ParentalRatingSchemeCollection extends Collection { diff --git a/src/provider/OipfDataProvider.js b/src/provider/OipfDataProvider.js index 1ffbed3..4022188 100644 --- a/src/provider/OipfDataProvider.js +++ b/src/provider/OipfDataProvider.js @@ -24,11 +24,9 @@ * Data are modified directly in initial DataProvider Array * This class is used internaly in OipfStubContext */ -let requireJS = require; let Utils = require("../OipfStubUtils"); module.exports = function(ctx) { - let require = ctx.require.bind(ctx, requireJS); return class OipfDataProvider { diff --git a/src/recording/Recording.js b/src/recording/Recording.js index e08a5e5..e1c8cea 100644 --- a/src/recording/Recording.js +++ b/src/recording/Recording.js @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -let requireJS = require; /** * The Recording class represents an in-progress or completed recording being made available through the extended @@ -23,9 +22,7 @@ let requireJS = require; * represented by the ScheduledRecording class. */ module.exports = function(ctx) { - - let require = ctx.require.bind(ctx, requireJS); - let ScheduledRecording = require("./ScheduledRecording.js"); + let ScheduledRecording = ctx.requireJS("./ScheduledRecording", require("./ScheduledRecording")); return class Recording extends ScheduledRecording { diff --git a/src/recording/RecordingCollection.js b/src/recording/RecordingCollection.js index 895c6d9..55a2231 100644 --- a/src/recording/RecordingCollection.js +++ b/src/recording/RecordingCollection.js @@ -15,14 +15,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -let requireJS = require; /** * The RecordingCollection class represents a collection of Recording objects. */ module.exports = function(ctx) { - let require = ctx.require.bind(ctx, requireJS); - let Collection = require("../shared/Collection.js"); + let Collection = ctx.requireJS("../shared/Collection.js", require("../shared/Collection.js")); return class RecordingCollection extends Collection { diff --git a/src/recording/RecordingSchedulerObject.js b/src/recording/RecordingSchedulerObject.js index a8fab91..51c23fa 100644 --- a/src/recording/RecordingSchedulerObject.js +++ b/src/recording/RecordingSchedulerObject.js @@ -26,16 +26,14 @@ * stored in the channel list and locally defined channels SHALL be supported. */ let Utils = require("../OipfStubUtils"); -let requireJS = require; module.exports = function(ctx) { - let require = ctx.require.bind(ctx, requireJS); - let DiscInfo = require("../shared/DiscInfo"); - let Programme = require("../shared/Programme"); - let Recording = require("./Recording"); - let RecordingCollection = require("./RecordingCollection"); - let ScheduledRecording = require("./ScheduledRecording"); - let ScheduledRecordingCollection = require("./ScheduledRecordingCollection"); + let DiscInfo = ctx.requireJS("../shared/DiscInfo", require("../shared/DiscInfo")); + let Programme = ctx.requireJS("../shared/Programme", require("../shared/Programme")); + let Recording = ctx.requireJS("./Recording", require("./Recording")); + let RecordingCollection = ctx.requireJS("./RecordingCollection", require("./RecordingCollection")); + let ScheduledRecording = ctx.requireJS("./ScheduledRecording", require("./ScheduledRecording")); + let ScheduledRecordingCollection = ctx.requireJS("./ScheduledRecordingCollection", require("./ScheduledRecordingCollection")); return class RecordingSchedulerObject { diff --git a/src/recording/ScheduledRecording.js b/src/recording/ScheduledRecording.js index ac45c4e..792562c 100644 --- a/src/recording/ScheduledRecording.js +++ b/src/recording/ScheduledRecording.js @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -let requireJS = require; /** * The ScheduledRecording object represents a scheduled programme in the system, i.e. a recording that is scheduled @@ -27,9 +26,7 @@ let requireJS = require; * can not be changed for this scheduled recording object (except for startPadding and endPadding ). */ module.exports = function(ctx) { - - let require = ctx.require.bind(ctx, requireJS); - let Channel = require("../broadcast/Channel"); + let Channel = ctx.requireJS("../broadcast/Channel", require("../broadcast/Channel")); return class ScheduledRecording { diff --git a/src/recording/ScheduledRecordingCollection.js b/src/recording/ScheduledRecordingCollection.js index f1a5392..6a70e64 100644 --- a/src/recording/ScheduledRecordingCollection.js +++ b/src/recording/ScheduledRecordingCollection.js @@ -15,14 +15,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -let requireJS = require; /** * The ScheduledRecordingCollection class represents a collection of ScheduledRecording objects. */ module.exports = function(ctx) { - let require = ctx.require.bind(ctx, requireJS); - let Collection = require("../shared/Collection.js"); + let Collection = ctx.requireJS("../shared/Collection", require("../shared/Collection")); return class ScheduledRecordingCollection extends Collection { diff --git a/src/searchManager/MetadataSearch.js b/src/searchManager/MetadataSearch.js index 715bb0b..ddf444f 100644 --- a/src/searchManager/MetadataSearch.js +++ b/src/searchManager/MetadataSearch.js @@ -169,13 +169,10 @@ * results determined by the getResults() parameters, or take an alternative * approach not described here. */ -let requireJS = require; module.exports = function(ctx) { - let require = ctx.require.bind(ctx, requireJS); - - let Query = require("./Query"); - let SearchResults = require("./SearchResults"); + let Query = ctx.requireJS("./Query", require("./Query")); + let SearchResults = ctx.requireJS("./SearchResults", require("./SearchResults")); return class MetadataSearch { diff --git a/src/searchManager/SearchManagerObject.js b/src/searchManager/SearchManagerObject.js index ade6ac5..b4a6da3 100644 --- a/src/searchManager/SearchManagerObject.js +++ b/src/searchManager/SearchManagerObject.js @@ -22,12 +22,9 @@ * OITFs SHALL implement the "application/oipfSearchManager" embedded object. This object provides a * mechanism for applications to create and manage metadata searches. */ -let requireJS = require; module.exports = function(ctx) { - let require = ctx.require.bind(ctx, requireJS); - - let MetadataSearch = require("./MetadataSearch"); + let MetadataSearch = ctx.requireJS("./MetadataSearch", require("./MetadataSearch")); return class SearchManagerObject { diff --git a/src/searchManager/SearchResults.js b/src/searchManager/SearchResults.js index 6ec6559..9cf2ae8 100644 --- a/src/searchManager/SearchResults.js +++ b/src/searchManager/SearchResults.js @@ -39,13 +39,10 @@ * object SHALL support the array notation to access the results in this * collection. */ -let requireJS = require; let Utils = require("../OipfStubUtils"); module.exports = function(ctx) { - let require = ctx.require.bind(ctx, requireJS); - - let Collection = require("../shared/Collection"); + let Collection = ctx.requireJS("../shared/Collection", require("../shared/Collection")); return class SearchResults extends Collection { diff --git a/src/shared/AVAudioComponent.js b/src/shared/AVAudioComponent.js index 5f8c6d4..2ef2d11 100644 --- a/src/shared/AVAudioComponent.js +++ b/src/shared/AVAudioComponent.js @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -let requireJS = require; /** * 7.16.5.4 The AVAudioComponent class @@ -23,8 +22,7 @@ let requireJS = require; * The AVAudioComponent class implements the AVComponent interface. */ module.exports = function(ctx) { - let require = ctx.require.bind(ctx, requireJS); - let AVComponent = require("./AVComponent"); + let AVComponent = ctx.requireJS("./AVComponent", require("./AVComponent")); return class AVAudioComponent extends AVComponent { diff --git a/src/shared/AVComponentCollection.js b/src/shared/AVComponentCollection.js index 0352f50..8d04f3c 100644 --- a/src/shared/AVComponentCollection.js +++ b/src/shared/AVComponentCollection.js @@ -15,8 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -let requireJS = require; - /** * 7.16.5.6 The AVComponentCollection class @@ -27,8 +25,7 @@ let requireJS = require; * the collection template. */ module.exports = function(ctx) { - let require = ctx.require.bind(ctx, requireJS); - let Collection = require("./Collection.js"); + let Collection = ctx.requireJS("./Collection", require("./Collection")); return class AVComponentCollection extends Collection { diff --git a/src/shared/AVOutputCollection.js b/src/shared/AVOutputCollection.js index 5eb6ef0..9e0daa0 100644 --- a/src/shared/AVOutputCollection.js +++ b/src/shared/AVOutputCollection.js @@ -15,15 +15,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -let requireJS = require; /** * The AVOutputCollection class represents a collection of AVOutput objects. See Annex K for the definition of the * collection template. */ module.exports = function(ctx) { - let require = ctx.require.bind(ctx, requireJS); - let Collection = require("./Collection.js"); + let Collection = ctx.requireJS("./Collection", require("./Collection")); return class AVOutputCollection extends Collection { diff --git a/src/shared/AVSubtitleComponent.js b/src/shared/AVSubtitleComponent.js index 6355c19..1eaef9e 100644 --- a/src/shared/AVSubtitleComponent.js +++ b/src/shared/AVSubtitleComponent.js @@ -15,8 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -let requireJS = require; - /** * 7.16.5.5 The AVSubtitleComponent class @@ -24,8 +22,7 @@ let requireJS = require; * The AVSubtitleComponent class implements the AVComponent interface. */ module.exports = function(ctx) { - let require = ctx.require.bind(ctx, requireJS); - let AVComponent = require("./AVComponent"); + let AVComponent = ctx.requireJS("./AVComponent", require("./AVComponent")); return class AVSubtitleComponent extends AVComponent { diff --git a/src/shared/AVVideoComponent.js b/src/shared/AVVideoComponent.js index 5378992..39786cd 100644 --- a/src/shared/AVVideoComponent.js +++ b/src/shared/AVVideoComponent.js @@ -15,8 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -let requireJS = require; - /** * 7.16.5.3 The AVVideoComponent class @@ -24,8 +22,7 @@ let requireJS = require; * The AVVideoComponent class implements the AVComponent interface. */ module.exports = function(ctx) { - let require = ctx.require.bind(ctx, requireJS); - let AVComponent = require("./AVComponent"); + let AVComponent = ctx.requireJS("./AVComponent", require("./AVComponent")); return class AVVideoComponent extends AVComponent { diff --git a/src/shared/IntegerCollection.js b/src/shared/IntegerCollection.js index bf5b047..5fe2012 100644 --- a/src/shared/IntegerCollection.js +++ b/src/shared/IntegerCollection.js @@ -15,15 +15,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -let requireJS = require; - /** * The IntegerCollection class represents a collection of Integer objects. */ module.exports = function(ctx) { - let require = ctx.require.bind(ctx, requireJS); - let Collection = require("./Collection.js"); + let Collection = ctx.requireJS("./Collection", require("./Collection")); return class IntegerCollection extends Collection { diff --git a/src/shared/NetworkInterfaceCollection.js b/src/shared/NetworkInterfaceCollection.js index d776ba2..873221c 100644 --- a/src/shared/NetworkInterfaceCollection.js +++ b/src/shared/NetworkInterfaceCollection.js @@ -15,14 +15,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -let requireJS = require; /** * A collection of NetworkInterface objects representing the available network interfaces. */ module.exports = function(ctx) { - let require = ctx.require.bind(ctx, requireJS); - let Collection = require("./Collection.js"); + let Collection = ctx.requireJS("./Collection", require("./Collection")); return class NetworkInterfaceCollection extends Collection { diff --git a/src/shared/ProgrammeCollection.js b/src/shared/ProgrammeCollection.js index 2370124..dad5c0f 100644 --- a/src/shared/ProgrammeCollection.js +++ b/src/shared/ProgrammeCollection.js @@ -16,15 +16,11 @@ * limitations under the License. */ -let requireJS = require; - /* * The ProgrammeCollection class represents a collection of Programme objects. */ module.exports = function(ctx) { - let require = ctx.require.bind(ctx, requireJS); - - let Collection = require("./Collection.js"); + let Collection = ctx.requireJS("./Collection", require("./Collection")); return class ProgrammeCollection extends Collection { -- To stop receiving notification emails like this one, please contact SCM administrator <admin+scm@forge.codelutin.com>.
participants (1)
-
scm