aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlon Zakai <alonzakai@gmail.com>2012-07-23 14:05:05 -0700
committerAlon Zakai <alonzakai@gmail.com>2012-07-23 14:05:05 -0700
commit463a7b1af8320da72c2b32289c911f25ccf54330 (patch)
tree246e645bd26f29bae77edc22a3c99e43a98d48d8
parenta389d5daf6446dfd0c703c362b042b19b8d9578f (diff)
everyone is confused about fullScreen vs fullscreen
-rw-r--r--src/library_browser.js8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/library_browser.js b/src/library_browser.js
index b4993557..311f3922 100644
--- a/src/library_browser.js
+++ b/src/library_browser.js
@@ -136,7 +136,7 @@ mergeInto(LibraryManager.library, {
cleanedUp = true;
}
};
- setTimeout(audio.onerror, 10000); // workaround for chromium bug 124926 (still no audio with this, but at least we don't hang)
+ setTimeout(audio.onerror, 5000); // workaround for chromium bug 124926 (still no audio with this, but at least we don't hang)
audio.src = url;
} else {
Module["preloadedAudios"][name] = new Audio(); // empty shim
@@ -220,9 +220,9 @@ mergeInto(LibraryManager.library, {
var canvas = Module.canvas;
function fullScreenChange() {
if (Module['onFullScreen']) Module['onFullScreen']();
- if (document['webkitFullScreenElement'] === canvas ||
- document['mozFullScreenElement'] === canvas ||
- document['fullScreenElement'] === canvas) {
+ if ((document['webkitFullScreenElement'] || document['webkitFullscreenElement'] ||
+ document['mozFullScreenElement'] || document['mozFullscreenElement'] ||
+ document['fullScreenElement'] || document['fullscreenElement']) === canvas) {
canvas.requestPointerLock = canvas['requestPointerLock'] ||
canvas['mozRequestPointerLock'] ||
canvas['webkitRequestPointerLock'];