(js) Catch some exceptions to avoid console errors
parent
37074086cf
commit
60bbe26289
|
@ -7,7 +7,7 @@
|
||||||
xmlns:label="OGo:label"
|
xmlns:label="OGo:label"
|
||||||
>
|
>
|
||||||
<md-dialog flex="50" flex-sm="80" flex-xs="100">
|
<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">
|
<div class="md-toolbar-tools">
|
||||||
<md-icon class="material-icons sg-icon-toolbar-bg">folder_shared</md-icon>
|
<md-icon class="material-icons sg-icon-toolbar-bg">folder_shared</md-icon>
|
||||||
<div class="pseudo-input-container md-flex">
|
<div class="pseudo-input-container md-flex">
|
||||||
|
|
|
@ -16,6 +16,7 @@
|
||||||
vm.selectedUid = null;
|
vm.selectedUid = null;
|
||||||
vm.userToAdd = '';
|
vm.userToAdd = '';
|
||||||
vm.searchText = '';
|
vm.searchText = '';
|
||||||
|
vm.folderClassName = folderClassName;
|
||||||
vm.templateName = templateName;
|
vm.templateName = templateName;
|
||||||
vm.userFilter = userFilter;
|
vm.userFilter = userFilter;
|
||||||
vm.closeModal = closeModal;
|
vm.closeModal = closeModal;
|
||||||
|
@ -29,6 +30,13 @@
|
||||||
vm.confirmation = { showing: false,
|
vm.confirmation = { showing: false,
|
||||||
message: ''};
|
message: ''};
|
||||||
|
|
||||||
|
function folderClassName() {
|
||||||
|
if (angular.isFunction(folder.getClassName))
|
||||||
|
return folder.getClassName('bg');
|
||||||
|
else
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
function templateName(user) {
|
function templateName(user) {
|
||||||
// Check if user is anonymous and if a specific template must be used
|
// Check if user is anonymous and if a specific template must be used
|
||||||
var isAnonymous = $document[0].getElementById('UIxAnonymousUserRightsEditor') && user.$isAnonymous();
|
var isAnonymous = $document[0].getElementById('UIxAnonymousUserRightsEditor') && user.$isAnonymous();
|
||||||
|
|
|
@ -172,6 +172,7 @@
|
||||||
stateMessage: message
|
stateMessage: message
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
.catch() // Cancel
|
||||||
.finally(function() {
|
.finally(function() {
|
||||||
vm.messageDialog = null;
|
vm.messageDialog = null;
|
||||||
});
|
});
|
||||||
|
|
|
@ -55,6 +55,11 @@
|
||||||
window.CKEDITOR.addCss('.cke_editable { font-size: ' + data.SOGoMailComposeFontSize + 'px; }');
|
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 convert our list of autoReplyEmailAddresses/forwardAddress into a string.
|
||||||
// We also convert our date objects into real date, otherwise we'll have strings
|
// 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.
|
// or undefined values and the md-datepicker does NOT like this.
|
||||||
|
|
|
@ -148,6 +148,8 @@
|
||||||
}).then(function() {
|
}).then(function() {
|
||||||
vm.preferences.defaults.AuxiliaryMailAccounts[index] = account;
|
vm.preferences.defaults.AuxiliaryMailAccounts[index] = account;
|
||||||
form.$setDirty();
|
form.$setDirty();
|
||||||
|
}, function() {
|
||||||
|
// Cancel
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue