postpone fragment delaying until just before sending xhr request

spiterikevin · Feb 20, 2016 · 3768a7a · 3768a7a · spiterikevin · Feb 20, 2016
1 parent d01daa9
commit 3768a7a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 11 deletions.
diff --git a/src/streaming/FragmentLoader.js b/src/streaming/FragmentLoader.js
@@ -172,7 +172,15 @@ function FragmentLoader(config) {
             }
         };
 
-        req.send();
+        //Adds the ability to delay single fragment loading time to control buffer.
+        let now = new Date().getTime();
+        if (now < request.delayLoadingTime) {
+            setTimeout(function () {
+                req.send();
+            }, (request.delayLoadingTime - now) );
+        } else {
+            req.send();
+        }
     }
 
     function checkForExistence(request) {

diff --git a/src/streaming/models/FragmentModel.js b/src/streaming/models/FragmentModel.js
@@ -181,18 +181,8 @@ function FragmentModel(config) {
     }
 
     function executeRequest(request) {
-        var now = new Date().getTime();
-
         if (!request) return;
 
-        //Adds the ability to delay single fragment loading time to control buffer.
-        if (now < request.delayLoadingTime ) {
-            delayLoadingTimeout = setTimeout(function () {
-                executeRequest(request);
-            }, (request.delayLoadingTime - now) );
-            return;
-        }
-
         switch (request.action) {
             case FragmentRequest.ACTION_COMPLETE:
                 // Stream has completed, execute the corresponding callback