closes #2

Fixed global pollution when working with AMD
LivePersonInc · Jul 2, 2015 · e644791 · e644791
1 parent 27779e5
commit e644791
Show file tree

Hide file tree

Showing 17 changed files with 224 additions and 217 deletions.
diff --git a/src/Channels.js b/src/Channels.js
@@ -6,16 +6,9 @@
     /* istanbul ignore if  */
     //<amd>
     if ("function" === typeof define && define.amd) {
-        // Browser globals
-        root.Chronos = root.Chronos || {};
-
         // AMD. Register as an anonymous module.
-        define("Chronos.Channels", ["exports", "Chronos.Events", "Chronos.Commands", "Chronos.Reqres"], function () {
-            if (!root.Chronos.Channels) {
-                factory(root, root.Chronos, root.Chronos.Events, root.Chronos.Commands, root.Chronos.ReqRes);
-            }
-
-            return root.Chronos.Channels;
+        define("Chronos.Channels", ["Chronos.Events", "Chronos.Commands", "Chronos.Reqres"], function (Events, Commands, Reqres) {
+            return factory(root, root, Events, Commands, Reqres, true);
         });
         return;
     }
@@ -36,7 +29,7 @@
         root.Chronos = root.Chronos || {};
         factory(root, root.Chronos, root.Chronos.Events, root.Chronos.Commands, root.Chronos.ReqRes);
     }
-}(typeof ChronosRoot === "undefined" ? this : ChronosRoot, function (root, exports, Events, Commands, ReqRes) {
+}(typeof ChronosRoot === "undefined" ? this : ChronosRoot, function (root, exports, Events, Commands, ReqRes, hide) {
     function Channels(options) {
 
         options = options || {};
@@ -67,5 +60,8 @@
 
     // attach properties to the exports object to define
     // the exported module properties.
-    exports.Channels = exports.Channels || Channels;
+    if (!hide) {
+        exports.Channels = exports.Channels || Channels;
+    }
+    return Channels;
 }));
diff --git a/src/Commands.js b/src/Commands.js
@@ -4,16 +4,9 @@
     /* istanbul ignore if  */
     //<amd>
     if ("function" === typeof define && define.amd) {
-        // Browser globals
-        root.Chronos = root.Chronos || {};
-
         // AMD. Register as an anonymous module.
-        define("Chronos.Commands", ["exports", "Chronos.EventsUtil", "Chronos.CommandsUtil"], function () {
-            if (!root.Chronos.Commands) {
-                factory(root, root.Chronos, root.Chronos.EventsUtil, root.Chronos.CommandsUtil);
-            }
-
-            return root.Chronos.Commands;
+        define("Chronos.Commands", ["Chronos.EventsUtil", "Chronos.CommandsUtil"], function (EventsUtil, CommandsUtil) {
+            return factory(root, root, EventsUtil, CommandsUtil, true);
         });
         return;
     }
@@ -33,7 +26,7 @@
         root.Chronos = root.Chronos || {};
         factory(root, root.Chronos, root.Chronos.EventsUtil, root.Chronos.CommandsUtil);
     }
-}(typeof ChronosRoot === "undefined" ? this : ChronosRoot, function (root, exports, evUtil, cmdUtil) {
+}(typeof ChronosRoot === "undefined" ? this : ChronosRoot, function (root, exports, evUtil, cmdUtil, hide) {
     "use strict";
 
     function Commands(defaults) {
@@ -178,5 +171,8 @@
 
     // attach properties to the exports object to define
     // the exported module properties.
-    exports.Commands = exports.Commands || Commands;
+    if (!hide) {
+        exports.Commands = exports.Commands || Commands;
+    }
+    return Commands;
 }));
diff --git a/src/Events.js b/src/Events.js
@@ -4,16 +4,9 @@
     /* istanbul ignore if  */
     //<amd>
     if ("function" === typeof define && define.amd) {
-        // Browser globals
-        root.Chronos = root.Chronos || {};
-
         // AMD. Register as an anonymous module.
-        define("Chronos.Events", ["exports", "Chronos.EventsUtil"], function () {
-            if (!root.Chronos.Events) {
-                factory(root, root.Chronos, root.Chronos.EventsUtil);
-            }
-
-            return root.Chronos.Events;
+        define("Chronos.Events", ["Chronos.EventsUtil"], function (EventsUtil) {
+            return factory(root, root, EventsUtil, true);
         });
         return;
     }
@@ -32,7 +25,7 @@
         root.Chronos = root.Chronos || {};
         factory(root, root.Chronos, root.Chronos.EventsUtil);
     }
-}(typeof ChronosRoot === "undefined" ? this : ChronosRoot, function (root, exports, evUtil) {
+}(typeof ChronosRoot === "undefined" ? this : ChronosRoot, function (root, exports, evUtil, hide) {
     "use strict";
 
     function Events(defaults) {
@@ -244,5 +237,8 @@
 
     // attach properties to the exports object to define
     // the exported module properties.
-    exports.Events = exports.Events || Events;
+    if (!hide) {
+        exports.Events = exports.Events || Events;
+    }
+    return Events;
 }));
diff --git a/src/Reqres.js b/src/Reqres.js
@@ -4,16 +4,9 @@
     /* istanbul ignore if  */
     //<amd>
     if ("function" === typeof define && define.amd) {
-        // Browser globals
-        root.Chronos = root.Chronos || {};
-
         // AMD. Register as an anonymous module.
-        define("Chronos.Reqres", ["exports", "Chronos.EventsUtil", "Chronos.CommandsUtil"], function () {
-            if (!root.Chronos.ReqRes) {
-                factory(root, root.Chronos, root.Chronos.EventsUtil, root.Chronos.CommandsUtil);
-            }
-
-            return root.Chronos.ReqRes;
+        define("Chronos.Reqres", ["Chronos.EventsUtil", "Chronos.CommandsUtil"], function (EventsUtil, CommandsUtil) {
+            return factory(root, root, EventsUtil, CommandsUtil, true);
         });
         return;
     }
@@ -33,7 +26,7 @@
         root.Chronos = root.Chronos || {};
         factory(root, root.Chronos, root.Chronos.EventsUtil, root.Chronos.CommandsUtil);
     }
-}(typeof ChronosRoot === "undefined" ? this : ChronosRoot, function (root, exports, evUtil, cmdUtil) {
+}(typeof ChronosRoot === "undefined" ? this : ChronosRoot, function (root, exports, evUtil, cmdUtil, hide) {
     function ReqRes(defaults) {
         var appName = "ReqRes",
             attrName = "reqName",
@@ -178,5 +171,8 @@
 
     // attach properties to the exports object to define
     // the exported module properties.
-    exports.ReqRes = exports.ReqRes || ReqRes;
+    if (!hide) {
+        exports.ReqRes = exports.ReqRes || ReqRes;
+    }
+    return ReqRes;
 }));
diff --git a/src/courier/PostMessageChannel.js b/src/courier/PostMessageChannel.js
@@ -1,19 +1,13 @@
 ;(function (root, chronosRoot, factory) {
     "use strict";
 
-    chronosRoot.Chronos = chronosRoot.Chronos || {};
-
     /* istanbul ignore if  */
     //<amd>
     if ("function" === typeof define && define.amd) {
 
         // AMD. Register as an anonymous module.
-        define("Chronos.PostMessageChannel", ["exports", "Chronos.PostMessageUtilities", "Chronos.PostMessageChannelPolyfill"], function () {
-            if (!chronosRoot.Chronos.PostMessageChannel) {
-                factory(root, chronosRoot.Chronos, chronosRoot.Chronos.PostMessageUtilities, chronosRoot.Chronos.PostMessageChannelPolyfill);
-            }
-
-            return chronosRoot.Chronos.PostMessageChannel;
+        define("Chronos.PostMessageChannel", ["Chronos.PostMessageUtilities", "Chronos.PostMessageChannelPolyfill"], function (PostMessageUtilities, PostMessageChannelPolyfill) {
+            return factory(root, chronosRoot, PostMessageUtilities, PostMessageChannelPolyfill, true);
         });
         return;
     }
@@ -24,9 +18,10 @@
          * @depend ./PostMessageUtilities.js
          * @depend ./PostMessageChannelPolyfill.js
          */
+        chronosRoot.Chronos = chronosRoot.Chronos || {};
         factory(root, chronosRoot.Chronos, chronosRoot.Chronos.PostMessageUtilities, chronosRoot.Chronos.PostMessageChannelPolyfill);
     }
-}(this, typeof ChronosRoot === "undefined" ? this : ChronosRoot, function (root, exports, PostMessageUtilities, PostMessageChannelPolyfill) {
+}(this, typeof ChronosRoot === "undefined" ? this : ChronosRoot, function (root, exports, PostMessageUtilities, PostMessageChannelPolyfill, hide) {
     "use strict";
 
     /*jshint validthis:true */
@@ -694,5 +689,8 @@
 
     // attach properties to the exports object to define
     // the exported module properties.
-    exports.PostMessageChannel = PostMessageChannel;
+    if (!hide) {
+        exports.PostMessageChannel = PostMessageChannel;
+    }
+    return PostMessageChannel;
 }));
diff --git a/src/courier/PostMessageChannelPolyfill.js b/src/courier/PostMessageChannelPolyfill.js
@@ -1,19 +1,13 @@
 ;(function (root, chronosRoot, factory) {
     "use strict";
 
-    chronosRoot.Chronos = chronosRoot.Chronos || {};
-
     /* istanbul ignore if  */
     //<amd>
     if ("function" === typeof define && define.amd) {
 
         // AMD. Register as an anonymous module.
-        define("Chronos.PostMessageChannelPolyfill", ["exports", "Chronos.PostMessageUtilities"], function () {
-            if (!chronosRoot.Chronos.PostMessageChannelPolyfill) {
-                factory(root, chronosRoot.Chronos, chronosRoot.Chronos.PostMessageUtilities);
-            }
-
-            return chronosRoot.Chronos.PostMessageChannelPolyfill;
+        define("Chronos.PostMessageChannelPolyfill", ["Chronos.PostMessageUtilities"], function (PostMessageUtilities) {
+            return factory(root, chronosRoot, PostMessageUtilities, true);
         });
         return;
     }
@@ -23,9 +17,10 @@
         /**
          * @depend ./PostMessageUtilities.js
          */
+        chronosRoot.Chronos = chronosRoot.Chronos || {};
         factory(root, chronosRoot.Chronos, chronosRoot.Chronos.PostMessageUtilities);
     }
-}(this, typeof ChronosRoot === "undefined" ? this : ChronosRoot, function (root, exports, PostMessageUtilities) {
+}(this, typeof ChronosRoot === "undefined" ? this : ChronosRoot, function (root, exports, PostMessageUtilities, hide) {
     "use strict";
 
     /*jshint validthis:true */
@@ -174,5 +169,8 @@
 
     // attach properties to the exports object to define
     // the exported module properties.
-    exports.PostMessageChannelPolyfill = exports.PostMessageChannelPolyfill || PostMessageChannelPolyfill;
+    if (!hide) {
+        exports.PostMessageChannelPolyfill = exports.PostMessageChannelPolyfill || PostMessageChannelPolyfill;
+    }
+    return PostMessageChannelPolyfill;
 }));
diff --git a/src/courier/PostMessageCourier.js b/src/courier/PostMessageCourier.js
@@ -17,21 +17,15 @@
 ;(function (root, cacherRoot, circuitRoot, factory) {
     "use strict";
 
-    root.Chronos = root.Chronos || {};
-
     /* istanbul ignore if  */
     //<amd>
     if ("function" === typeof define && define.amd) {
 
         // AMD. Register as an anonymous module.
-        define("Chronos.PostMessageCourier", ["exports", "Chronos.PostMessageUtilities", "Chronos.Channels", "cacher", "CircuitBreaker", "Chronos.PostMessageChannel", "Chronos.PostMessagePromise", "Chronos.PostMessageMapper"], function () {
-            if (!root.Chronos.PostMessageCourier) {
-                factory(root, root.Chronos, root.Chronos.PostMessageUtilities, root.Chronos.Channels,
-                    cacherRoot.Cacher, circuitRoot.CircuitBreaker,
-                    root.Chronos.PostMessageChannel, root.Chronos.PostMessagePromise, root.Chronos.PostMessageMapper);
-            }
-
-            return root.Chronos.PostMessageCourier;
+        define("Chronos.PostMessageCourier", ["Chronos.PostMessageUtilities", "Chronos.Channels", "cacher", "CircuitBreaker", "Chronos.PostMessageChannel", "Chronos.PostMessagePromise", "Chronos.PostMessageMapper"],
+            function (PostMessageUtilities, Channels, cacher, CircuitBreaker, PostMessageChannel, PostMessagePromise, PostMessageMapper) {
+                return factory(root, root, PostMessageUtilities, Channels,
+                    cacher, CircuitBreaker, PostMessageChannel, PostMessagePromise, PostMessageMapper, true);
         });
         return;
     }
@@ -47,14 +41,15 @@
          * @depend ./PostMessagePromise.js
          * @depend ./PostMessageMapper.js
          */
+        root.Chronos = root.Chronos || {};
         factory(root, root.Chronos, root.Chronos.PostMessageUtilities, root.Chronos.Channels,
             cacherRoot.Cacher,  circuitRoot.CircuitBreaker,
             root.Chronos.PostMessageChannel, root.Chronos.PostMessagePromise, root.Chronos.PostMessageMapper);
     }
 }(typeof ChronosRoot === "undefined" ? this : ChronosRoot,
     typeof CacherRoot === "undefined" ? this : CacherRoot,
     typeof CircuitRoot === "undefined" ? this : CircuitRoot,
-    function (root, exports, PostMessageUtilities, Channels, Cacher, CircuitBreaker, PostMessageChannel, PostMessagePromise, PostMessageMapper) {
+    function (root, exports, PostMessageUtilities, Channels, Cacher, CircuitBreaker, PostMessageChannel, PostMessagePromise, PostMessageMapper, hide) {
         "use strict";
 
         /*jshint validthis:true */
@@ -750,5 +745,8 @@
 
         // attach properties to the exports object to define
         // the exported module properties.
-        exports.PostMessageCourier = exports.PostMessageCourier || PostMessageCourier;
+        if (!hide) {
+            exports.PostMessageCourier = exports.PostMessageCourier || PostMessageCourier;
+        }
+        return PostMessageCourier;
     }));
diff --git a/src/courier/PostMessageMapper.js b/src/courier/PostMessageMapper.js
@@ -1,19 +1,13 @@
 ;(function (root, factory) {
     "use strict";
 
-    root.Chronos = root.Chronos || {};
-
     /* istanbul ignore if  */
     //<amd>
     if ("function" === typeof define && define.amd) {
 
         // AMD. Register as an anonymous module.
-        define("Chronos.PostMessageMapper", ["exports", "Chronos.PostMessageUtilities"], function () {
-            if (!root.Chronos.PostMessageMapper) {
-                factory(root, root.Chronos, root.Chronos.PostMessageUtilities);
-            }
-
-            return root.Chronos.PostMessageMapper;
+        define("Chronos.PostMessageMapper", ["Chronos.PostMessageUtilities"], function (PostMessageUtilities) {
+            return factory(root, root, PostMessageUtilities, true);
         });
         return;
     }
@@ -23,9 +17,10 @@
         /**
          * @depend ./PostMessageUtilities.js
          */
+        root.Chronos = root.Chronos || {};
         factory(root, root.Chronos, root.Chronos.PostMessageUtilities);
     }
-}(typeof ChronosRoot === "undefined" ? this : ChronosRoot, function (root, exports, PostMessageUtilities) {
+}(typeof ChronosRoot === "undefined" ? this : ChronosRoot, function (root, exports, PostMessageUtilities, hide) {
     "use strict";
 
     /*jshint validthis:true */
@@ -127,5 +122,8 @@
 
     // attach properties to the exports object to define
     // the exported module properties.
-    exports.PostMessageMapper = exports.PostMessageMapper || PostMessageMapper;
+    if (!hide) {
+        exports.PostMessageMapper = exports.PostMessageMapper || PostMessageMapper;
+    }
+    return PostMessageMapper;
 }));
diff --git a/src/courier/PostMessagePromise.js b/src/courier/PostMessagePromise.js
@@ -1,28 +1,22 @@
 ;(function (root, chronosRoot, factory) {
     "use strict";
 
-    chronosRoot.Chronos = chronosRoot.Chronos || {};
-
     /* istanbul ignore if  */
     //<amd>
     if ("function" === typeof define && define.amd) {
-
         // AMD. Register as an anonymous module.
         define("Chronos.PostMessagePromise", ["exports"], function () {
-            if (!chronosRoot.Chronos.PostMessagePromise) {
-                factory(root, chronosRoot.Chronos);
-            }
-
-            return chronosRoot.Chronos.PostMessagePromise;
+            return factory(root, chronosRoot, true);
         });
         return;
     }
     //</amd>
     /* istanbul ignore next  */
     if ("object" !== typeof exports) {
+        chronosRoot.Chronos = chronosRoot.Chronos || {};
         factory(root, chronosRoot.Chronos);
     }
-}(this, typeof ChronosRoot === "undefined" ? this : ChronosRoot, function (root, exports) {
+}(this, typeof ChronosRoot === "undefined" ? this : ChronosRoot, function (root, exports, hide) {
     "use strict";
 
     /*jshint validthis:true */
@@ -199,5 +193,8 @@
 
     // attach properties to the exports object to define
     // the exported module properties.
-    exports.PostMessagePromise = exports.PostMessagePromise || PostMessagePromise;
+    if (!hide) {
+        exports.PostMessagePromise = exports.PostMessagePromise || PostMessagePromise;
+    }
+    return PostMessagePromise;
 }));