You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by fi...@apache.org on 2012/03/15 20:36:25 UTC
[11/21] git commit: Fixing updated exec for iOS and removing device
from navigator (which also fixes some capture tests)
Fixing updated exec for iOS and removing device from navigator (which also fixes some capture tests)
Project: http://git-wip-us.apache.org/repos/asf/incubator-cordova-js/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cordova-js/commit/6151d7d4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-js/tree/6151d7d4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-js/diff/6151d7d4
Branch: refs/heads/master
Commit: 6151d7d47259ba8fba1d16accfa1b5d3a9b35d5b
Parents: 7547a9f
Author: Fil Maj <ma...@gmail.com>
Authored: Mon Mar 12 15:59:22 2012 -0700
Committer: Fil Maj <ma...@gmail.com>
Committed: Thu Mar 15 10:14:41 2012 -0700
----------------------------------------------------------------------
lib/exec/ios.js | 3 ++-
lib/platform/ios.js | 7 -------
2 files changed, 2 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cordova-js/blob/6151d7d4/lib/exec/ios.js
----------------------------------------------------------------------
diff --git a/lib/exec/ios.js b/lib/exec/ios.js
index 2d6f057..4291946 100644
--- a/lib/exec/ios.js
+++ b/lib/exec/ios.js
@@ -24,13 +24,14 @@ module.exports = function() {
}
var successCallback, failCallback, service, action, actionArgs;
- var callbackId = service + cordova.callbackId++;
successCallback = arguments[0];
failCallback = arguments[1];
service = arguments[2];
action = arguments[3];
actionArgs = arguments[4];
+ var callbackId = service + cordova.callbackId++;
+
// Since we need to maintain backwards compatibility, we have to pass
// an invalid callbackId even if no callback was provided since plugins
// will be expecting it. The cordova.exec() implementation allocates
http://git-wip-us.apache.org/repos/asf/incubator-cordova-js/blob/6151d7d4/lib/platform/ios.js
----------------------------------------------------------------------
diff --git a/lib/platform/ios.js b/lib/platform/ios.js
index 5a0118e..3e5edd4 100644
--- a/lib/platform/ios.js
+++ b/lib/platform/ios.js
@@ -18,13 +18,6 @@ module.exports = {
FileReader.prototype.readAsText = require('cordova/plugin/ios/FileReader').readAsText;
},
objects: {
- navigator: {
- children: {
- device: {
- path: "cordova/plugin/ios/device"
- }
- }
- },
File: { // exists natively , override
path: "cordova/plugin/File"
},