show progress on datafile download

2 files changed, 24 insertions, 29 deletions

diff --git a/src/shell.html b/src/shell.html
index 683b1b68..3a0171de 100644
--- a/src/shell.html
+++ b/src/shell.html
@@ -49,35 +49,23 @@
           }
         },
         canvas: document.getElementById('canvas'),
-          setStatus: function(text) {
-            if (Module.setStatus.interval) clearInterval(Module.setStatus.interval);
-            var m = text.match(/([^(]+)\((\d+(\.\d+)?)\/(\d+)\)/);
-            var statusElement = document.getElementById('status');
-            var progressElement = document.getElementById('progress');
-            if (m) {
-              text = m[1];
-              progressElement.value = parseInt(m[2])*100;
-              progressElement.max = parseInt(m[4])*100;
-              progressElement.hidden = false;
-            } else {
-              progressElement.value = null;
-              progressElement.max = null;
-              progressElement.hidden = true;
-            }
-            statusElement.innerHTML = text;
-            if (text) {
-              var counter = 0;
-              Module.setStatus.interval = setInterval(function() {
-                counter++;
-                counter %= 3;
-                var dots = ' ';
-                for (var i = 0; i < counter; i++) dots += '.';
-                dots += '*';
-                for (var i = counter; i < 2; i++) dots += '.';
-                statusElement.innerHTML = text.replace('...', dots);
-              }, 300);
-            }
-          },
+        setStatus: function(text) {
+          if (Module.setStatus.interval) clearInterval(Module.setStatus.interval);
+          var m = text.match(/([^(]+)\((\d+(\.\d+)?)\/(\d+)\)/);
+          var statusElement = document.getElementById('status');
+          var progressElement = document.getElementById('progress');
+          if (m) {
+            text = m[1];
+            progressElement.value = parseInt(m[2])*100;
+            progressElement.max = parseInt(m[4])*100;
+            progressElement.hidden = false;
+          } else {
+            progressElement.value = null;
+            progressElement.max = null;
+            progressElement.hidden = true;
+          }
+          statusElement.innerHTML = text;
+        },
         totalDependencies: 0,
         monitorRunDependencies: function(left) {
           this.totalDependencies = Math.max(this.totalDependencies, left);
diff --git a/tools/file_packager.py b/tools/file_packager.py
index fdd5396c..12e42913 100644
--- a/tools/file_packager.py
+++ b/tools/file_packager.py
@@ -308,6 +308,13 @@ if has_preloaded:
 
   code += '''
     var dataFile = new XMLHttpRequest();
+    dataFile.onprogress = function(event) {
+      if (event.loaded && event.total) {
+        Module.setStatus('Downloading... (' + event.loaded + '/' + event.total + ')');
+      } else {
+        Module.setStatus('Downloading...');
+      }
+    }
     dataFile.open('GET', '%s', true);
     dataFile.responseType = 'arraybuffer';
     dataFile.onload = function() {