From 6918650f5bc6260b8c923c28688ca888fda6f61a Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Wed, 25 Nov 2015 11:12:30 -0500 Subject: [PATCH] (js) Close sidenav on small devices --- UI/WebServerResources/js/Common/navController.js | 8 ++++---- .../js/Contacts/AddressBooksController.js | 7 +++++-- UI/WebServerResources/js/Mailer/MailboxesController.js | 7 +++++-- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/UI/WebServerResources/js/Common/navController.js b/UI/WebServerResources/js/Common/navController.js index b13f8fdef..4211af44a 100644 --- a/UI/WebServerResources/js/Common/navController.js +++ b/UI/WebServerResources/js/Common/navController.js @@ -45,10 +45,10 @@ // templateUrl: 'bottomSheetTemplate.html' // }); // }; - $scope.toggleDetailView = function() { - var detail = angular.element(document.getElementById('detailView')); - detail.toggleClass('sg-close'); - }; + // $scope.toggleDetailView = function() { + // var detail = angular.element(document.getElementById('detailView')); + // detail.toggleClass('sg-close'); + // }; $scope.$watch(function() { return $mdMedia(sgConstant['gt-md']); }, function(newVal) { diff --git a/UI/WebServerResources/js/Contacts/AddressBooksController.js b/UI/WebServerResources/js/Contacts/AddressBooksController.js index d70ca3983..019fdacd2 100644 --- a/UI/WebServerResources/js/Contacts/AddressBooksController.js +++ b/UI/WebServerResources/js/Contacts/AddressBooksController.js @@ -6,8 +6,8 @@ /** * @ngInject */ - AddressBooksController.$inject = ['$state', '$scope', '$rootScope', '$stateParams', '$timeout', '$mdDialog', '$mdToast', 'FileUploader', 'sgFocus', 'Card', 'AddressBook', 'Dialog', 'sgSettings', 'User', 'stateAddressbooks']; - function AddressBooksController($state, $scope, $rootScope, $stateParams, $timeout, $mdDialog, $mdToast, FileUploader, focus, Card, AddressBook, Dialog, Settings, User, stateAddressbooks) { + AddressBooksController.$inject = ['$state', '$scope', '$rootScope', '$stateParams', '$timeout', '$mdDialog', '$mdToast', '$mdMedia', '$mdSidenav', 'FileUploader', 'sgFocus', 'Card', 'AddressBook', 'Dialog', 'sgSettings', 'User', 'stateAddressbooks']; + function AddressBooksController($state, $scope, $rootScope, $stateParams, $timeout, $mdDialog, $mdToast, $mdMedia, $mdSidenav, FileUploader, focus, Card, AddressBook, Dialog, Settings, User, stateAddressbooks) { var vm = this; vm.activeUser = Settings.activeUser; @@ -30,6 +30,9 @@ vm.editMode != folder.id) { vm.editMode = false; AddressBook.$query.value = ''; + // Close sidenav on small devices + if ($mdMedia('sm')) + $mdSidenav('left').close(); $state.go('app.addressbook', {addressbookId: folder.id}); } else { diff --git a/UI/WebServerResources/js/Mailer/MailboxesController.js b/UI/WebServerResources/js/Mailer/MailboxesController.js index 5f4940ac7..99fba781c 100644 --- a/UI/WebServerResources/js/Mailer/MailboxesController.js +++ b/UI/WebServerResources/js/Mailer/MailboxesController.js @@ -6,8 +6,8 @@ /** * @ngInject */ - MailboxesController.$inject = ['$state', '$timeout', '$mdDialog', 'sgFocus', 'encodeUriFilter', 'Dialog', 'sgSettings', 'Account', 'Mailbox', 'VirtualMailbox', 'User', 'Preferences', 'stateAccounts']; - function MailboxesController($state, $timeout, $mdDialog, focus, encodeUriFilter, Dialog, Settings, Account, Mailbox, VirtualMailbox, User, Preferences, stateAccounts) { + MailboxesController.$inject = ['$state', '$timeout', '$mdDialog', '$mdMedia', '$mdSidenav', 'sgFocus', 'encodeUriFilter', 'Dialog', 'sgSettings', 'Account', 'Mailbox', 'VirtualMailbox', 'User', 'Preferences', 'stateAccounts']; + function MailboxesController($state, $timeout, $mdDialog, $mdMedia, $mdSidenav, focus, encodeUriFilter, Dialog, Settings, Account, Mailbox, VirtualMailbox, User, Preferences, stateAccounts) { var vm = this, account, mailbox; @@ -221,6 +221,9 @@ vm.editMode = false; vm.showingAdvancedSearch = false; vm.service.$virtualMode = false; + // Close sidenav on small devices + if ($mdMedia('sm')) + $mdSidenav('left').close(); $state.go('mail.account.mailbox', { accountId: account.id, mailboxId: encodeUriFilter(folder.path) }); }