CB-10530 - Updated cordova.js. This closes #193
Project: http://git-wip-us.apache.org/repos/asf/cordova-ios/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-ios/commit/a36259ab Tree: http://git-wip-us.apache.org/repos/asf/cordova-ios/tree/a36259ab Diff: http://git-wip-us.apache.org/repos/asf/cordova-ios/diff/a36259ab Branch: refs/heads/master Commit: a36259abf6a671a3f5b0c47d237c29a515aaa5a8 Parents: afe1027 Author: Shazron Abdullah <[email protected]> Authored: Tue Feb 16 15:53:56 2016 -0800 Committer: Steve Gill <[email protected]> Committed: Wed Feb 24 16:02:50 2016 -0800 ---------------------------------------------------------------------- CordovaLib/cordova.js | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/a36259ab/CordovaLib/cordova.js ---------------------------------------------------------------------- diff --git a/CordovaLib/cordova.js b/CordovaLib/cordova.js index 31e929d..6f2ed60 100644 --- a/CordovaLib/cordova.js +++ b/CordovaLib/cordova.js @@ -1,5 +1,5 @@ // Platform: ios -// ded62dda172755defaf75378ed007dc05730ec22 +// 1b111058631e118dc37da473e30b60214c211d76 /* Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file @@ -817,7 +817,7 @@ module.exports = channel; }); -// file: /Users/shaz/Documents/Git/Apache/cordova-ios/cordova-js-src/exec.js +// file: /Users/shazron/Documents/git/apache/cordova-ios/cordova-js-src/exec.js define("cordova/exec", function(require, exports, module) { /*global require, module, atob, document */ @@ -935,9 +935,18 @@ function iOSExec() { } } +// CB-10530 +function proxyChanged() { + var cexec = cordovaExec(); + + return (execProxy !== cexec && // proxy objects are different + iOSExec !== cexec // proxy object is not the current iOSExec + ); +} + // CB-10106 function handleBridgeChange() { - if (execProxy !== cordovaExec()) { + if (proxyChanged()) { var commandString = commandQueue.shift(); while(commandString) { var command = JSON.parse(commandString); @@ -1536,7 +1545,7 @@ exports.reset(); }); -// file: /Users/shaz/Documents/Git/Apache/cordova-ios/cordova-js-src/platform.js +// file: /Users/shazron/Documents/git/apache/cordova-ios/cordova-js-src/platform.js define("cordova/platform", function(require, exports, module) { module.exports = { --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
