aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlon Zakai <alonzakai@gmail.com>2012-07-18 17:45:05 -0700
committerAlon Zakai <alonzakai@gmail.com>2012-07-18 17:49:21 -0700
commit23f7aed49d983f693c26ed3dc980e4efbd7d40eb (patch)
tree9952a57e24d3347f4c1fff55f882dee1b1836343
parenta8ffd30399bb7bdce72fbfe6f337f3c08278fcfa (diff)
balance runDependencies in createPreloadedFile
-rw-r--r--src/library.js10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/library.js b/src/library.js
index a9a94299..8bee4521 100644
--- a/src/library.js
+++ b/src/library.js
@@ -313,7 +313,7 @@ LibraryManager.library = {
ctx.drawImage(img, 0, 0);
Module["preloadedImages"][fullname] = canvas;
Browser.URLObject.revokeObjectURL(url);
- Module['removeRunDependency']();
+ removeRunDependency();
if (onload) onload();
};
img.onerror = function(event) {
@@ -331,14 +331,14 @@ LibraryManager.library = {
audio['oncanplaythrough'] = null;
Module["preloadedAudios"][fullname] = audio;
if (!audio.removedDependency) {
- Module['removeRunDependency']();
+ removeRunDependency();
audio.removedDependency = true;
}
};
audio.onerror = function(event) {
if (!audio.removedDependency) {
console.log('Audio ' + url + ' could not be decoded or timed out trying to decode');
- Module['removeRunDependency']();
+ removeRunDependency(); // keep calm and carry on
audio.removedDependency = true;
}
};
@@ -346,12 +346,14 @@ LibraryManager.library = {
audio.src = url;
} else {
Module["preloadedAudios"][fullname] = new Audio(); // empty shim
- Module['removeRunDependency']();
+ removeRunDependency();
}
} else {
if (onload) onload();
+ removeRunDependency();
}
}
+ addRunDependency();
if (typeof url == 'string') {
Browser.asyncLoad(url, function(byteArray) {
finish(byteArray);