From d50923b6bd789df3db812dc75b5081489ad8c2f1 Mon Sep 17 00:00:00 2001
From: Connor Turland <connorturland@gmail.com>
Date: Mon, 29 Feb 2016 17:05:11 +1300
Subject: [PATCH] fix js bug

---
 app/assets/javascripts/src/Metamaps.GlobalUI.js.erb |  1 +
 app/assets/javascripts/src/Metamaps.js.erb          | 10 ++++------
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/app/assets/javascripts/src/Metamaps.GlobalUI.js.erb b/app/assets/javascripts/src/Metamaps.GlobalUI.js.erb
index a7f2f017..b8c111af 100644
--- a/app/assets/javascripts/src/Metamaps.GlobalUI.js.erb
+++ b/app/assets/javascripts/src/Metamaps.GlobalUI.js.erb
@@ -48,6 +48,7 @@ $(document).ready(function () {
 
         // this runs the init function within each sub-object on the Metamaps one
         if (Metamaps.hasOwnProperty(prop) &&
+            Metamaps[prop] != null &&
             Metamaps[prop].hasOwnProperty('init') &&
             typeof (Metamaps[prop].init) == 'function'
         ) {
diff --git a/app/assets/javascripts/src/Metamaps.js.erb b/app/assets/javascripts/src/Metamaps.js.erb
index 4744105c..c0c7e858 100644
--- a/app/assets/javascripts/src/Metamaps.js.erb
+++ b/app/assets/javascripts/src/Metamaps.js.erb
@@ -17,12 +17,10 @@ var labelType, useGradients, nativeTextSupport, animate;
 })();
 
 // TODO eliminate these 4 top-level variables
-Metamaps = {
-  panningInt: null,
-  tempNode: null,
-  tempInit: false,
-  tempNode2: null
-}
+Metamaps.panningInt = null;
+Metamaps.tempNode = null;
+Metamaps.tempInit = false;
+Metamaps.tempNode2 = null;
 
 Metamaps.Settings = {
     embed: false, // indicates that the app is on a page that is optimized for embedding in iFrames on other web pages