From 7575f6233fd2fa0b4912420708b1a5f9ed53a53e Mon Sep 17 00:00:00 2001 From: Esben Sorig Date: Sun, 22 Apr 2018 12:44:07 +0100 Subject: [PATCH] Change the modules to adhere to the Universal Module Definition (UMD) API --- lalolab/src/modules/lalolib-moduleFooter.js | 2 +- lalolab/src/modules/lalolib-moduleHeader.js | 18 ++++++++++++++---- .../src/modules/lalolib-noglpk-moduleFooter.js | 2 +- lalolab/src/modules/mljs-moduleFooter.js | 2 +- lalolab/src/modules/mljs-moduleHeader.js | 18 ++++++++++++++---- .../src/modules/mljs-noglpk-moduleFooter.js | 2 +- 6 files changed, 32 insertions(+), 12 deletions(-) diff --git a/lalolab/src/modules/lalolib-moduleFooter.js b/lalolab/src/modules/lalolib-moduleFooter.js index 425fc93..cc15eab 100644 --- a/lalolab/src/modules/lalolib-moduleFooter.js +++ b/lalolab/src/modules/lalolib-moduleFooter.js @@ -336,4 +336,4 @@ return { bfgs: bfgs } -})(); +})); diff --git a/lalolab/src/modules/lalolib-moduleHeader.js b/lalolab/src/modules/lalolib-moduleHeader.js index 8d0466e..d3aced9 100644 --- a/lalolab/src/modules/lalolib-moduleHeader.js +++ b/lalolab/src/modules/lalolib-moduleHeader.js @@ -1,4 +1,14 @@ -var lalolib = (function () { - - - +(function (root, factory) { + if (typeof define === 'function' && define.amd) { + // AMD. Register as an anonymous module. + define([], factory); + } else if (typeof module === 'object' && module.exports) { + // Node. Does not work with strict CommonJS, but + // only CommonJS-like environments that support module.exports, + // like Node. + module.exports = factory(); + } else { + // Browser globals (root is window) + root.returnExports = factory(); + } +}(typeof self !== 'undefined' ? self : this, function () { diff --git a/lalolab/src/modules/lalolib-noglpk-moduleFooter.js b/lalolab/src/modules/lalolib-noglpk-moduleFooter.js index a013103..575d9d0 100644 --- a/lalolab/src/modules/lalolib-noglpk-moduleFooter.js +++ b/lalolab/src/modules/lalolib-noglpk-moduleFooter.js @@ -318,4 +318,4 @@ return { bfgs: bfgs } -})(); +})); diff --git a/lalolab/src/modules/mljs-moduleFooter.js b/lalolab/src/modules/mljs-moduleFooter.js index 598eb43..5846d54 100644 --- a/lalolab/src/modules/mljs-moduleFooter.js +++ b/lalolab/src/modules/mljs-moduleFooter.js @@ -398,4 +398,4 @@ return { bfgs: bfgs } -})(); +})); diff --git a/lalolab/src/modules/mljs-moduleHeader.js b/lalolab/src/modules/mljs-moduleHeader.js index bf6142d..d3aced9 100644 --- a/lalolab/src/modules/mljs-moduleHeader.js +++ b/lalolab/src/modules/mljs-moduleHeader.js @@ -1,4 +1,14 @@ -var mljs = (function () { - - - +(function (root, factory) { + if (typeof define === 'function' && define.amd) { + // AMD. Register as an anonymous module. + define([], factory); + } else if (typeof module === 'object' && module.exports) { + // Node. Does not work with strict CommonJS, but + // only CommonJS-like environments that support module.exports, + // like Node. + module.exports = factory(); + } else { + // Browser globals (root is window) + root.returnExports = factory(); + } +}(typeof self !== 'undefined' ? self : this, function () { diff --git a/lalolab/src/modules/mljs-noglpk-moduleFooter.js b/lalolab/src/modules/mljs-noglpk-moduleFooter.js index 50b2268..0216d30 100644 --- a/lalolab/src/modules/mljs-noglpk-moduleFooter.js +++ b/lalolab/src/modules/mljs-noglpk-moduleFooter.js @@ -380,4 +380,4 @@ return { bfgs: bfgs } -})(); +}));