From d7ee8795902db939f61d5110c23d3f427a8f4038 Mon Sep 17 00:00:00 2001
From: Connor Turland <connorturland@gmail.com>
Date: Wed, 17 Aug 2016 13:28:37 +0000
Subject: [PATCH] fixup callbacks when fetching user

---
 app/assets/javascripts/src/Metamaps.Router.js | 8 ++++----
 app/assets/javascripts/src/Metamaps.Views.js  | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/assets/javascripts/src/Metamaps.Router.js b/app/assets/javascripts/src/Metamaps.Router.js
index a037d169..58858185 100644
--- a/app/assets/javascripts/src/Metamaps.Router.js
+++ b/app/assets/javascripts/src/Metamaps.Router.js
@@ -47,9 +47,9 @@
         Metamaps.GlobalUI.hideDiv('#yield')
 
         Metamaps.Header.changeSection(!!Metamaps.Active.Mapper, 'active')
-        //Metamaps.Famous.maps.resetScroll() // sets the scroll back to the top
         Metamaps.GlobalUI.showDiv('#exploreMapsHeader')
         Metamaps.GlobalUI.showDiv('#exploreMaps')
+        $('#exploreMaps').scrollTop(0)
 
         Metamaps.GlobalUI.Search.open()
         Metamaps.GlobalUI.Search.lock()
@@ -124,7 +124,7 @@
         if (Metamaps.Router.currentPage === 'mapper') {
           path += '/' + Metamaps.Maps.Mapper.mapperId
         }
-
+        
         Metamaps.Router.navigate(path)
       }
       var navigateTimeout = function () {
@@ -147,9 +147,9 @@
       Metamaps.GlobalUI.Search.lock()
       Metamaps.GlobalUI.showDiv('#exploreMaps')
       Metamaps.GlobalUI.showDiv('#exploreMapsHeader')
-      // Metamaps.Famous.maps.resetScroll() // sets scroll back to top
+      $('#exploreMaps').scrollTop(0)
       if (id) {
-        Metamaps.Header.fetchUserThenchangeSection(!!Metamaps.Active.Mapper, id)
+        Metamaps.Header.fetchUserThenChangeSection(!!Metamaps.Active.Mapper, id)
       }
       else Metamaps.Header.changeSection(!!Metamaps.Active.Mapper, section)
       Metamaps.GlobalUI.hideDiv('#yield')
diff --git a/app/assets/javascripts/src/Metamaps.Views.js b/app/assets/javascripts/src/Metamaps.Views.js
index 89967b07..da43e93a 100644
--- a/app/assets/javascripts/src/Metamaps.Views.js
+++ b/app/assets/javascripts/src/Metamaps.Views.js
@@ -57,11 +57,11 @@ Metamaps.Views.init = function () {
       this.listenTo(this.collection, 'successOnFetch', this.handleSuccess)
       this.listenTo(this.collection, 'errorOnFetch', this.handleError)
     },
-    render: function (mapperObj, cbArg) {
+    render: function (mapperObj, cb) {
       var that = this
 
       if (typeof mapperObj === 'function') {
-        var cb = mapperObj
+        cb = mapperObj
         mapperObj = null
       }