From 8cc51113a225944fa32cef1f960a2015729fc1c6 Mon Sep 17 00:00:00 2001
From: Michael Jumper <mike.jumper@guac-dev.org>
Date: Sun, 20 Sep 2015 22:30:01 -0700
Subject: [PATCH] GUAC-1305: Only test for supported images when guacImage is
 initially loaded. No need to retest.

---
 .../webapp/app/client/services/guacImage.js   | 96 +++++++++++--------
 1 file changed, 57 insertions(+), 39 deletions(-)

diff --git a/guacamole/src/main/webapp/app/client/services/guacImage.js b/guacamole/src/main/webapp/app/client/services/guacImage.js
index a5715e0d1..28126537f 100644
--- a/guacamole/src/main/webapp/app/client/services/guacImage.js
+++ b/guacamole/src/main/webapp/app/client/services/guacImage.js
@@ -64,6 +64,31 @@ angular.module('client').factory('guacImage', ['$injector', function guacImage($
 
     };
 
+    /**
+     * Deferred which tracks the progress and ultimate result of all pending
+     * image format tests.
+     *
+     * @type Deferred
+     */
+    var deferredSupportedMimetypes = $q.defer();
+
+    /**
+     * Array of all promises associated with pending image tests. Each image
+     * test promise MUST be guaranteed to resolve and MUST NOT be rejected.
+     *
+     * @type Promise[]
+     */
+    var pendingTests = [];
+
+    /**
+     * The array of supported image formats. This will be gradually populated
+     * by the various image tests that occur in the background, and will not be
+     * fully populated until all promises within pendingTests are resolved.
+     *
+     * @type String[]
+     */
+    var supported = [];
+
     /**
      * Return a promise which resolves with to an array of image mimetypes
      * supported by the browser, once those mimetypes are known. The returned
@@ -74,47 +99,40 @@ angular.module('client').factory('guacImage', ['$injector', function guacImage($
      *     by the browser.
      */
     service.getSupportedMimetypes = function getSupportedMimetypes() {
-
-        var deferred = $q.defer();
-
-        var supported = [];
-        var pendingTests = [];
-
-        // Test each possibly-supported image
-        angular.forEach(testImages, function testImageSupport(data, mimetype) {
-
-            // Add promise for current image test
-            var imageTest = $q.defer();
-            pendingTests.push(imageTest.promise);
-
-            // Attempt to load image
-            var image = new Image();
-            image.src = 'data:' + mimetype + ';base64,' + data;
-
-            // Store as supported depending on whether load was successful
-            image.onload = image.onerror = function imageTestComplete() {
-
-                // Image format is supported if successfully decoded
-                if (image.width === 1 && image.height === 1)
-                    supported.push(mimetype);
-
-                // Test is complete
-                imageTest.resolve();
-
-            };
-
-        });
-
-        // When all image tests are complete, resolve promise with list of
-        // supported formats
-        $q.all(pendingTests).then(function imageTestsCompleted() {
-            deferred.resolve(supported);
-        });
-
-        return deferred.promise;
-
+        return deferredSupportedMimetypes.promise;
     };
 
+    // Test each possibly-supported image
+    angular.forEach(testImages, function testImageSupport(data, mimetype) {
+
+        // Add promise for current image test
+        var imageTest = $q.defer();
+        pendingTests.push(imageTest.promise);
+
+        // Attempt to load image
+        var image = new Image();
+        image.src = 'data:' + mimetype + ';base64,' + data;
+
+        // Store as supported depending on whether load was successful
+        image.onload = image.onerror = function imageTestComplete() {
+
+            // Image format is supported if successfully decoded
+            if (image.width === 1 && image.height === 1)
+                supported.push(mimetype);
+
+            // Test is complete
+            imageTest.resolve();
+
+        };
+
+    });
+
+    // When all image tests are complete, resolve promise with list of
+    // supported formats
+    $q.all(pendingTests).then(function imageTestsCompleted() {
+        deferredSupportedMimetypes.resolve(supported);
+    });
+
     return service;
 
 }]);