Fixed running concurrent jobs after add/cancel changes

pionl · pionl · commit e73fc7c138bc · 2017-08-02T17:45:27.000+02:00
diff --git a/dist/load-queue.js b/dist/load-queue.js
diff --git a/dist/load-queue.min.js b/dist/load-queue.min.js
diff --git a/example/index.html b/example/index.html
@@ -3,39 +3,66 @@
 <head>
     <meta charset="UTF-8">
     <title>Load queue example</title>
-    <script src="../dist/load-queue.min.js" type="text/javascript"></script>
+    <script src="../dist/load-queue.js" type="text/javascript"></script>
 </head>
+<style>
+    .log {
+        width: 50%;
+        padding: 20px;
+        box-sizing: border-box;
+        float: left;
+        height: 400px;
+        overflow: scroll;
+    }
+</style>
 <body>
 
-<h1>Load queue example</h1>
-<div id="log"></div>
+<div class="log">
+    <h1>Load queue example</h1>
+    <div id="log"></div>
+</div>
+<div class="log">
+    <h1>Load queue example - concurrent</h1>
+    <div id="log2"></div>
+</div>
+<div style="clear: both;"></div>
 <script>
-    var log = document.getElementById('log')
-
-    function write (text) {
-        log.innerHTML += text + '<br/>'
-    }
-    // The custom loader task that will accept entry object (QueryEntry)
-    var loaderTask = function (entry, success, failure) {
-        write('Loading ' + entry.url)
-        setTimeout(function () {
-            if (entry.url === 'url1') {
-                failure(new Error('Failed!'))
-            } else {
-                success('my custom var', 'custom var 2')
-            }
-        }, 1000)
+    function getRandomArbitrary(min, max) {
+        return Math.random() * (max - min) + min;
     }
 
-    // Build the queue
-    var queue = new LoadQueue.default(loaderTask)
-    for (var i = 0; i < 20; i++) {
-        queue.add('url' + i, function (url, customVar, customVar1) {
-            write('Loaded ' + url + ', vars: ' + customVar + ', ' + customVar1)
-        }, function (url, error) {
-            write('Error ' + url + ' - ' + error.message)
-        })
+    function start (logDiv, jobs) {
+        var log = document.getElementById(logDiv)
+
+        function write (text) {
+            log.innerHTML = text + '<br/>' + log.innerHTML
+        }
+
+        // The custom loader task that will accept entry object (QueryEntry)
+        var loaderTask = function (entry, success, failure) {
+            write('Loading ' + entry.url)
+            setTimeout(function () {
+                if (entry.url === 'url1') {
+                    failure(new Error('Failed!'))
+                } else {
+                    success('my custom var', 'custom var 2')
+                }
+            }, getRandomArbitrary(1, 3) * 1000)
+        }
+
+        // Build the queue
+        var queue = new LoadQueue.default(loaderTask, jobs)
+        for (var i = 0; i < 50; i++) {
+            queue.add('url' + i, function (url, customVar, customVar1) {
+                write('Loaded ' + url + ', vars: ' + customVar + ', ' + customVar1)
+            }, function (url, error) {
+                write('Error ' + url + ' - ' + error.message)
+            })
+        }
     }
+
+    start('log', 1)
+    start('log2', 3)
 </script>
 </body>
 </html>
diff --git a/lib/QueueCore.js b/lib/QueueCore.js
@@ -158,7 +158,12 @@ var QueueCore = function () {
 
             // Start the request
             this.startTimeout = setTimeout(function () {
-                _this.forceStart();
+                var queueEmpty = false;
+                // Start enough items for concurrent jobs
+                while (queueEmpty === false && _this.loading.length() < _this.concurrentJobs) {
+                    console.log('looping');
+                    queueEmpty = _this.forceStart() === false;
+                }
             }, this.startTimeoutTime); // 50ms is enough to handle scroll start -> cancel transitions
         }
 
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "load-queue",
-  "version": "1.0.6",
+  "version": "1.0.7",
   "description": "Designed to allow running task in a queue with parallel support. Can be used for image or file loading.",
   "main": "lib/index.js",
   "repository": "https://github.com/pionl/load-queue",
diff --git a/src/QueueCore.js b/src/QueueCore.js
@@ -129,7 +129,12 @@ export default class QueueCore {
 
         // Start the request
         this.startTimeout = setTimeout(() => {
-            this.forceStart()
+            let queueEmpty = false
+            // Start enough items for concurrent jobs
+            while (queueEmpty === false && this.loading.length() < this.concurrentJobs) {
+                // If force start returns false, the queue is empty - stop
+                queueEmpty = this.forceStart() === false
+            }
         }, this.startTimeoutTime) // 50ms is enough to handle scroll start -> cancel transitions
     }
 

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "load-queue",`
`3`		`- "version": "1.0.6",`
	`3`	`+ "version": "1.0.7",`
`4`	`4`	`"description": "Designed to allow running task in a queue with parallel support. Can be used for image or file loading.",`
`5`	`5`	`"main": "lib/index.js",`
`6`	`6`	`"repository": "https://github.com/pionl/load-queue",`