Fix brunch wrapping

phoenixframework · Jan 20, 2016 · aa4f786 · aa4f786
1 parent 3605909
commit aa4f786
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/brunch-config.js b/brunch-config.js
@@ -10,7 +10,7 @@ exports.config = {
     // 2. the exports variable does not leak
     // 3. the Socket, Channel variables and so on do not leak
     wrapper: function(path, code){
-      return "(function(){\nif(typeof(exports) === \"undefined\" && !window.Phoenix){ window.Phoenix = {}; var exports = window.Phoenix; }\n" + code + "\n})();\n";
+      return "(function(exports){\n" + code + "\n})(typeof(exports) === \"undefined\" ? window.Phoenix = window.Phoenix || {} : exports);\n";
     }
   },
 

diff --git a/priv/static/phoenix.js b/priv/static/phoenix.js
@@ -1,5 +1,4 @@
-(function(){
-if(typeof(exports) === "undefined" && !window.Phoenix){ window.Phoenix = {}; var exports = window.Phoenix; }
+(function(exports){
 "use strict";
 
 var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol ? "symbol" : typeof obj; };
@@ -1024,4 +1023,4 @@ var Timer = function () {
 }();
 
 
-})();
+})(typeof(exports) === "undefined" ? window.Phoenix = window.Phoenix || {} : exports);