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:33:34 UTC
[1/3] cordova-windows git commit: Fix for callback invocation with
NO_RESULT
Repository: cordova-windows
Updated Branches:
refs/heads/master a0c041698 -> 3a0d13241
Fix for callback invocation with NO_RESULT
Due to the enumeration of cordova.callbackStatus (NO_RESULT = 0 and OK = 1), the logic used for defaulting to cordova.callbackStatus.OK will always default to cordova.callbackStatus.OK when the callbackStatus is set to cordova.callbackStatus.NO_RESULT.
This change addresses this issue by first checking if callbackOptions.status is null and defaulting to cordova.callbackStatus.OK, otherwise it will accept the callbackOptions.status value provided by the user.
Project: http://git-wip-us.apache.org/repos/asf/cordova-windows/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-windows/commit/1e4b5330
Tree: http://git-wip-us.apache.org/repos/asf/cordova-windows/tree/1e4b5330
Diff: http://git-wip-us.apache.org/repos/asf/cordova-windows/diff/1e4b5330
Branch: refs/heads/master
Commit: 1e4b5330103af18a75dd82772eab3541b6436f19
Parents: a0c0416
Author: CJRChang <CJ...@users.noreply.github.com>
Authored: Thu Mar 12 11:14:38 2015 +1000
Committer: CJRChang <CJ...@users.noreply.github.com>
Committed: Thu Mar 12 11:14:38 2015 +1000
----------------------------------------------------------------------
cordova-js-src/exec.js | 20 +++++++++++++++++---
1 file changed, 17 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-windows/blob/1e4b5330/cordova-js-src/exec.js
----------------------------------------------------------------------
diff --git a/cordova-js-src/exec.js b/cordova-js-src/exec.js
index 04a9458..d7f0c0f 100644
--- a/cordova-js-src/exec.js
+++ b/cordova-js-src/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
[2/3] cordova-windows git commit: Added check for undefined
Posted by pu...@apache.org.
Added check for undefined
Project: http://git-wip-us.apache.org/repos/asf/cordova-windows/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-windows/commit/abc7715f
Tree: http://git-wip-us.apache.org/repos/asf/cordova-windows/tree/abc7715f
Diff: http://git-wip-us.apache.org/repos/asf/cordova-windows/diff/abc7715f
Branch: refs/heads/master
Commit: abc7715fd4765d8c25a1d0244dc9e179858a3705
Parents: 1e4b533
Author: Ray Chang <CJ...@users.noreply.github.com>
Authored: Thu Mar 12 17:01:51 2015 +1000
Committer: Ray Chang <CJ...@users.noreply.github.com>
Committed: Thu Mar 12 17:01:51 2015 +1000
----------------------------------------------------------------------
cordova-js-src/exec.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-windows/blob/abc7715f/cordova-js-src/exec.js
----------------------------------------------------------------------
diff --git a/cordova-js-src/exec.js b/cordova-js-src/exec.js
index d7f0c0f..6b8a904 100644
--- a/cordova-js-src/exec.js
+++ b/cordova-js-src/exec.js
@@ -61,7 +61,7 @@ module.exports = function (success, fail, service, action, args) {
onSuccess = function (result, callbackOptions) {
callbackOptions = callbackOptions || {};
var callbackStatus;
- if (callbackOptions.status !== null) {
+ if (callbackOptions.status !== null && callbackOptions.status !== undefined) {
callbackStatus = callbackOptions.status;
}
else {
@@ -77,7 +77,7 @@ module.exports = function (success, fail, service, action, args) {
onError = function (err, callbackOptions) {
callbackOptions = callbackOptions || {};
var callbackStatus;
- if (callbackOptions.status !== null) {
+ if (callbackOptions.status !== null && callbackOptions.status !== undefined) {
callbackStatus = callbackOptions.status;
}
else {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[3/3] cordova-windows git commit: Removed verbose strict inequality
tests
Posted by pu...@apache.org.
Removed verbose strict inequality tests
Project: http://git-wip-us.apache.org/repos/asf/cordova-windows/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-windows/commit/3a0d1324
Tree: http://git-wip-us.apache.org/repos/asf/cordova-windows/tree/3a0d1324
Diff: http://git-wip-us.apache.org/repos/asf/cordova-windows/diff/3a0d1324
Branch: refs/heads/master
Commit: 3a0d13241c3419d263b60e2d72f093c1a46cd307
Parents: abc7715
Author: Jesse MacFadyen <pu...@gmail.com>
Authored: Thu Mar 12 18:29:08 2015 -0700
Committer: Jesse MacFadyen <pu...@gmail.com>
Committed: Thu Mar 12 18:29:08 2015 -0700
----------------------------------------------------------------------
cordova-js-src/exec.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-windows/blob/3a0d1324/cordova-js-src/exec.js
----------------------------------------------------------------------
diff --git a/cordova-js-src/exec.js b/cordova-js-src/exec.js
index 6b8a904..88d34c0 100644
--- a/cordova-js-src/exec.js
+++ b/cordova-js-src/exec.js
@@ -61,7 +61,7 @@ module.exports = function (success, fail, service, action, args) {
onSuccess = function (result, callbackOptions) {
callbackOptions = callbackOptions || {};
var callbackStatus;
- if (callbackOptions.status !== null && callbackOptions.status !== undefined) {
+ if (callbackOptions.status != null) {
callbackStatus = callbackOptions.status;
}
else {
@@ -77,7 +77,7 @@ module.exports = function (success, fail, service, action, args) {
onError = function (err, callbackOptions) {
callbackOptions = callbackOptions || {};
var callbackStatus;
- if (callbackOptions.status !== null && callbackOptions.status !== undefined) {
+ if (callbackOptions.status != null) {
callbackStatus = callbackOptions.status;
}
else {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org