Return-Path: X-Original-To: apmail-cordova-commits-archive@www.apache.org Delivered-To: apmail-cordova-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 45DE510727 for ; Thu, 6 Feb 2014 02:25:31 +0000 (UTC) Received: (qmail 67573 invoked by uid 500); 6 Feb 2014 02:25:31 -0000 Delivered-To: apmail-cordova-commits-archive@cordova.apache.org Received: (qmail 67518 invoked by uid 500); 6 Feb 2014 02:25:30 -0000 Mailing-List: contact commits-help@cordova.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cordova.apache.org Delivered-To: mailing list commits@cordova.apache.org Received: (qmail 67511 invoked by uid 99); 6 Feb 2014 02:25:30 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 06 Feb 2014 02:25:30 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 6D10B91D241; Thu, 6 Feb 2014 02:25:30 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: bhiggins@apache.org To: commits@cordova.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: js commit: CB-5973 blackberry: add support for sync exec Date: Thu, 6 Feb 2014 02:25:30 +0000 (UTC) Updated Branches: refs/heads/master 12a6fdbb6 -> 7d02fb809 CB-5973 blackberry: add support for sync exec Project: http://git-wip-us.apache.org/repos/asf/cordova-js/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-js/commit/7d02fb80 Tree: http://git-wip-us.apache.org/repos/asf/cordova-js/tree/7d02fb80 Diff: http://git-wip-us.apache.org/repos/asf/cordova-js/diff/7d02fb80 Branch: refs/heads/master Commit: 7d02fb809ece39ed0eceae3ae4342b394641714d Parents: 12a6fdb Author: Josh Soref Authored: Tue Feb 4 17:59:47 2014 -0500 Committer: Bryan Higgins Committed: Wed Feb 5 21:25:21 2014 -0500 ---------------------------------------------------------------------- src/blackberry10/exec.js | 38 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 36 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-js/blob/7d02fb80/src/blackberry10/exec.js ---------------------------------------------------------------------- diff --git a/src/blackberry10/exec.js b/src/blackberry10/exec.js index 31f9b7c..c48ddff 100644 --- a/src/blackberry10/exec.js +++ b/src/blackberry10/exec.js @@ -76,13 +76,24 @@ function RemoteFunctionCall(functionUri) { request.send(JSON.stringify(params)); }; + + this.makeSyncCall = function () { + var requestUri = composeUri(), + request = createXhrRequest(requestUri, false), + response; + request.send(JSON.stringify(params)); + response = JSON.parse(decodeURIComponent(request.responseText) || "null"); + return response; + }; + } -module.exports = function (success, fail, service, action, args) { +module.exports = function (success, fail, service, action, args, sync) { var uri = service + "/" + action, request = new RemoteFunctionCall(uri), callbackId = service + cordova.callbackId++, proxy, + response, name, didSucceed; @@ -107,7 +118,30 @@ module.exports = function (success, fail, service, action, args) { } } - request.makeAsyncCall(); + sync = false || arguments[5]; + + if (!sync) { + request.makeAsyncCall(); + return; + } + + response = request.makeSyncCall(); + + if (response.code < 0) { + if (fail) { + fail(response.msg, response); + } + delete cordova.callbacks[callbackId]; + } else { + didSucceed = response.code === cordova.callbackStatus.OK || response.code === cordova.callbackStatus.NO_RESULT; + cordova.callbackFromNative( + callbackId, + didSucceed, + response.code, + [ didSucceed ? response.data : response.msg ], + !!response.keepCallback + ); + } } };