(js) Catch some exceptions to avoid console errors

pull/239/head
Francis Lachapelle 2017-12-19 09:53:48 -05:00
parent 37074086cf
commit 60bbe26289
5 changed files with 17 additions and 1 deletions

View File

@ -7,7 +7,7 @@
xmlns:label="OGo:label"
>
<md-dialog flex="50" flex-sm="80" flex-xs="100">
<md-toolbar ng-class="!acl.folder.getClassName || acl.folder.getClassName('bg')">
<md-toolbar ng-class="::acl.folderClassName()">
<div class="md-toolbar-tools">
<md-icon class="material-icons sg-icon-toolbar-bg">folder_shared</md-icon>
<div class="pseudo-input-container md-flex">

View File

@ -16,6 +16,7 @@
vm.selectedUid = null;
vm.userToAdd = '';
vm.searchText = '';
vm.folderClassName = folderClassName;
vm.templateName = templateName;
vm.userFilter = userFilter;
vm.closeModal = closeModal;
@ -29,6 +30,13 @@
vm.confirmation = { showing: false,
message: ''};
function folderClassName() {
if (angular.isFunction(folder.getClassName))
return folder.getClassName('bg');
else
return false;
}
function templateName(user) {
// Check if user is anonymous and if a specific template must be used
var isAnonymous = $document[0].getElementById('UIxAnonymousUserRightsEditor') && user.$isAnonymous();

View File

@ -172,6 +172,7 @@
stateMessage: message
}
})
.catch() // Cancel
.finally(function() {
vm.messageDialog = null;
});

View File

@ -55,6 +55,11 @@
window.CKEDITOR.addCss('.cke_editable { font-size: ' + data.SOGoMailComposeFontSize + 'px; }');
}
_.forEach(data.AuxiliaryMailAccounts, function (mailAccount) {
if (isNaN(parseInt(mailAccount.port)))
mailAccount.port = null;
});
// We convert our list of autoReplyEmailAddresses/forwardAddress into a string.
// We also convert our date objects into real date, otherwise we'll have strings
// or undefined values and the md-datepicker does NOT like this.

View File

@ -148,6 +148,8 @@
}).then(function() {
vm.preferences.defaults.AuxiliaryMailAccounts[index] = account;
form.$setDirty();
}, function() {
// Cancel
});
};