Skip to content

CB 964 #75

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
purplecabbage wants to merge 3 commits into from
Closed

CB 964 #75

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f97875b
Move exception handling into consolidated result handler, and out of …
purplecabbage Jul 22, 2014
e1e2f82
CB-964 Fire document event 'CDVCallbackError' when a callback error o…
purplecabbage Jul 22, 2014
ba0c7ff
formatting, fixed jshint issues
purplecabbage Jul 22, 2014
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
37 changes: 20 additions & 17 deletions src/cordova.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,11 +180,7 @@ var cordova = {
* Called by native code when returning successful result from an action.
*/
callbackSuccess: function(callbackId, args) {
try {
cordova.callbackFromNative(callbackId, true, args.status, [args.message], args.keepCallback);
} catch (e) {
console.log("Error in success callback: " + callbackId + " = "+e);
}
cordova.callbackFromNative(callbackId, true, args.status, [args.message], args.keepCallback);
},

/**
Expand All @@ -193,30 +189,37 @@ var cordova = {
callbackError: function(callbackId, args) {
// TODO: Deprecate callbackSuccess and callbackError in favour of callbackFromNative.
// Derive success from status.
try {
cordova.callbackFromNative(callbackId, false, args.status, [args.message], args.keepCallback);
} catch (e) {
console.log("Error in error callback: " + callbackId + " = "+e);
}
cordova.callbackFromNative(callbackId, false, args.status, [args.message], args.keepCallback);
},

/**
* Called by native code when returning the result from an action.
*/
callbackFromNative: function(callbackId, success, status, args, keepCallback) {
var callback = cordova.callbacks[callbackId];
if (callback) {
if (success && status == cordova.callbackStatus.OK) {
callback.success && callback.success.apply(null, args);
} else if (!success) {
callback.fail && callback.fail.apply(null, args);
callbackFromNative: function(callbackId, bSuccess, status, args, keepCallback) {
try {
var callback = cordova.callbacks[callbackId] || {}; // default empty obj
var cbFunk = ( bSuccess && status == cordova.callbackStatus.OK ) ? callback.success : callback.fail;
var resultText = ( bSuccess ? "Success" : "Error" );
if(cbFunk) {
cbFunk.apply(null,args);
}
else {
console.log("Callback function does not exist for " +
resultText +
" result from callbackId:" +
callbackId);
cordova.fireDocumentEvent("CDVCallbackError");
}

// Clear callback if not expecting any more results
if (!keepCallback) {
delete cordova.callbacks[callbackId];
}
}
catch(e) {
console.log("Error in " + resultText + " handler for callbackId:" + callbackId + " = " + e);
cordova.fireDocumentEvent("CDVCallbackError");
}
},
addConstructor: function(func) {
channel.onCordovaReady.subscribe(function() {
Expand Down
37 changes: 20 additions & 17 deletions src/cordova_b.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,11 +188,7 @@ var cordova = {
* Called by native code when returning successful result from an action.
*/
callbackSuccess: function(callbackId, args) {
try {
cordova.callbackFromNative(callbackId, true, args.status, [args.message], args.keepCallback);
} catch (e) {
console.log("Error in error callback: " + callbackId + " = "+e);
}
cordova.callbackFromNative(callbackId, true, args.status, [args.message], args.keepCallback);
},

/**
Expand All @@ -201,30 +197,37 @@ var cordova = {
callbackError: function(callbackId, args) {
// TODO: Deprecate callbackSuccess and callbackError in favour of callbackFromNative.
// Derive success from status.
try {
cordova.callbackFromNative(callbackId, false, args.status, [args.message], args.keepCallback);
} catch (e) {
console.log("Error in error callback: " + callbackId + " = "+e);
}
cordova.callbackFromNative(callbackId, false, args.status, [args.message], args.keepCallback);
},

/**
* Called by native code when returning the result from an action.
*/
callbackFromNative: function(callbackId, success, status, args, keepCallback) {
var callback = cordova.callbacks[callbackId];
if (callback) {
if (success && status == cordova.callbackStatus.OK) {
callback.success && callback.success.apply(null, args);
} else if (!success) {
callback.fail && callback.fail.apply(null, args);
callbackFromNative: function(callbackId, bSuccess, status, args, keepCallback) {
try {
var callback = cordova.callbacks[callbackId] || {}; // default empty obj
var cbFunk = ( bSuccess && status == cordova.callbackStatus.OK ) ? callback.success : callback.fail;
var resultText = ( bSuccess ? "Success" : "Error" );
if(cbFunk) {
cbFunk.apply(null,args);
}
else {
console.log("Callback function does not exist for " +
resultText +
" result from callbackId:" +
callbackId);
cordova.fireDocumentEvent("CDVCallbackError");
}

// Clear callback if not expecting any more results
if (!keepCallback) {
delete cordova.callbacks[callbackId];
}
}
catch(e) {
console.log("Error in " + resultText + " handler for callbackId:" + callbackId + " = " + e);
cordova.fireDocumentEvent("CDVCallbackError");
}
},
addConstructor: function(func) {
channel.onCordovaReady.subscribe(function() {
Expand Down