fix some issues with routing

Author: jjeffryes

index.html

@@ -40,6 +40,7 @@ <h2 class="ion-android-close custCol-text clickable"></h2>
       </div>
     </div>
   </div>
+  <!--
   <div class="modal modal-opaque hide js-loadingMessageModal">
     <div class="modal-child modal-childMain">
       <div class="btn-corner btn-cornerTR js-closeIndexModal">
@@ -71,15 +72,17 @@ <h2 class="txt-center">
       </div>
     </div>
   </div>
+  -->
   <div id="statusBar"></div>
   <div id="pageNav" class="bar navBar navBar-main custCol-secondary padding0"></div>
   <!-- the loading modal must be on top of the page nav or the reload button is hidden -->
   <div id="loadingModal" class="modal modal-opaque js-loadingModal top0">
     <div class="spinner-with-logo fullCentered">
       <i class="ion-android-sync spinner fontSize30 spinner-with-logo-icon"></i>
     </div>
-    <div class="rowTop20">
-      <a class="btn btn-txt btn-corner btn-cornerTR js-indexReload"><i class="ion-android-sync"></i> Reload</a>
+    <div class="width100 positionTop">
+      <a class="btn btn-txt rowTop10 marginRight10 pull-right js-indexReload"><i class="ion-android-sync"></i> Reload</a>
+      <a class="btn btn-txt rowTop10 marginRight10 pull-right" href="#home"><i class="ion-home"></i> Load Index</a>
     </div>
   </div>
 

js/main.js

@@ -276,6 +276,8 @@ var profileLoaded;
 var loadProfile = function(landingRoute, onboarded) {
   var externalRoute = remote.getGlobal('externalRoute');
 
+  landingRoute = landingRoute && landingRoute != undefined ? landingRoute : '#';
+
   profileLoaded = true;
 
   //get the guid from the user profile to put in the user model
@@ -317,7 +319,7 @@ var loadProfile = function(landingRoute, onboarded) {
                   Backbone.history.start();
                 });
               } else {
-                location.hash = landingRoute || '#';
+                location.hash = landingRoute;
                 Backbone.history.start();
               }
             });

js/router.js

@@ -57,13 +57,13 @@ module.exports = Backbone.Router.extend({
         itemHash = "",
         routeArray = route.replace("ob://","").replace(/ /g, "").split("/"),
         deferred = $.Deferred();
-
+    
     state = routeArray[1] ? "/" + routeArray[1] : "";
     itemHash = routeArray[2] ? "/" + routeArray[2] : "";
 
     if(routeArray[0].charAt(0) == "@"){
       // user entered a handle
-      deferred.resolve(route);
+      deferred.resolve(routeArray[0] + state + itemHash);
     } else if(!routeArray[0].length){
       // user trying to go back to discover
       deferred.resolve('#home');