From 17da8441f4e8d785ca537b768e95d66bc0c75fec Mon Sep 17 00:00:00 2001
From: Connor Turland <connorturland@gmail.com>
Date: Mon, 1 Aug 2016 16:18:34 -0400
Subject: [PATCH] fixup react setup

---
 app/assets/javascripts/src/Metamaps.GlobalUI.js | 2 +-
 app/assets/javascripts/src/Metamaps.Header.js   | 2 +-
 app/views/layouts/_foot.html.erb                | 1 -
 package.json                                    | 5 ++---
 4 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/app/assets/javascripts/src/Metamaps.GlobalUI.js b/app/assets/javascripts/src/Metamaps.GlobalUI.js
index bacc0a94..3227124a 100644
--- a/app/assets/javascripts/src/Metamaps.GlobalUI.js
+++ b/app/assets/javascripts/src/Metamaps.GlobalUI.js
@@ -1,4 +1,4 @@
-var Metamaps = {}; // this variable declaration defines a Javascript object that will contain all the variables and functions used by us, broken down into 'sub-modules' that look something like this
+var Metamaps = window.Metamaps || {}; // this variable declaration defines a Javascript object that will contain all the variables and functions used by us, broken down into 'sub-modules' that look something like this
 /*
 
 * unless you are on a page with the Javascript InfoVis Toolkit (Topic or Map) the only section in the metamaps
diff --git a/app/assets/javascripts/src/Metamaps.Header.js b/app/assets/javascripts/src/Metamaps.Header.js
index 62ef5db9..3693163b 100644
--- a/app/assets/javascripts/src/Metamaps.Header.js
+++ b/app/assets/javascripts/src/Metamaps.Header.js
@@ -1,4 +1,4 @@
-var Metamaps = Metamaps || {}
+/* global Metamaps, $ */
 
 Metamaps.Header = {
   init: function () {
diff --git a/app/views/layouts/_foot.html.erb b/app/views/layouts/_foot.html.erb
index 4fce7c0e..dcd7882e 100644
--- a/app/views/layouts/_foot.html.erb
+++ b/app/views/layouts/_foot.html.erb
@@ -25,7 +25,6 @@
 
     USERVOICE.load();
 </script>
-<script type="text/javascript" src="<%= asset_path 'webpacked/metamaps.bundle.js' %>"></script>
 <%= render :partial => 'layouts/googleanalytics' if Rails.env.production? %>
 </body>
 </html>
diff --git a/package.json b/package.json
index acf69b97..d70cd4c0 100644
--- a/package.json
+++ b/package.json
@@ -29,10 +29,9 @@
     "webpack": "^1.13.1"
   },
   "dependencies": {
-    "backbone": "^1.0.0",
+    "backbone": "1.0.0",
     "react": "^15.3.0",
     "react-dom": "^15.3.0",
-    "requirejs": "^2.1.1",
-    "underscore": "^1.4.4"
+    "underscore": "1.4.4"
   }
 }