From e8dd91cf94c4a9a18bf58d95466f3973f2668e0d Mon Sep 17 00:00:00 2001 From: buddh4 Date: Mon, 12 Oct 2020 16:40:37 +0200 Subject: [PATCH 1/2] Fix: Loader not removed from event trigger --- static/js/humhub/humhub.action.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/static/js/humhub/humhub.action.js b/static/js/humhub/humhub.action.js index 41d2f237cb..25948043ea 100644 --- a/static/js/humhub/humhub.action.js +++ b/static/js/humhub/humhub.action.js @@ -719,6 +719,7 @@ humhub.module('action', function(module, require, $) { var that = this; event.finish = function() { + _removeLoaderFromEventTarget(event); _removeLoaderFromEventTarget(event.originalEvent); that.unblock($trigger); }; @@ -734,6 +735,10 @@ humhub.module('action', function(module, require, $) { if(evt && evt.target) { loader.reset(evt.target); } + + if(evt && evt.$trigger) { + loader.reset(evt.$trigger); + } }; From 56f18e1ebda2821d1c4da91436453f830b25a615 Mon Sep 17 00:00:00 2001 From: buddh4 Date: Mon, 12 Oct 2020 16:42:54 +0200 Subject: [PATCH 2/2] Updated CHANGELOG_DEV.md --- CHANGELOG_DEV.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG_DEV.md b/CHANGELOG_DEV.md index 0cfbf3d2c7..5f5c77fe0e 100644 --- a/CHANGELOG_DEV.md +++ b/CHANGELOG_DEV.md @@ -55,3 +55,4 @@ HumHub Changelog - Enh #3978: Added option to compress and resize images automatically on upload - Enh #3889: Prevent automatically resized site icons by manually added files (e.g. `/upload/icon/180x180.png`) - Enh #4458: Remove cacert.pem in order to avoid curl error +- Fix #4474: Loader not removed from event trigger