Skip to content
This repository has been archived by the owner on Jan 9, 2023. It is now read-only.

Fix for callback invocation with NO_RESULT #61

Merged
merged 2 commits into from
Mar 13, 2015
Merged

Fix for callback invocation with NO_RESULT #61

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1e4b533
Fix for callback invocation with NO_RESULT
CJRChang Mar 12, 2015
abc7715
Added check for undefined
CJRChang Mar 12, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 17 additions & 3 deletions cordova-js-src/exec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,18 +60,32 @@ module.exports = function (success, fail, service, action, args) {
// CB-5806 [Windows8] Add keepCallback support to proxy
onSuccess = function (result, callbackOptions) {
callbackOptions = callbackOptions || {};
var callbackStatus;
if (callbackOptions.status !== null && callbackOptions.status !== undefined) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So resolution sounded like if (callbackOptions.hasOwnProperty('status')) ? That ensures that even for falsy values, if they were set, they're propagated through as-is?

callbackStatus = callbackOptions.status;
}
else {
callbackStatus = cordova.callbackStatus.OK;
}
cordova.callbackSuccess(callbackOptions.callbackId || callbackId,
{
status: callbackOptions.status || cordova.callbackStatus.OK,
status: callbackStatus,
message: result,
keepCallback: callbackOptions.keepCallback || false
});
};
onError = function (err, callbackOptions) {
callbackOptions = callbackOptions || {};
var callbackStatus;
if (callbackOptions.status !== null && callbackOptions.status !== undefined) {
callbackStatus = callbackOptions.status;
}
else {
callbackStatus = cordova.callbackStatus.OK;
}
cordova.callbackError(callbackOptions.callbackId || callbackId,
{
status: callbackOptions.status || cordova.callbackStatus.ERROR,
status: callbackStatus,
message: err,
keepCallback: callbackOptions.keepCallback || false
});
Expand All @@ -86,4 +100,4 @@ module.exports = function (success, fail, service, action, args) {
fail("Missing Command Error");
}
}
};
};