rmorawski/standardnotes-app-web
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix empty successful response handling for actions

Browse Source
This commit is contained in:
Mo Bitar
2019-06-04 13:09:04 -05:00
parent 44c0a336c2
commit 02fe9dd6b0
4 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/assets/javascripts/app/directives/views/actionsMenu.js
View File

@@ -31,11 +31,13 @@ class ActionsMenu {
}
return;
}
action.running = true;
actionsManager.executeAction(action, extension, $scope.item, function(response){
if(!response) {
actionsManager.executeAction(action, extension, $scope.item, (response, error) => {
if(error) {
return;
}
action.running = false;
$scope.handleActionResponse(action, response);

16
app/assets/javascripts/app/services/actionsManager.js
View File

@@ -54,10 +54,10 @@ class ActionsManager {
async executeAction(action, extension, item, callback) {
var customCallback = (response) => {
var customCallback = (response, error) => {
action.running = false;
this.$timeout(() => {
callback(response);
callback(response, error);
})
}
@@ -127,11 +127,10 @@ class ActionsManager {
action.error = false;
handleResponseDecryption(response, await this.authManager.keys(), true);
}, (response) => {
if(response && response.error) {
alert("An issue occurred while processing this action. Please try again.");
}
let error = (response && response.error) || {message: "An issue occurred while processing this action. Please try again."}
alert(error.message);
action.error = true;
customCallback(null);
customCallback(null, error);
})
}
break;
@@ -142,9 +141,10 @@ class ActionsManager {
action.error = false;
handleResponseDecryption(response, await this.authManager.keys(), false);
}, (response) => {
alert("An issue occurred while processing this action. Please try again.");
let error = (response && response.error) || {message: "An issue occurred while processing this action. Please try again."}
alert(error.message);
action.error = true;
customCallback(null);
customCallback(null, error);
})
break;