github/cordova-android
github/cordova-android
4
0
Fork 1
mirror of https://github.com/apache/cordova-android.git synced 2025-04-28 22:10:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

CB-10498: Resume event should be sticky if it has a plugin result

Browse Source
This commit is contained in:
riknoll 2016-02-03 13:12:21 -08:00
parent 2ac191fbb8
commit d7e111fb71
2 changed files with 49 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
bin/templates/project/assets/www/cordova.js vendored
View File

@ -1,5 +1,5 @@
// Platform: android // Platform: android
// ded62dda172755defaf75378ed007dc05730ec22 // 533e1bfdbc57d54106ca39a02b21a1909f84fda7
/* /*
Licensed to the Apache Software Foundation (ASF) under one Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file or more contributor license agreements. See the NOTICE file
@ -330,7 +330,7 @@ module.exports = cordova;
}); });
// file: /Users/steveng/repo/cordova/cordova-android/cordova-js-src/android/nativeapiprovider.js // file: cordova-android/cordova-js-src/android/nativeapiprovider.js
define("cordova/android/nativeapiprovider", function(require, exports, module) { define("cordova/android/nativeapiprovider", function(require, exports, module) {
/** /**
@ -353,7 +353,7 @@ module.exports = {
}); });
// file: /Users/steveng/repo/cordova/cordova-android/cordova-js-src/android/promptbasednativeapi.js // file: cordova-android/cordova-js-src/android/promptbasednativeapi.js
define("cordova/android/promptbasednativeapi", function(require, exports, module) { define("cordova/android/promptbasednativeapi", function(require, exports, module) {
/** /**
@ -862,7 +862,7 @@ module.exports = channel;
}); });
// file: /Users/steveng/repo/cordova/cordova-android/cordova-js-src/exec.js // file: cordova-android/cordova-js-src/exec.js
define("cordova/exec", function(require, exports, module) { define("cordova/exec", function(require, exports, module) {
/** /**
@ -1611,9 +1611,12 @@ exports.reset();
}); });
// file: /Users/steveng/repo/cordova/cordova-android/cordova-js-src/platform.js // file: cordova-android/cordova-js-src/platform.js
define("cordova/platform", function(require, exports, module) { define("cordova/platform", function(require, exports, module) {
// The last resume event that was received that had the result of a plugin call.
var lastResumeEvent = null;
module.exports = { module.exports = {
id: 'android', id: 'android',
bootstrap: function() { bootstrap: function() {
@ -1653,6 +1656,19 @@ module.exports = {
bindButtonChannel('volumeup'); bindButtonChannel('volumeup');
bindButtonChannel('volumedown'); bindButtonChannel('volumedown');
// The resume event is not "sticky", but it is possible that the event
// will contain the result of a plugin call. We need to ensure that the
// plugin result is delivered even after the event is fired (CB-10498)
var cordovaAddEventListener = document.addEventListener;
document.addEventListener = function(evt, handler, capture) {
cordovaAddEventListener(evt, handler, capture);
if (evt === 'resume' && lastResumeEvent) {
handler(lastResumeEvent);
}
};
// Let native code know we are all done on the JS side. // Let native code know we are all done on the JS side.
// Native code will then un-hide the WebView. // Native code will then un-hide the WebView.
channel.onCordovaReady.subscribe(function() { channel.onCordovaReady.subscribe(function() {
@ -1691,6 +1707,10 @@ function onMessageFromNative(msg) {
} }
msg.pendingResult.result = res; msg.pendingResult.result = res;
} }
// Save the plugin result so that it can be delivered to the js
// even if they miss the initial firing of the event
lastResumeEvent = msg;
} }
cordova.fireDocumentEvent(action, msg); cordova.fireDocumentEvent(action, msg);
break; break;
@ -1701,7 +1721,7 @@ function onMessageFromNative(msg) {
}); });
// file: /Users/steveng/repo/cordova/cordova-android/cordova-js-src/plugin/android/app.js // file: cordova-android/cordova-js-src/plugin/android/app.js
define("cordova/plugin/android/app", function(require, exports, module) { define("cordova/plugin/android/app", function(require, exports, module) {
var exec = require('cordova/exec'); var exec = require('cordova/exec');

20
cordova-js-src/platform.js vendored
View File

@ -19,6 +19,9 @@
* *
*/ */
// The last resume event that was received that had the result of a plugin call.
var lastResumeEvent = null;
module.exports = { module.exports = {
id: 'android', id: 'android',
bootstrap: function() { bootstrap: function() {
@ -58,6 +61,19 @@ module.exports = {
bindButtonChannel('volumeup'); bindButtonChannel('volumeup');
bindButtonChannel('volumedown'); bindButtonChannel('volumedown');
// The resume event is not "sticky", but it is possible that the event
// will contain the result of a plugin call. We need to ensure that the
// plugin result is delivered even after the event is fired (CB-10498)
var cordovaAddEventListener = document.addEventListener;
document.addEventListener = function(evt, handler, capture) {
cordovaAddEventListener(evt, handler, capture);
if (evt === 'resume' && lastResumeEvent) {
handler(lastResumeEvent);
}
};
// Let native code know we are all done on the JS side. // Let native code know we are all done on the JS side.
// Native code will then un-hide the WebView. // Native code will then un-hide the WebView.
channel.onCordovaReady.subscribe(function() { channel.onCordovaReady.subscribe(function() {
@ -96,6 +112,10 @@ function onMessageFromNative(msg) {
} }
msg.pendingResult.result = res; msg.pendingResult.result = res;
} }
// Save the plugin result so that it can be delivered to the js
// even if they miss the initial firing of the event
lastResumeEvent = msg;
} }
cordova.fireDocumentEvent(action, msg); cordova.fireDocumentEvent(action, msg);
break; break;