From 141b3af83b131681a40a9ea5af7a9d84730e33b0 Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Tue, 5 Sep 2017 10:16:36 -0400
Subject: [PATCH] (js) Always show center list when no msg selected

Fixes #4269
---
 NEWS                                          |  1 +
 .../MailerUI/UIxMailFolderTemplate.wox        |  2 +-
 .../js/Common/navController.js                | 74 ++++++++++---------
 .../js/Mailer/MailboxController.js            |  5 ++
 4 files changed, 45 insertions(+), 37 deletions(-)

diff --git a/NEWS b/NEWS
index 505b1c0b0..0d0defa25 100644
--- a/NEWS
+++ b/NEWS
@@ -15,6 +15,7 @@ Bug fixes
  - [web] fixed display of error when the mail editor is in a popup
  - [web] attachments are not displayed on IOS (#4150)
  - [web] fixed parsing of pasted email addresses from Spreadsheet (#4258)
+ - [web] messages list not accessible when changing mailbox in expanded mail view (#4269)
 
 3.2.10 (2017-07-05)
 -------------------
diff --git a/UI/Templates/MailerUI/UIxMailFolderTemplate.wox b/UI/Templates/MailerUI/UIxMailFolderTemplate.wox
index befe25080..5df08c980 100644
--- a/UI/Templates/MailerUI/UIxMailFolderTemplate.wox
+++ b/UI/Templates/MailerUI/UIxMailFolderTemplate.wox
@@ -3,7 +3,7 @@
     xmlns="http://www.w3.org/1999/xhtml"
     xmlns:var="http://www.skyrix.com/od/binding"
     xmlns:label="OGo:label">
-  <div class="view-list" layout="column" ng-class="{'view-list--close': centerIsClose}">
+  <div class="view-list" layout="column" ng-class="{'view-list--close': mailbox.centerIsClose(centerIsClose)}">
 
     <!-- in virtual mailbox mode -->
     <md-toolbar class="md-whiteframe-z1 md-hue-3"
diff --git a/UI/WebServerResources/js/Common/navController.js b/UI/WebServerResources/js/Common/navController.js
index 14af49d0e..b8ee7eaff 100644
--- a/UI/WebServerResources/js/Common/navController.js
+++ b/UI/WebServerResources/js/Common/navController.js
@@ -1,9 +1,7 @@
 /* -*- Mode: javascript; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 
-/**
- * @type {angular.Module}
- */
-(function () {
+(function() {
+  /* jshint validthis: true */
   'use strict';
 
   /**
@@ -13,23 +11,43 @@
   function navController($rootScope, $scope, $timeout, $interval, $http, $window, $mdSidenav, $mdToast, $mdMedia, $log, sgConstant, sgSettings, Resource, Alarm) {
     var resource = new Resource(sgSettings.baseURL(), sgSettings.activeUser());
 
-    $scope.isPopup = sgSettings.isPopup;
-    $scope.activeUser = sgSettings.activeUser();
-    $scope.baseURL = sgSettings.baseURL();
-    $scope.leftIsClose = !$mdMedia(sgConstant['gt-md']);
-    // Don't hide the center list when on a small device
-    $scope.centerIsClose = !!$window.centerIsClose && !$scope.leftIsClose;
+    this.$onInit = function() {
+      $scope.isPopup = sgSettings.isPopup;
+      $scope.activeUser = sgSettings.activeUser();
+      $scope.baseURL = sgSettings.baseURL();
+      $scope.leftIsClose = !$mdMedia(sgConstant['gt-md']);
+      // Don't hide the center list when on a small device
+      $scope.centerIsClose = !!$window.centerIsClose && !$scope.leftIsClose;
 
-    // Show current day in top bar
-    $scope.currentDay = window.currentDay;
-    $timeout(function() {
-      // Update date when day ends
-      $interval(function() {
-        $http.get('../date').then(function(data) {
-          $scope.currentDay = data;
-        });
-      }, 24 * 3600 * 1000);
-    }, window.currentDay.secondsBeforeTomorrow * 1000);
+      // Show current day in top bar
+      $scope.currentDay = window.currentDay;
+      $timeout(function() {
+        // Update date when day ends
+        $interval(function() {
+          $http.get('../date').then(function(data) {
+            $scope.currentDay = data;
+          });
+        }, 24 * 3600 * 1000);
+      }, window.currentDay.secondsBeforeTomorrow * 1000);
+
+      // Track the 1024px window width threashold
+      $scope.$watch(function() {
+        return $mdMedia(sgConstant['gt-md']);
+      }, function(newVal) {
+        $scope.isGtMedium = newVal;
+        if (newVal) {
+          $scope.leftIsClose = false;
+        }
+      });
+
+      // Listen to HTTP errors broadcasted from HTTP interceptor
+      $rootScope.$on('http:Error', onHttpError);
+
+      if (sgSettings.activeUser('path').calendar) {
+        // Fetch Calendar alarms
+        Alarm.getAlarms();
+      }
+    };
 
     $scope.toggleLeft = function() {
       if ($scope.isGtMedium) {
@@ -70,14 +88,6 @@
     //   var detail = angular.element(document.getElementById('detailView'));
     //   detail.toggleClass('sg-close');
     // };
-    $scope.$watch(function() {
-      return $mdMedia(sgConstant['gt-md']);
-    }, function(newVal) {
-      $scope.isGtMedium = newVal;
-      if (newVal) {
-        $scope.leftIsClose = false;
-      }
-    });
 
     function leftIsClose() {
       return !$mdSidenav('left').isOpen();
@@ -106,14 +116,6 @@
       else
         $log.debug('untrap error');
     }
-
-    // Listen to HTTP errors broadcasted from HTTP interceptor
-    $rootScope.$on('http:Error', onHttpError);
-
-    if (sgSettings.activeUser('path').calendar) {
-      // Fetch Calendar alarms
-      Alarm.getAlarms();
-    }
   }
 
   angular.module('SOGo.Common')
diff --git a/UI/WebServerResources/js/Mailer/MailboxController.js b/UI/WebServerResources/js/Mailer/MailboxController.js
index 6f3ac3acf..3d375d1e3 100644
--- a/UI/WebServerResources/js/Mailer/MailboxController.js
+++ b/UI/WebServerResources/js/Mailer/MailboxController.js
@@ -117,6 +117,11 @@
       return vm.selectedFolder.$compact();
     }
 
+    this.centerIsClose = function(navController_centerIsClose) {
+      // Allow the messages list to be hidden only if a message is selected
+      return this.selectedFolder.hasSelectedMessage() && !!navController_centerIsClose;
+    };
+
     this.sort = function(field) {
       vm.selectedFolder.$filter({ sort: field });
     };