[BlackBerry10] Revert the move of webworks.exec so that plugins that rely on it can be built properly.
Reviewed by Bryan Higgins <bhigg...@blackberry.com> Project: http://git-wip-us.apache.org/repos/asf/cordova-js/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-js/commit/8b8e7bb0 Tree: http://git-wip-us.apache.org/repos/asf/cordova-js/tree/8b8e7bb0 Diff: http://git-wip-us.apache.org/repos/asf/cordova-js/diff/8b8e7bb0 Branch: refs/heads/master Commit: 8b8e7bb07ef91e2d22202f8109a2f88b4cc6ec6b Parents: 56c5314 Author: Jeffrey Heifetz <jheif...@blackberry.com> Authored: Thu Mar 28 22:38:53 2013 -0400 Committer: Bryan Higgins <bhigg...@blackberry.com> Committed: Fri May 3 09:49:38 2013 -0400 ---------------------------------------------------------------------- lib/blackberry10/exec.js | 78 +--------------------------- lib/scripts/bootstrap-blackberry10.js | 77 +++++++++++++++++++++++++++ 2 files changed, 78 insertions(+), 77 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-js/blob/8b8e7bb0/lib/blackberry10/exec.js ---------------------------------------------------------------------- diff --git a/lib/blackberry10/exec.js b/lib/blackberry10/exec.js index 25ec0ae..5aa81c3 100644 --- a/lib/blackberry10/exec.js +++ b/lib/blackberry10/exec.js @@ -28,6 +28,7 @@ var cordova = require('cordova'), 'Logger' : require('cordova/plugin/blackberry10/logger'), 'Notification' : require('cordova/plugin/blackberry10/notification'), 'Media': require('cordova/plugin/blackberry10/media'), + 'File' : require('cordova/plugin/blackberry10/file'), 'InAppBrowser' : require('cordova/plugin/blackberry10/InAppBrowser'), 'FileTransfer': require('cordova/plugin/blackberry10/fileTransfer') }; @@ -52,80 +53,3 @@ module.exports = function (success, fail, service, action, args) { } return webworks.exec(success, fail, service, action, args); }; - -function RemoteFunctionCall(functionUri) { - var params = {}; - - function composeUri() { - return require("cordova/plugin/blackberry10/utils").getURIPrefix() + functionUri; - } - - function createXhrRequest(uri, isAsync) { - var request = new XMLHttpRequest(); - request.open("POST", uri, isAsync); - request.setRequestHeader("Content-Type", "application/json"); - return request; - } - - this.addParam = function (name, value) { - params[name] = encodeURIComponent(JSON.stringify(value)); - }; - - this.makeSyncCall = function (success, error) { - var requestUri = composeUri(), - request = createXhrRequest(requestUri, false), - response, - errored, - cb, - data; - - request.send(JSON.stringify(params)); - response = JSON.parse(decodeURIComponent(request.responseText) || "null"); - return response; - }; -} - -window.webworks = { - exec: function (success, fail, service, action, args) { - var uri = service + "/" + action, - request = new RemoteFunctionCall(uri), - callbackId = service + cordova.callbackId++, - response, - name, - didSucceed; - - for (name in args) { - if (Object.hasOwnProperty.call(args, name)) { - request.addParam(name, args[name]); - } - } - - cordova.callbacks[callbackId] = {success:success, fail:fail}; - request.addParam("callbackId", callbackId); - - response = request.makeSyncCall(); - - //Old WebWorks Extension success - if (response.code === 42) { - if (success) { - success(response.data, response); - } - delete cordova.callbacks[callbackId]; - } else 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); - } - }, - defineReadOnlyField: function (obj, field, value) { - Object.defineProperty(obj, field, { - "value": value, - "writable": false - }); - }, - event: require("cordova/plugin/blackberry10/event") -}; http://git-wip-us.apache.org/repos/asf/cordova-js/blob/8b8e7bb0/lib/scripts/bootstrap-blackberry10.js ---------------------------------------------------------------------- diff --git a/lib/scripts/bootstrap-blackberry10.js b/lib/scripts/bootstrap-blackberry10.js index e1c2b83..e359a15 100644 --- a/lib/scripts/bootstrap-blackberry10.js +++ b/lib/scripts/bootstrap-blackberry10.js @@ -47,6 +47,83 @@ } }; + function RemoteFunctionCall(functionUri) { + var params = {}; + + function composeUri() { + return require("cordova/plugin/blackberry10/utils").getURIPrefix() + functionUri; + } + + function createXhrRequest(uri, isAsync) { + var request = new XMLHttpRequest(); + request.open("POST", uri, isAsync); + request.setRequestHeader("Content-Type", "application/json"); + return request; + } + + this.addParam = function (name, value) { + params[name] = encodeURIComponent(JSON.stringify(value)); + }; + + this.makeSyncCall = function (success, error) { + var requestUri = composeUri(), + request = createXhrRequest(requestUri, false), + response, + errored, + cb, + data; + + request.send(JSON.stringify(params)); + response = JSON.parse(decodeURIComponent(request.responseText) || "null"); + return response; + }; + } + + window.webworks = { + exec: function (success, fail, service, action, args) { + var uri = service + "/" + action, + request = new RemoteFunctionCall(uri), + callbackId = service + cordova.callbackId++, + response, + name, + didSucceed; + + for (name in args) { + if (Object.hasOwnProperty.call(args, name)) { + request.addParam(name, args[name]); + } + } + + cordova.callbacks[callbackId] = {success:success, fail:fail}; + request.addParam("callbackId", callbackId); + + response = request.makeSyncCall(); + + //Old WebWorks Extension success + if (response.code === 42) { + if (success) { + success(response.data, response); + } + delete cordova.callbacks[callbackId]; + } else 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); + } + }, + defineReadOnlyField: function (obj, field, value) { + Object.defineProperty(obj, field, { + "value": value, + "writable": false + }); + }, + event: require("cordova/plugin/blackberry10/event") + }; + //Fire webworks ready once plugin javascript has been loaded pluginUtils.getPlugins( function (plugins) {