Fixed tableview styling on map detail page, and fixed issue with reop…

…ening map detail view from back button.
Jasig · May 26, 2012 · 434b5f0 · 434b5f0
1 parent 170d08a
commit 434b5f0
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/Resources/js/style.js b/Resources/js/style.js
@@ -661,7 +661,7 @@ exports.updateStyles = function () {
         backgroundDisabledImage: '/images/secondarybarbtnbg_press.png'
     };
     exports.mapDetailView = {
-        top: defaults.TITLEBAR_HEIGHT+'dp'
+        top: defaults.TITLEBAR_HEIGHT + defaults.TITLEBAR_HEIGHT +'dp'
     };
     exports.mapDetailTopView= {
         top: defaults.TITLEBAR_HEIGHT+'dp',

diff --git a/Resources/js/views/MapWindowView.js b/Resources/js/views/MapWindowView.js
@@ -161,11 +161,16 @@ exports.goBack = function (){
     Ti.API.debug('Go back in MapWindowView');
     Ti.API.debug(JSON.stringify(activityStack));
     //Let's clear the current view in the activity stack
-    activityStack.pop();
-    var _prev = activityStack.pop();
-    Ti.API.debug(JSON.stringify(_prev));
-
-    exports.doSetView(_prev.view, _prev.model);
+    if (activityStack.length > 1) {
+        activityStack.pop();
+        var _prev = activityStack.pop();
+        Ti.API.debug(JSON.stringify(_prev));
+
+        exports.doSetView(_prev.view, _prev.model);
+    }
+    else {
+        Ti.API.debug('Nothing to go back to.');
+    }
 };
 
 exports.plotPoints = function (points) {
@@ -436,6 +441,9 @@ exports.doSetView = function (newView, viewModel) {
             case exports.views.FAVORITES_BROWSING:
                 exports.openFavoritesBrowsingView();
                 break;
+            case exports.views.LOCATION_DETAIL:
+                exports.openDetailView(viewModel);
+                break;
             case exports.views.FAVORITES_MAP:
                 exports.openFavoritesMapView();
                 break;