Skip to content

Commit b0ddd96

Browse files
committed
Merge branch 'pu/ss/slowiframe' into '2024.11'
tweak(Tinebase): workaround for slow browser iframe loading See merge request tine20/tine20!5376
2 parents 13de884 + 834685f commit b0ddd96

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

tine20/Tinebase/js/ux/PopupWindowManager.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ Ext.ux.PopupWindowGroup = function(config) {
5151
doc = false;
5252

5353
}
54-
if (! doc) {
54+
if (! doc && (!list[id]?.asIframe || list[id]?.contentPanelConstructed)) {
5555
list[id].destroy();
5656
accessList.remove(list[id]);
5757
list[id] = null;
@@ -118,6 +118,7 @@ Ext.ux.PopupWindowGroup = function(config) {
118118

119119
register : function(win){
120120

121+
121122
win.registerTime = new Date().getTime();
122123
cleanupClosedWindows();
123124
if (! win.popup) {

tine20/Tinebase/js/ux/WindowFactory.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,7 @@ Ext.ux.WindowFactory.prototype = {
178178
if (config.contentPanelConstructorConfig._isAutoWrapped) {
179179
config.contentPanelConstructorConfig.items.listeners = null;
180180
}
181+
config.contentPanelConstructed = true;
181182

182183
return centerPanel;
183184
},

0 commit comments

Comments
 (0)