You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by st...@apache.org on 2016/01/21 01:59:53 UTC
[37/37] android commit: Update JS snapshot to version 5.2.0-dev (via
coho)
Update JS snapshot to version 5.2.0-dev (via coho)
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/320558a7
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/320558a7
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/320558a7
Branch: refs/heads/master
Commit: 320558a78250ed39cd7830226fe684ca182e2e43
Parents: 9ef7ddb
Author: Steve Gill <st...@gmail.com>
Authored: Wed Jan 20 16:18:53 2016 -0800
Committer: Steve Gill <st...@gmail.com>
Committed: Wed Jan 20 16:18:53 2016 -0800
----------------------------------------------------------------------
bin/templates/project/assets/www/cordova.js | 20 +++++++++++++++++---
1 file changed, 17 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/320558a7/bin/templates/project/assets/www/cordova.js
----------------------------------------------------------------------
diff --git a/bin/templates/project/assets/www/cordova.js b/bin/templates/project/assets/www/cordova.js
index 5d16101..a4d73b3 100644
--- a/bin/templates/project/assets/www/cordova.js
+++ b/bin/templates/project/assets/www/cordova.js
@@ -1,5 +1,5 @@
// Platform: android
-// 6b83950ffdd6b84977dfae49d8147ef640b8097f
+// ded62dda172755defaf75378ed007dc05730ec22
/*
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 PLATFORM_VERSION_BUILD_LABEL = '5.1.0-dev';
+var PLATFORM_VERSION_BUILD_LABEL = '5.2.0-dev';
// file: src/scripts/require.js
/*jshint -W079 */
@@ -1674,12 +1674,26 @@ function onMessageFromNative(msg) {
case 'searchbutton':
// App life cycle events
case 'pause':
- case 'resume':
// Volume events
case 'volumedownbutton':
case 'volumeupbutton':
cordova.fireDocumentEvent(action);
break;
+ case 'resume':
+ if(arguments.length > 1 && msg.pendingResult) {
+ if(arguments.length === 2) {
+ msg.pendingResult.result = arguments[1];
+ } else {
+ // The plugin returned a multipart message
+ var res = [];
+ for(var i = 1; i < arguments.length; i++) {
+ res.push(arguments[i]);
+ }
+ msg.pendingResult.result = res;
+ }
+ }
+ cordova.fireDocumentEvent(action, msg);
+ break;
default:
throw new Error('Unknown event action ' + action);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org