From 996f6f01509584fece35860a84c03736363e9762 Mon Sep 17 00:00:00 2001
From: Alan Stoll <alan@bitpay.com>
Date: Mon, 7 Jul 2014 15:53:26 -0400
Subject: [PATCH] we still need node integration, so fix moment loader another
 way

---
 index.html     | 4 +++-
 js/shell.js    | 2 +-
 shell/index.js | 3 +--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/index.html b/index.html
index b4322cbcf..cc93e7ee3 100644
--- a/index.html
+++ b/index.html
@@ -919,6 +919,9 @@ on supported browsers please check <a href="http://www.webrtc.org/">http://www.w
     </script>
 
     <script src="lib/mousetrap/mousetrap.min.js"></script>
+    <!-- shell must be loaded before moment due to the way moment loads in a commonjs env -->
+    <script src="js/shell.js"></script>
+
     <script src="lib/angular/angular.min.js"></script>
     <script src="lib/moment/min/moment.min.js"></script>
     <script src="lib/angular-moment/angular-moment.js"></script>
@@ -939,7 +942,6 @@ on supported browsers please check <a href="http://www.webrtc.org/">http://www.w
     <script src="lib/qrcode-decoder-js/lib/qrcode-decoder.min.js"></script>
 
     <script src="config.js"></script>
-    <script src="js/shell.js"></script>
     <script src="js/copayBundle.js"></script>
     <script src="js/app.js"></script>
     <script src="js/routes.js"></script>
diff --git a/js/shell.js b/js/shell.js
index 6019b164b..9e3a89ff0 100644
--- a/js/shell.js
+++ b/js/shell.js
@@ -12,7 +12,7 @@
    ** the renderer into thinking that we are _not_ in a CommonJS environment.
    */
   if (typeof module !== 'undefined') module = {
-    exports: null
+    exports: false
   };
 
   // are we running in copay shell?
diff --git a/shell/index.js b/shell/index.js
index f28a1ee73..899d053a2 100644
--- a/shell/index.js
+++ b/shell/index.js
@@ -24,8 +24,7 @@ module.exports = function(copay) {
       // create the main window
       mainWindow = new BrowserWindow({
         width: config.window.width,
-        height: config.window.height,
-        "node-integration": "disable"
+        height: config.window.height
       });
 
       // hide the empty window