github/cordova-android
github/cordova-android
3
0
Fork 1
mirror of https://github.com/apache/cordova-android.git synced 2025-02-22 00:32:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update JS to new tag (again). Includes latest fix to CB-1745.

Browse Source
This commit is contained in:
Andrew Grieve 2012-10-26 16:09:54 -04:00
parent 678ae2d684
commit 3c5815ac0f
1 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
framework/assets/js/cordova.android.js
View File

@ -1,6 +1,6 @@
// commit 97a05cb0f672ee1bfb7e9e14a0dfd452d7763ba9 // commit d819e1e60599c12ac831379b06bba9110e9f1790
// File generated at :: Fri Oct 26 2012 10:37:55 GMT-0400 (EDT) // File generated at :: Fri Oct 26 2012 16:03:51 GMT-0400 (EDT)
/* /*
Licensed to the Apache Software Foundation (ASF) under one Licensed to the Apache Software Foundation (ASF) under one
@ -1001,8 +1001,8 @@ function pollOnce() {
function pollingTimerFunc() { function pollingTimerFunc() {
if (pollEnabled) { if (pollEnabled) {
pollOnce(); pollOnce();
setTimeout(pollingTimerFunc, 50); setTimeout(pollingTimerFunc, 50);
} }
} }
@ -1095,25 +1095,34 @@ function processMessage(message) {
// This is called from the NativeToJsMessageQueue.java. // This is called from the NativeToJsMessageQueue.java.
androidExec.processMessages = function(messages) { androidExec.processMessages = function(messages) {
messagesFromNative.push(messages); if (messages) {
// Check for the reentrant case, and enqueue the message if that's the case. messagesFromNative.push(messages);
if (messagesFromNative.length > 1) { while (messagesFromNative.length) {
return; messages = messagesFromNative.shift();
} // The Java side can send a * message to indicate that it
while (messagesFromNative.length) { // still has messages waiting to be retrieved.
messages = messagesFromNative[0]; // TODO(agrieve): This is currently disabled on the Java side
while (messages) { // since it breaks returning the result in exec of synchronous
// plugins. Once we remove this ability, we can remove this comment.
if (messages == '*') { if (messages == '*') {
window.setTimeout(pollOnce, 0); window.setTimeout(pollOnce, 0);
break; continue;
} }
var spaceIdx = messages.indexOf(' '); var spaceIdx = messages.indexOf(' ');
var msgLen = +messages.slice(0, spaceIdx); var msgLen = +messages.slice(0, spaceIdx);
var message = messages.substr(spaceIdx + 1, msgLen); var message = messages.substr(spaceIdx + 1, msgLen);
messages = messages.slice(spaceIdx + msgLen + 1); messages = messages.slice(spaceIdx + msgLen + 1);
processMessage(message); // Put the remaining messages back into queue in case an exec()
// is made by the callback.
if (messages) {
messagesFromNative.unshift(messages);
}
if (message) {
processMessage(message);
}
} }
messagesFromNative.shift();
} }
}; };