From c737bad66e861292bfd52a60d360c4086b223448 Mon Sep 17 00:00:00 2001
From: Philip Giuliani <philip.giuliani@keepinmind.info>
Date: Fri, 19 Dec 2014 15:17:15 +0100
Subject: [PATCH 1/4] Fix the jobLimit of the imageLoader

Fixes #490
---
 src/imageLoader.js | 7 ++++---
 src/viewer.js      | 4 +++-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/imageLoader.js b/src/imageLoader.js
index f1d5265d..0fa658a2 100644
--- a/src/imageLoader.js
+++ b/src/imageLoader.js
@@ -94,14 +94,16 @@ ImageJob.prototype = {
  * @memberof OpenSeadragon
  * @classdesc Handles downloading of a set of images using asynchronous queue pattern.
  * You generally won't have to interact with the ImageLoader directly.
+ * @param {Object} options - Options for this ImageLoader.
+ * @param {Number} options.jobLimit - The number of concurrent image requests.
  */
-$.ImageLoader = function() {
+$.ImageLoader = function( options ) {
 
     $.extend( true, this, {
         jobLimit:       $.DEFAULT_SETTINGS.imageLoaderLimit,
         jobQueue:       [],
         jobsInProgress: 0
-    });
+    }, options );
 
 };
 
@@ -166,4 +168,3 @@ function completeJob( loader, job, callback ) {
 }
 
 }( OpenSeadragon ));
-
diff --git a/src/viewer.js b/src/viewer.js
index 00108538..f6650203 100644
--- a/src/viewer.js
+++ b/src/viewer.js
@@ -436,7 +436,9 @@ $.Viewer = function( options ) {
     this.viewport.setHomeBounds(this.world.getHomeBounds(), this.world.getContentFactor());
 
     // Create the image loader
-    this.imageLoader = new $.ImageLoader();
+    this.imageLoader = new $.ImageLoader({
+        jobLimit: this.imageLoaderLimit
+    });
 
     // Create the tile cache
     this.tileCache = new $.TileCache({

From b82f5cea768cecf45e72fc23cf0f452e708ef858 Mon Sep 17 00:00:00 2001
From: Philip Giuliani <philip.giuliani@keepinmind.info>
Date: Fri, 19 Dec 2014 15:50:19 +0100
Subject: [PATCH 2/4] Fixed imageLoaderLimit

Currently jobsInProgress was not incremented after adding a job. So it
has gone into the - range and was like unlimited jobs.
---
 src/imageLoader.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/imageLoader.js b/src/imageLoader.js
index 0fa658a2..3cab4cdd 100644
--- a/src/imageLoader.js
+++ b/src/imageLoader.js
@@ -133,7 +133,7 @@ $.ImageLoader.prototype = /** @lends OpenSeadragon.ImageLoader.prototype */{
             this.jobsInProgress++;
         }
         else {
-           this.jobQueue.push( newJob );
+            this.jobQueue.push( newJob );
         }
     },
 
@@ -162,6 +162,7 @@ function completeJob( loader, job, callback ) {
     if ( (!loader.jobLimit || loader.jobsInProgress < loader.jobLimit) && loader.jobQueue.length > 0) {
         nextJob = loader.jobQueue.shift();
         nextJob.start();
+        loader.jobsInProgress++;
     }
 
     callback( job.image );

From 71cbd848798865000b7a129d065f2f74d458a2a8 Mon Sep 17 00:00:00 2001
From: Philip Giuliani <philip.giuliani@keepinmind.info>
Date: Fri, 19 Dec 2014 16:06:21 +0100
Subject: [PATCH 3/4] Fix case of filename

All files are downcased so far.
---
 Gruntfile.js                           | 2 +-
 src/{imageLoader.js => imageloader.js} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename src/{imageLoader.js => imageloader.js} (100%)

diff --git a/Gruntfile.js b/Gruntfile.js
index f774df6f..828f37a1 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -46,7 +46,7 @@ module.exports = function(grunt) {
             "src/referencestrip.js",
             "src/displayrectangle.js",
             "src/spring.js",
-            "src/imageLoader.js",
+            "src/imageloader.js",
             "src/tile.js",
             "src/overlay.js",
             "src/drawer.js",
diff --git a/src/imageLoader.js b/src/imageloader.js
similarity index 100%
rename from src/imageLoader.js
rename to src/imageloader.js

From b8a7d33ebbbb961043cfad411acb35834b2e1f23 Mon Sep 17 00:00:00 2001
From: Philip Giuliani <philip.giuliani@keepinmind.info>
Date: Mon, 22 Dec 2014 08:51:57 +0100
Subject: [PATCH 4/4] Fix documentation of jobLimit

---
 src/imageloader.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/imageloader.js b/src/imageloader.js
index 3cab4cdd..d1f9e785 100644
--- a/src/imageloader.js
+++ b/src/imageloader.js
@@ -95,7 +95,7 @@ ImageJob.prototype = {
  * @classdesc Handles downloading of a set of images using asynchronous queue pattern.
  * You generally won't have to interact with the ImageLoader directly.
  * @param {Object} options - Options for this ImageLoader.
- * @param {Number} options.jobLimit - The number of concurrent image requests.
+ * @param {Number} [options.jobLimit] - The number of concurrent image requests. See imageLoaderLimit in {@link OpenSeadragon.Options} for details.
  */
 $.ImageLoader = function( options ) {