From 6d7057aec038e04c03d6a3c3477bb9049375ab92 Mon Sep 17 00:00:00 2001
From: Steffen Gebert <steffen.gebert@typo3.org>
Date: Wed, 20 Oct 2010 07:28:54 +0000
Subject: [PATCH] Fixed bug #16049: Loading mask doesn't disappear on hitting
Esc/cancel loading
git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@9177 709f56b5-9817-0410-a4d7-c38de5d9e867
---
ChangeLog | 4 ++++
typo3/js/extjs/iframepanel.js | 10 ++++++++++
typo3/sysext/t3skin/extjs/xtheme-t3skin.css | 1 +
3 files changed, 15 insertions(+)
diff --git a/ChangeLog b/ChangeLog
index f0a96e0ca267..0500856d9ee6 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-10-20 Steffen Gebert <steffen@steffen-gebert.de>
+
+ * Fixed bug #16049: Loading mask doesn't disappear on hitting Esc/cancel loading
+
2010-10-19 Stanislas Rolland <typo3@sjbr.ca>
* Added feature #16073: htmlArea RTE: Add paste as plain text feature
diff --git a/typo3/js/extjs/iframepanel.js b/typo3/js/extjs/iframepanel.js
index 0277f0d798d5..40d0e9192f96 100644
--- a/typo3/js/extjs/iframepanel.js
+++ b/typo3/js/extjs/iframepanel.js
@@ -100,8 +100,18 @@ TYPO3.iframePanel = Ext.extend(Ext.Panel, {
if (this.doMask) {
this.el.mask(this.maskMessage, 'x-mask-loading-message');
this.el.addClass('t3-mask-loading');
+ // add an onClick handler to remove the mask while clicking on the loading message
+ // useful if user cancels loading and wants to access the content again
+ this.el.child('.x-mask-loading-message').on(
+ 'click',
+ function() {
+ this.el.unmask();
+ },
+ this
+ );
}
},
+
removeMask: function() {
if (this.doMask) {
this.el.unmask();
diff --git a/typo3/sysext/t3skin/extjs/xtheme-t3skin.css b/typo3/sysext/t3skin/extjs/xtheme-t3skin.css
index 1bb7e3e0d366..a41ff5511b6f 100644
--- a/typo3/sysext/t3skin/extjs/xtheme-t3skin.css
+++ b/typo3/sysext/t3skin/extjs/xtheme-t3skin.css
@@ -512,6 +512,7 @@ body.x-body-masked .x-window-mc, body.x-body-masked .x-window-plain .x-window-mc
background-color: transparent;
background-image: url("../images/spinner/big-f0f0f0.gif");
border: none;
+ cursor: pointer;
height: 32px;
padding: 0;
width: 32px;
--
GitLab