diff options
author | Alon Zakai <alonzakai@gmail.com> | 2014-05-13 10:48:04 -0700 |
---|---|---|
committer | Alon Zakai <alonzakai@gmail.com> | 2014-05-13 10:48:04 -0700 |
commit | bcc312a226fd9b719dc00d569afabc62adc2f712 (patch) | |
tree | 0922b02f2650d4aeb816b6d0437b7a9fb170fd23 | |
parent | 87d810fc5e78473fc73eb09258c41f40830b7602 (diff) | |
parent | e0a636a2963266bb80469f90103362fc79eb1727 (diff) |
Merge pull request #2353 from mhenschel/master
emscripten_async_wget2 progress callback only working on mozilla browsers
-rw-r--r-- | AUTHORS | 1 | ||||
-rw-r--r-- | src/library_browser.js | 4 |
2 files changed, 3 insertions, 2 deletions
@@ -138,3 +138,4 @@ a license to everyone to use it as detailed in LICENSE.) * Guillaume Blanc <guillaumeblanc.sc@gmail.com> * Usagi Ito <usagi@WonderRabbitProject.net> * Camilo Polymeris <cpolymeris@gmail.com> +* Markus Henschel <markus.henschel@yager.de> diff --git a/src/library_browser.js b/src/library_browser.js index fce7bdd5..07d33b32 100644 --- a/src/library_browser.js +++ b/src/library_browser.js @@ -765,8 +765,8 @@ mergeInto(LibraryManager.library, { // PROGRESS http.onprogress = function http_onprogress(e) { - if (e.lengthComputable || (e.lengthComputable === undefined && e.totalSize != 0)) { - var percentComplete = (e.position / e.totalSize)*100; + if (e.lengthComputable || (e.lengthComputable === undefined && e.total != 0)) { + var percentComplete = (e.loaded / e.total)*100; if (onprogress) Runtime.dynCall('vii', onprogress, [arg, percentComplete]); } }; |