From 6f794ff26dfc955be5054f6bcddbc77f4b2d4f9d Mon Sep 17 00:00:00 2001
From: Tankred Hase <tankred@whiteout.io>
Date: Fri, 5 Dec 2014 16:57:53 +0100
Subject: [PATCH] Fix changing folder in chrome app

---
 src/js/controller/app/navigation.js | 8 ++++++++
 src/tpl/nav.html                    | 4 ++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/js/controller/app/navigation.js b/src/js/controller/app/navigation.js
index f66a02f..0c75e97 100644
--- a/src/js/controller/app/navigation.js
+++ b/src/js/controller/app/navigation.js
@@ -35,6 +35,14 @@ var NavigationCtrl = function($scope, $location, account, email, outbox, notific
     // url/history handling
     //
 
+    /**
+     * Close read mode and go to folder
+     */
+    $scope.navigate = function(folderIndex) {
+        $location.search('uid', null);
+        $location.search('folder', folderIndex);
+    };
+
     $scope.loc = $location;
 
     // nav open/close state url watcher
diff --git a/src/tpl/nav.html b/src/tpl/nav.html
index f10e5ba..0f17e1e 100644
--- a/src/tpl/nav.html
+++ b/src/tpl/nav.html
@@ -7,7 +7,7 @@
   <ul class="nav__folders">
     <li ng-repeat="folder in account.folders" ng-if="folder.wellknown" ng-hide="folder.type === 'Outbox' && folder.count < 1"
       class="nav__folder" ng-class="{'nav__folder--open': state.nav.currentFolder === folder}">
-      <a href="#/account?folder={{$index}}">
+      <a href="#" wo-touch="$event.preventDefault(); navigate($index)">
         <svg ng-if="folder.type === 'Inbox'" role="presentation">
           <use xlink:href="#icon-inbox" />
         </svg>
@@ -38,7 +38,7 @@
   <ul class="nav__folders">
     <li ng-repeat="folder in account.folders" ng-if="!folder.wellknown"
       class="nav__folder" ng-class="{'nav__folder--open': state.nav.currentFolder === folder}">
-      <a href="#/account?folder={{$index}}">
+      <a href="#" wo-touch="$event.preventDefault(); navigate($index)">
         <svg role="presentation"><use xlink:href="#icon-folder" /></svg>
         {{folder.name}}
         <span ng-show="folder.count > 0" class="nav__counter">{{folder.count}}</span>