branch support-webpack updated (b8d5023 -> d0e2bd2)
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 b8d5023 Change require system new d0e2bd2 Fix require 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 d0e2bd24d9abc5cf70ad9bafaedc9f697b5856a5 Author: Julien Ruchaud <ruchaud@codelutin.com> Date: Fri Mar 3 18:15:20 2017 +0100 Fix require Summary of changes: src/OipfStubContext.js | 18 ++++++------------ src/parentalControlManager/ParentalRatingCollection.js | 2 +- src/provider/OipfDataProvider.js | 4 ++-- src/shared/Programme.js | 5 +---- src/shared/StringCollection.js | 5 +---- 5 files changed, 11 insertions(+), 23 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 d0e2bd24d9abc5cf70ad9bafaedc9f697b5856a5 Author: Julien Ruchaud <ruchaud@codelutin.com> Date: Fri Mar 3 18:15:20 2017 +0100 Fix require --- src/OipfStubContext.js | 18 ++++++------------ src/parentalControlManager/ParentalRatingCollection.js | 2 +- src/provider/OipfDataProvider.js | 4 ++-- src/shared/Programme.js | 5 +---- src/shared/StringCollection.js | 5 +---- 5 files changed, 11 insertions(+), 23 deletions(-) diff --git a/src/OipfStubContext.js b/src/OipfStubContext.js index 7642482..6cec584 100644 --- a/src/OipfStubContext.js +++ b/src/OipfStubContext.js @@ -204,7 +204,7 @@ module.exports = class OipfStubContext { requireJS(className, classFromRequire, noCacheForExtends) { let result = this.__internal__.requireMap.get(className); if (!result || noCacheForExtends) { - result = classFromRequire(this, this.__internal__.requireBound); + result = classFromRequire(this); this.__internal__.requireMap.set(className, result); } return result; @@ -224,8 +224,6 @@ module.exports = class OipfStubContext { * Call file extension/<extensionName>/Register.js to configure extension behaviour into current context. */ registerExtensions(extensionName) { - let require = this.__internal__.requireBound; - // the register need to be compiled as this, can't use dynamic code here, // otherwise, Register file won't be included at compilation time if (extensionName === "opera") { @@ -235,24 +233,21 @@ module.exports = class OipfStubContext { } createOipfObjectFactory() { - let require = this.__internal__.requireBound; - let OipfObjectFactory = require("./OipfObjectFactory"); + let OipfObjectFactory = this.requireJS("./OipfObjectFactory", require("./OipfObjectFactory")); return new OipfObjectFactory(); } get dataProvider() { if (!this.__internal__.OipfDataProvider) { // not use this.require, because DataProvider is directly exported as class - let DataProvider = require("./provider/DataProvider"); - this.dataProvider = new DataProvider(); + let OipfDataProvider = require("./provider/OipfDataProvider")(this); + this.__internal__.OipfDataProvider = new OipfDataProvider(); } return this.__internal__.OipfDataProvider; } set dataProvider(provider) { - let require = this.__internal__.requireBound; - this.__internal__.OipfDataProvider = this.__internal__.OipfDataProvider - || new (require("./provider/OipfDataProvider"))(); + this.__internal__.OipfDataProvider = this.__internal__.OipfDataProvider || new (require("./provider/OipfDataProvider"))(this); this.__internal__.eventEmitter.emit("DataProviderChange", provider); } @@ -265,8 +260,7 @@ module.exports = class OipfStubContext { } get actions() { - let require = this.__internal__.requireBound; - let OipfStubActions = require("./OipfStubActions"); + let OipfStubActions = require("./OipfStubActions")(); return new OipfStubActions(); } }; diff --git a/src/parentalControlManager/ParentalRatingCollection.js b/src/parentalControlManager/ParentalRatingCollection.js index e96b548..09173aa 100644 --- a/src/parentalControlManager/ParentalRatingCollection.js +++ b/src/parentalControlManager/ParentalRatingCollection.js @@ -27,7 +27,7 @@ */ module.exports = function(ctx) { let Collection = ctx.requireJS("../shared/Collection.js", require("../shared/Collection.js")); - let ParentalRating = ctx.requireJS("../ParentalRating.js", require("../ParentalRating.js")); + let ParentalRating = ctx.requireJS("./ParentalRating.js", require("./ParentalRating.js")); return class ParentalRatingCollection extends Collection { diff --git a/src/provider/OipfDataProvider.js b/src/provider/OipfDataProvider.js index 4022188..0a5f715 100644 --- a/src/provider/OipfDataProvider.js +++ b/src/provider/OipfDataProvider.js @@ -130,7 +130,7 @@ module.exports = function(ctx) { let providerChannel = this.getChannels()[channelIndex]; return this._provider.getProgrammes(channelIndex, providerChannel) .then(function(programmes) { - let Programmes = require("../shared/Programme"); + let Programmes = require("../shared/Programme")(ctx); let result = []; for (let p of programmes) { @@ -153,7 +153,7 @@ module.exports = function(ctx) { */ getChannelConfig() { if (!this.__internal__.channelConfig) { - let ChannelConfig = require("../broadcast/ChannelConfig"); + let ChannelConfig = require("../broadcast/ChannelConfig")(ctx); this.__internal__.channelConfig = new ChannelConfig(); } return this.__internal__.channelConfig; diff --git a/src/shared/Programme.js b/src/shared/Programme.js index 21645a8..c694595 100644 --- a/src/shared/Programme.js +++ b/src/shared/Programme.js @@ -17,7 +17,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -let requireJS = require; /* * Description: @@ -49,9 +48,7 @@ let requireJS = require; * description as defined in section 9.3.3. */ module.exports = function(ctx) { - let require = ctx.require.bind(ctx, requireJS); - - let StringCollection = require("./StringCollection"); + let StringCollection = ctx.requireJS("./StringCollection", require("./StringCollection")); return class Programme { diff --git a/src/shared/StringCollection.js b/src/shared/StringCollection.js index 34b2346..e516b15 100644 --- a/src/shared/StringCollection.js +++ b/src/shared/StringCollection.js @@ -15,15 +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("./Collection.js"); + let Collection = ctx.requireJS("./Collection", require("./Collection")); return class StringCollection extends Collection { -- To stop receiving notification emails like this one, please contact SCM administrator <admin+scm@forge.codelutin.com>.
participants (1)
-
scm