From 15b53272b446cebed387c12482442b0c847a77ed Mon Sep 17 00:00:00 2001 From: James Spencer Date: Tue, 11 Sep 2018 15:39:47 -0500 Subject: [PATCH 1/7] add root to factory function --- src/monet.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/monet.js b/src/monet.js index 23e51b0..f21921b 100644 --- a/src/monet.js +++ b/src/monet.js @@ -14,7 +14,7 @@ if (typeof define === 'function' && define.amd) { define(factory) } else if (typeof module === 'object' && module.exports) { - module.exports = factory() + module.exports = factory(root) } else { root.notUseMonetGlobalObject = !root.useMonetGlobalObject root.Monet = factory(root) From 1207e3b57276a19caf48847223a61dd59b5f6d7a Mon Sep 17 00:00:00 2001 From: James Spencer Date: Tue, 11 Sep 2018 16:57:07 -0500 Subject: [PATCH 2/7] pass in window object for catching Symbol --- src/monet.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/monet.js b/src/monet.js index f21921b..eccb9a7 100644 --- a/src/monet.js +++ b/src/monet.js @@ -14,7 +14,7 @@ if (typeof define === 'function' && define.amd) { define(factory) } else if (typeof module === 'object' && module.exports) { - module.exports = factory(root) + module.exports = factory(window) } else { root.notUseMonetGlobalObject = !root.useMonetGlobalObject root.Monet = factory(root) From 7793e3ecd287c7e80db899632ffee81ab5f40b9a Mon Sep 17 00:00:00 2001 From: James Spencer Date: Tue, 11 Sep 2018 16:59:25 -0500 Subject: [PATCH 3/7] use root fallback --- src/monet.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/monet.js b/src/monet.js index eccb9a7..5e75812 100644 --- a/src/monet.js +++ b/src/monet.js @@ -14,7 +14,7 @@ if (typeof define === 'function' && define.amd) { define(factory) } else if (typeof module === 'object' && module.exports) { - module.exports = factory(window) + module.exports = factory(!!window ? window : root) } else { root.notUseMonetGlobalObject = !root.useMonetGlobalObject root.Monet = factory(root) From 0036941497b69dc56b64c9ab219a28b84c627718 Mon Sep 17 00:00:00 2001 From: James Spencer Date: Wed, 12 Sep 2018 09:01:55 -0500 Subject: [PATCH 4/7] use try catch to gaurentee window availability --- src/monet.js | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/monet.js b/src/monet.js index 5e75812..67f980b 100644 --- a/src/monet.js +++ b/src/monet.js @@ -14,7 +14,16 @@ if (typeof define === 'function' && define.amd) { define(factory) } else if (typeof module === 'object' && module.exports) { - module.exports = factory(!!window ? window : root) + try{ + if (!window) { + throw new Error('window missing use root instead') + } + module.exports = factory(window) + } + catch(e) { + module.exports = factory(root) + } + //module.exports = factory(!!window ? window || root) } else { root.notUseMonetGlobalObject = !root.useMonetGlobalObject root.Monet = factory(root) From 2f51b15e74fc9e0b3c38f6c3e4485ddd90780460 Mon Sep 17 00:00:00 2001 From: James Spencer Date: Wed, 12 Sep 2018 09:04:48 -0500 Subject: [PATCH 5/7] remove comment --- src/monet.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/monet.js b/src/monet.js index 67f980b..c03b5bd 100644 --- a/src/monet.js +++ b/src/monet.js @@ -23,7 +23,6 @@ catch(e) { module.exports = factory(root) } - //module.exports = factory(!!window ? window || root) } else { root.notUseMonetGlobalObject = !root.useMonetGlobalObject root.Monet = factory(root) From 9be89cf120ab800eafa453827f7e7c53a8c5e8f2 Mon Sep 17 00:00:00 2001 From: James Spencer Date: Mon, 17 Sep 2018 13:58:57 -0500 Subject: [PATCH 6/7] fix init logic --- src/monet.js | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/src/monet.js b/src/monet.js index c03b5bd..bd3d0c7 100644 --- a/src/monet.js +++ b/src/monet.js @@ -14,20 +14,12 @@ if (typeof define === 'function' && define.amd) { define(factory) } else if (typeof module === 'object' && module.exports) { - try{ - if (!window) { - throw new Error('window missing use root instead') - } - module.exports = factory(window) - } - catch(e) { - module.exports = factory(root) - } + module.exports = factory(root) } else { root.notUseMonetGlobalObject = !root.useMonetGlobalObject root.Monet = factory(root) } -}(this, function (rootGlobalObject) { +}(typeof self !== 'undefined' ? self : this, function (rootGlobalObject) { 'use strict' var root = {} From 600589342bee7d92b18266385c317fb8a4078e8f Mon Sep 17 00:00:00 2001 From: James Spencer Date: Mon, 17 Sep 2018 14:00:59 -0500 Subject: [PATCH 7/7] update pimp version as well --- src/monet-pimp.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/monet-pimp.js b/src/monet-pimp.js index 7a36945..e6ca431 100644 --- a/src/monet-pimp.js +++ b/src/monet-pimp.js @@ -21,7 +21,7 @@ } else { factory(root.Monet, root) } -}(this, function (Monet, rootGlobalObject) { +}(typeof self !== 'undefined' ? self : this, function (Monet, rootGlobalObject) { 'use strict' function wrapReader(fn, args) {