commit 1896d2cd1584259faa9ec717f2e1883b44830bde
author Bryan Higgins <bhiggins@blackberry.com> Tue Nov 19 10:03:22 2013 -0500
committer Bryan Higgins <bhiggins@blackberry.com> Tue Nov 19 10:03:22 2013 -0500
tree 11d128ea2b2abb6d5719c06cdb1724f6450d478f
parent 3c5c5d01b3668f2bd2f19b40b2e645bac2e629a3

Update cordova-js

blackberry10/javascript/cordova.blackberry10.js

diff --git a/blackberry10/javascript/cordova.blackberry10.js b/blackberry10/javascript/cordova.blackberry10.js
index 0a783fa..fac5a24 100644
--- a/blackberry10/javascript/cordova.blackberry10.js
+++ b/blackberry10/javascript/cordova.blackberry10.js
@@ -1,5 +1,5 @@
 // Platform: blackberry10
-// 3.3.0-dev-9740276
+// 3.3.0-dev-c9de1bc
 /*
  Licensed to the Apache Software Foundation (ASF) under one
  or more contributor license agreements.  See the NOTICE file
@@ -19,7 +19,7 @@
  under the License.
 */
 ;(function() {
-var CORDOVA_JS_BUILD_LABEL = '3.3.0-dev-9740276';
+var CORDOVA_JS_BUILD_LABEL = '3.3.0-dev-c9de1bc';
 // file: lib/scripts/require.js
 
 /*jshint -W079 */
@@ -795,7 +795,8 @@
 // file: lib/blackberry10/exec.js
 define("cordova/exec", function(require, exports, module) {
 
-var cordova = require('cordova');
+var cordova = require('cordova'),
+    execProxy = require('cordova/exec/proxy');
 
 function RemoteFunctionCall(functionUri) {
     var params = {};
@@ -830,6 +831,7 @@
     var uri = service + "/" + action,
     request = new RemoteFunctionCall(uri),
     callbackId = service + cordova.callbackId++,
+    proxy,
     response,
     name,
     didSucceed;
@@ -839,30 +841,39 @@
         fail: fail
     };
 
-    request.addParam("callbackId", callbackId);
+    proxy = execProxy.get(service, action);
 
-    for (name in args) {
-        if (Object.hasOwnProperty.call(args, name)) {
-            request.addParam(name, args[name]);
-        }
+    if (proxy) {
+        proxy(success, fail, args);
     }
 
-    response = request.makeSyncCall();
+    else {
 
-    if (response.code < 0) {
-        if (fail) {
-            fail(response.msg, response);
+        request.addParam("callbackId", callbackId);
+
+        for (name in args) {
+            if (Object.hasOwnProperty.call(args, name)) {
+                request.addParam(name, args[name]);
+            }
         }
-        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
-        );
+        
+        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
+            );
+        }
     }
 
 };