keep the spinner visible while the image loads

2021-05-07 17:44:24 +02:00 · 2021-05-07 17:44:24 +02:00 · 1b31c5fc90
commit 1b31c5fc90
parent 0206a6f94c
1 changed files with 4 additions and 1 deletions
--- a/htdocs/lib/settings/ImageUpload.js
+++ b/htdocs/lib/settings/ImageUpload.js
@ -54,6 +54,10 @@ $.fn.imageUpload = function() {
                        contentType: 'application/octet-stream',
                    }).done(function(data){
                        $input.val(data.file);
+                        $img.one('load', function() {
+                            $uploadButton.prop('disabled', false);
+                            $spinner.remove();
+                        });
                        $img.prop('src', '../imageupload?file=' + data.file);
                        clearError();
                    }).fail(function(xhr, error){
@ -63,7 +67,6 @@ $.fn.imageUpload = function() {
                        } catch (e) {
                            handleError(error);
                        }
-                    }).always(function(){
                        $uploadButton.prop('disabled', false);
                        $spinner.remove();
                    });