From fe19a2c02ff746518b2a0ce5a704cfc3aedbba36 Mon Sep 17 00:00:00 2001
From: Thomas Steur <thomas.steur@gmail.com>
Date: Sun, 1 Feb 2015 23:12:47 +0000
Subject: [PATCH] fixes #7108 do not abort logo upload after 1 sec in case it
was not finished yet
---
plugins/CoreAdminHome/javascripts/generalSettings.js | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/plugins/CoreAdminHome/javascripts/generalSettings.js b/plugins/CoreAdminHome/javascripts/generalSettings.js
index 3d586e333d..ebb30c493c 100644
--- a/plugins/CoreAdminHome/javascripts/generalSettings.js
+++ b/plugins/CoreAdminHome/javascripts/generalSettings.js
@@ -119,7 +119,13 @@ $(document).ready(function () {
uploadFrame.load(function (data) {
setTimeout(function () {
refreshCustomLogo();
- uploadFrame.remove();
+
+ var frameContent = $(uploadFrame.contents()).find('body').html();
+ frameContent = $.trim(frameContent);
+
+ if ('1' === frameContent || '0' === frameContent) {
+ uploadFrame.remove();
+ }
}, 1000);
});
$("body:first").append(uploadFrame);
--
GitLab