From 8f100d99cb82bb3204f264fd6212619d7dbf9603 Mon Sep 17 00:00:00 2001
From: Devin Howard <devin@callysto.com>
Date: Thu, 22 Sep 2016 17:05:28 +0800
Subject: [PATCH] start to do stuff that may/may not work

---
 frontend/src/Metamaps/Active.js    |  7 +++++++
 frontend/src/Metamaps/Constants.js |  5 -----
 frontend/src/Metamaps/index.js     | 11 ++++++-----
 3 files changed, 13 insertions(+), 10 deletions(-)
 create mode 100644 frontend/src/Metamaps/Active.js

diff --git a/frontend/src/Metamaps/Active.js b/frontend/src/Metamaps/Active.js
new file mode 100644
index 00000000..c61a8bb9
--- /dev/null
+++ b/frontend/src/Metamaps/Active.js
@@ -0,0 +1,7 @@
+const Active = {
+  Map: null,
+  Topic: null,
+  Mapper: null
+};
+
+export default Active
diff --git a/frontend/src/Metamaps/Constants.js b/frontend/src/Metamaps/Constants.js
index ab62ba14..e887f24c 100644
--- a/frontend/src/Metamaps/Constants.js
+++ b/frontend/src/Metamaps/Constants.js
@@ -7,11 +7,6 @@ Metamaps.tempNode = null
 Metamaps.tempInit = false
 Metamaps.tempNode2 = null
 
-Metamaps.Active = Metamaps.Active || {
-  Map: null,
-  Topic: null,
-  Mapper: null
-};
 
 Metamaps.Maps = Metamaps.Maps || {}
 
diff --git a/frontend/src/Metamaps/index.js b/frontend/src/Metamaps/index.js
index 21d2af3a..598533c0 100644
--- a/frontend/src/Metamaps/index.js
+++ b/frontend/src/Metamaps/index.js
@@ -1,9 +1,9 @@
 /* global $ */
-window.Metamaps = window.Metamaps || {}
 
 import './Constants'
 
 import Account from './Account'
+import Active from './Active'
 import Admin from './Admin'
 import AutoLayout from './AutoLayout'
 import Backbone from './Backbone'
@@ -32,6 +32,7 @@ import Visualize from './Visualize'
 import ReactComponents from './ReactComponents'
 
 Metamaps.Account = Account
+Metamaps.Active = Active
 Metamaps.Admin = Admin
 Metamaps.AutoLayout = AutoLayout
 Metamaps.Backbone = Backbone
@@ -59,9 +60,9 @@ Metamaps.Util = Util
 Metamaps.Views = Views
 Metamaps.Visualize = Visualize
 
-$(document).ready(function () {
+document.addEventListener("DOMContentLoaded", function() {
   // initialize all the modules
-  for (var prop in Metamaps) {
+  for (const prop in Metamaps) {
       // this runs the init function within each sub-object on the Metamaps one
       if (Metamaps.hasOwnProperty(prop) &&
           Metamaps[prop] != null &&
@@ -73,7 +74,7 @@ $(document).ready(function () {
   }
   // load whichever page you are on
   if (Metamaps.currentSection === "explore") {
-      var capitalize = Metamaps.currentPage.charAt(0).toUpperCase() + Metamaps.currentPage.slice(1)
+      const capitalize = Metamaps.currentPage.charAt(0).toUpperCase() + Metamaps.currentPage.slice(1)
 
       Metamaps.Views.exploreMaps.setCollection( Metamaps.Maps[capitalize] )
       if (Metamaps.currentPage === "mapper") {
@@ -96,4 +97,4 @@ $(document).ready(function () {
   }
 });
 
-export default window.Metamaps
+export default Metamaps