split busy into inbox/mailbox busy
This commit is contained in:
+8
-8
@@ -805,14 +805,13 @@ angular.module('Application').controller('AppController', ['$scope', '$location'
|
||||
};
|
||||
|
||||
$scope.email = {
|
||||
busy: false,
|
||||
|
||||
enableMailbox: true,
|
||||
mailboxName: '',
|
||||
mailboxDomain: null,
|
||||
currentMailboxName: '',
|
||||
currentMailboxDomainName: '',
|
||||
mailboxError: {},
|
||||
mailboxBusy: false,
|
||||
|
||||
enableInbox: true,
|
||||
inboxName: '',
|
||||
@@ -820,6 +819,7 @@ angular.module('Application').controller('AppController', ['$scope', '$location'
|
||||
currentInboxName: '',
|
||||
currentInboxDomainName: '',
|
||||
inboxError: {},
|
||||
inboxBusy: false,
|
||||
|
||||
show: function () {
|
||||
var app = $scope.app;
|
||||
@@ -843,7 +843,7 @@ angular.module('Application').controller('AppController', ['$scope', '$location'
|
||||
|
||||
submitMailbox: function () {
|
||||
$scope.email.error = {};
|
||||
$scope.email.busy = true;
|
||||
$scope.email.mailboxBusy = true;
|
||||
|
||||
var data = {
|
||||
enable: $scope.email.enableMailbox === '1'
|
||||
@@ -856,7 +856,7 @@ angular.module('Application').controller('AppController', ['$scope', '$location'
|
||||
|
||||
Client.configureApp($scope.app.id, 'mailbox', data, function (error) {
|
||||
if (error && error.statusCode === 400) {
|
||||
$scope.email.busy = false;
|
||||
$scope.email.mailboxBusy = false;
|
||||
$scope.email.error.mailboxName = error.message;
|
||||
$scope.emailForm.$setPristine();
|
||||
return;
|
||||
@@ -875,14 +875,14 @@ angular.module('Application').controller('AppController', ['$scope', '$location'
|
||||
$scope.email.currentMailboxName = $scope.app.mailboxName || '';
|
||||
$scope.email.currentMailboxDomainName = $scope.email.mailboxDomain ? $scope.email.mailboxDomain.domain : '';
|
||||
|
||||
$timeout(function () { $scope.email.busy = false; }, 1000);
|
||||
$timeout(function () { $scope.email.mailboxBusy = false; }, 1000);
|
||||
});
|
||||
});
|
||||
},
|
||||
|
||||
submitInbox: function () {
|
||||
$scope.email.error = {};
|
||||
$scope.email.busy = true;
|
||||
$scope.email.inboxBusy = true;
|
||||
|
||||
var data = {
|
||||
enable: $scope.email.enableInbox === '1'
|
||||
@@ -895,7 +895,7 @@ angular.module('Application').controller('AppController', ['$scope', '$location'
|
||||
|
||||
Client.configureApp($scope.app.id, 'inbox', data, function (error) {
|
||||
if (error && error.statusCode === 400) {
|
||||
$scope.email.busy = false;
|
||||
$scope.email.inboxBusy = false;
|
||||
$scope.email.error.inboxName = error.message;
|
||||
$scope.inboxForm.$setPristine();
|
||||
return;
|
||||
@@ -914,7 +914,7 @@ angular.module('Application').controller('AppController', ['$scope', '$location'
|
||||
$scope.email.currentInboxName = $scope.app.inboxName || '';
|
||||
$scope.email.currentInboxDomainName = $scope.email.inboxDomain ? $scope.email.inboxDomain.domain : '';
|
||||
|
||||
$timeout(function () { $scope.email.busy = false; }, 1000);
|
||||
$timeout(function () { $scope.email.inboxBusy = false; }, 1000);
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user