Publishing load-progress events. Relates to #185.

ivmartel · Nov 19, 2015 · 66c4e33 · 66c4e33
1 parent 09e97aa
commit 66c4e33
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 2 deletions.
diff --git a/src/app/application.js b/src/app/application.js
@@ -1341,6 +1341,7 @@ dwv.App = function ()
      */
     function onLoadProgress(event)
     {
+        fireEvent(event);
         if( event.lengthComputable )
         {
             var percent = Math.round((event.loaded / event.total) * 100);

diff --git a/src/io/file.js b/src/io/file.js
@@ -145,7 +145,8 @@ dwv.io.File.createProgressHandler = function (n, calculator, baseHandler) {
         if( event.lengthComputable )
         {
             var percent = Math.round((event.loaded / event.total) * 100);
-            var ev = {lengthComputable: true, loaded: calculator(n, percent), total: 100};
+            var ev = {type: "load-progress", lengthComputable: true, 
+                loaded: calculator(n, percent), total: 100};
             baseHandler(ev);
         }
     };

diff --git a/src/io/url.js b/src/io/url.js
@@ -145,7 +145,8 @@ dwv.io.Url.createProgressHandler = function (n, calculator, baseHandler) {
         if( event.lengthComputable )
         {
             var percent = Math.round((event.loaded / event.total) * 100);
-            var ev = {lengthComputable: true, loaded: calculator(n, percent), total: 100};
+            var ev = {type: "load-progress", lengthComputable: true, 
+                    loaded: calculator(n, percent), total: 100};
             baseHandler(ev);
         }
     };

diff --git a/viewers/mobile/applauncher.js b/viewers/mobile/applauncher.js
@@ -24,6 +24,7 @@ $(document).ready( function()
     // example app listening
     //var listener = function (event) { console.log("event: "+event.type); };
     //myapp.addEventListener("load-end", listener);
+    //myapp.addEventListener("load-progress", listener);
     //myapp.addEventListener("draw-create", listener);
     //myapp.addEventListener("draw-move", listener);
     //myapp.addEventListener("draw-change", listener);