Migrate from Deferred to Promises, rework the imageCache (thanks @die…

…go0020)

example/imageCache/index.html

@@ -161,13 +161,10 @@ <h1>
                 sizeInBytes : width * height * 4
             };
 
-
-            // Create a deferred object, resolve it with the image object we just created and return the
-            // deferred to cornerstone.  Cornerstone will get the image object by calling then() on the
-            // deferred
-            var deferred = $.Deferred();
-            deferred.resolve(image);
-            return deferred;
+            return {
+                promise: new Promise((resolve) => resolve(image)),
+                cancelFn: undefined
+            }
         }
 
         cornerstone.registerImageLoader('colorImageLoader', loadImage);

example/imageloader/index.html

@@ -85,12 +85,10 @@ <h1>
                 sizeInBytes: width * height * 2
             };
 
-            // Create a deferred object, resolve it with the image object we just created and return the
-            // deferred to cornerstone.  Cornerstone will get the image object by calling then() on the
-            // deferred
-            var deferred = $.Deferred();
-            deferred.resolve(image);
-            return deferred;
+            return {
+              promise: new Promise((resolve) => resolve(image)),
+              cancelFn: undefined
+            }
         }
 
         cornerstone.registerImageLoader('myImageLoader', loadImage);

example/layers/index.html

@@ -121,9 +121,7 @@ <h1>
         // This method will wait for all images to be loaded (`loadImages`)
         // before adding the layers
         function loadLayers() {
-            loadImages().then(function() {
-                var images = Array.prototype.slice.call(arguments);
-
+            loadImages().then(function(images) {                
                 images.forEach(function(image, index) {
                     var layer = layers[index];
                     var layerId = cornerstone.addLayer(element, image, layer.options);
@@ -154,7 +152,7 @@ <h1>
                 promises.push(loadPromise);
             });
 
-            return $.when.apply($, promises);
+            return Promise.all(promises);
         }
 
         // Select the right layer in the dropdown

example/modalityAndVIOLut/index.html

@@ -112,12 +112,10 @@ <h1>
                 sizeInBytes: width * height * 2
             };
 
-            // Create a deferred object, resolve it with the image object we just created and return the
-            // deferred to cornerstone.  Cornerstone will get the image object by calling then() on the
-            // deferred
-            var deferred = $.Deferred();
-            deferred.resolve(image);
-            return deferred;
+            return {
+                promise: new Promise((resolve) => resolve(image)),
+                cancelFn: undefined
+            };
         }
 
         cornerstone.registerImageLoader('myImageLoader', loadImage);

example/nonSquarePixels/index.html

@@ -110,12 +110,15 @@ <h1>
                 sizeInBytes: width * height * 2
             };
 
-            // Create a deferred object, resolve it with the image object we just created and return the
-            // deferred to cornerstone.  Cornerstone will get the image object by calling then() on the
-            // deferred
-            var deferred = $.Deferred();
-            deferred.resolve(image);
-            return deferred;
+            // Create a Promise, resolve it with the image object we just created and return the
+            // Promise to cornerstone.  Cornerstone will get the image object by calling then() on the
+            // Promise. An optional function can be provided to allow the image loader to cancel a request.
+            return {
+              promise: new Promise((resolve) => {
+                resolve(image);
+              }),
+              cancelFn: undefined
+            };
         }
 
         cornerstone.registerImageLoader('myImageLoader', loadImage);