You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by pu...@apache.org on 2015/03/13 19:28:32 UTC
js commit: [CB-8667][Windows]Handle case where checking for NORESULT
returns falsy because NORESULT == 0
Repository: cordova-js
Updated Branches:
refs/heads/master a79472a4b -> 214f9d335
[CB-8667][Windows]Handle case where checking for NORESULT returns falsy because NORESULT == 0
Project: http://git-wip-us.apache.org/repos/asf/cordova-js/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-js/commit/214f9d33
Tree: http://git-wip-us.apache.org/repos/asf/cordova-js/tree/214f9d33
Diff: http://git-wip-us.apache.org/repos/asf/cordova-js/diff/214f9d33
Branch: refs/heads/master
Commit: 214f9d3353736a3371e78923c9802f7c04f9c854
Parents: a79472a
Author: Jesse MacFadyen <pu...@gmail.com>
Authored: Fri Mar 13 00:26:38 2015 -0700
Committer: Jesse MacFadyen <pu...@gmail.com>
Committed: Fri Mar 13 00:26:38 2015 -0700
----------------------------------------------------------------------
src/windows/exec.js | 20 +++++++++++++++++---
1 file changed, 17 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/214f9d33/src/windows/exec.js
----------------------------------------------------------------------
diff --git a/src/windows/exec.js b/src/windows/exec.js
index 04a9458..88d34c0 100644
--- a/src/windows/exec.js
+++ b/src/windows/exec.js
@@ -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) {
+ 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) {
+ 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
});
@@ -86,4 +100,4 @@ module.exports = function (success, fail, service, action, args) {
fail("Missing Command Error");
}
}
-};
\ No newline at end of file
+};
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org