From 81b41be750c9eddbabafdbd304614d827cd0ca82 Mon Sep 17 00:00:00 2001
From: max <max@max.lan>
Date: Tue, 25 Feb 2020 17:53:44 +0100
Subject: [PATCH 1/3] preview-thumbnails via src:callback()

---
 src/js/plugins/preview-thumbnails.js | 26 +++++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/src/js/plugins/preview-thumbnails.js b/src/js/plugins/preview-thumbnails.js
index 86eeebc8..e313a01f 100644
--- a/src/js/plugins/preview-thumbnails.js
+++ b/src/js/plugins/preview-thumbnails.js
@@ -137,19 +137,31 @@ class PreviewThumbnails {
                 throw new Error('Missing previewThumbnails.src config attribute');
             }
 
-            // If string, convert into single-element list
-            const urls = is.string(src) ? [src] : src;
-            // Loop through each src URL. Download and process the VTT file, storing the resulting data in this.thumbnails
-            const promises = urls.map(u => this.getThumbnail(u));
-
-            Promise.all(promises).then(() => {
+            // Resolve promise
+            const exec_resolve = () => {
                 // Sort smallest to biggest (e.g., [120p, 480p, 1080p])
                 this.thumbnails.sort((x, y) => x.height - y.height);
 
                 this.player.debug.log('Preview thumbnails', this.thumbnails);
 
                 resolve();
-            });
+            };
+            // Via callback()
+            if( typeof(src) == 'function' ) {
+                // Ask
+                this.thumbnails = src();
+                // Resolve
+                exec_resolve();
+            }
+            // VTT urls
+            else {
+                // If string, convert into single-element list
+                const urls = is.string(src) ? [src] : src;
+                // Loop through each src URL. Download and process the VTT file, storing the resulting data in this.thumbnails
+                const promises = urls.map(u => this.getThumbnail(u));
+                // Resolve
+                Promise.all(promises).then(exec_resolve);
+            }
         });
     }
 

From b212b25a9eca8a440a05d53b744aa56f646b2929 Mon Sep 17 00:00:00 2001
From: max <max@max.lan>
Date: Wed, 26 Feb 2020 10:35:08 +0100
Subject: [PATCH 2/3] Fixes

---
 src/js/plugins/preview-thumbnails.js | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/js/plugins/preview-thumbnails.js b/src/js/plugins/preview-thumbnails.js
index e313a01f..7e9f0dc9 100644
--- a/src/js/plugins/preview-thumbnails.js
+++ b/src/js/plugins/preview-thumbnails.js
@@ -138,7 +138,7 @@ class PreviewThumbnails {
             }
 
             // Resolve promise
-            const exec_resolve = () => {
+            const resolvePromise = () => {
                 // Sort smallest to biggest (e.g., [120p, 480p, 1080p])
                 this.thumbnails.sort((x, y) => x.height - y.height);
 
@@ -147,11 +147,14 @@ class PreviewThumbnails {
                 resolve();
             };
             // Via callback()
-            if( typeof(src) == 'function' ) {
+            if (typeof(src) == 'function') {
                 // Ask
-                this.thumbnails = src();
-                // Resolve
-                exec_resolve();
+                let that = this;
+                src(function(thumbnails) {
+                    that.thumbnails = thumbnails;
+                    // Resolve
+                    resolvePromise();
+                });
             }
             // VTT urls
             else {
@@ -160,7 +163,7 @@ class PreviewThumbnails {
                 // Loop through each src URL. Download and process the VTT file, storing the resulting data in this.thumbnails
                 const promises = urls.map(u => this.getThumbnail(u));
                 // Resolve
-                Promise.all(promises).then(exec_resolve);
+                Promise.all(promises).then(resolvePromise);
             }
         });
     }

From ace682abbdeba13ea3664e9dde38a903a4a5da5e Mon Sep 17 00:00:00 2001
From: max <max@max.lan>
Date: Wed, 26 Feb 2020 10:41:26 +0100
Subject: [PATCH 3/3] Fixes2

---
 src/js/plugins/preview-thumbnails.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/js/plugins/preview-thumbnails.js b/src/js/plugins/preview-thumbnails.js
index 7e9f0dc9..4c13ab33 100644
--- a/src/js/plugins/preview-thumbnails.js
+++ b/src/js/plugins/preview-thumbnails.js
@@ -138,7 +138,7 @@ class PreviewThumbnails {
             }
 
             // Resolve promise
-            const resolvePromise = () => {
+            const sortAndResolve = () => {
                 // Sort smallest to biggest (e.g., [120p, 480p, 1080p])
                 this.thumbnails.sort((x, y) => x.height - y.height);
 
@@ -147,13 +147,13 @@ class PreviewThumbnails {
                 resolve();
             };
             // Via callback()
-            if (typeof(src) == 'function') {
+            if (is.function(src)) {
                 // Ask
                 let that = this;
                 src(function(thumbnails) {
                     that.thumbnails = thumbnails;
                     // Resolve
-                    resolvePromise();
+                    sortAndResolve();
                 });
             }
             // VTT urls
@@ -163,7 +163,7 @@ class PreviewThumbnails {
                 // Loop through each src URL. Download and process the VTT file, storing the resulting data in this.thumbnails
                 const promises = urls.map(u => this.getThumbnail(u));
                 // Resolve
-                Promise.all(promises).then(resolvePromise);
+                Promise.all(promises).then(sortAndResolve);
             }
         });
     }