Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* zin: fix global var window.name can be override by users.

Browse Source
This commit is contained in:
sunhao
2024-04-10 14:51:49 +08:00
parent de1279c65a
commit de8d51fb63
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/index/js/ajaxiframemodal.ui.js
+3 -3
View File
@@ -16,12 +16,12 @@ $(document).off('locate.zt').on('locate.zt', function(e, data)
$(document).on('shown', '.modal', function()
{
if($(this).find('.modal-actions>[data-dismiss="modal"]').length) parent.$('iframe[name="' + window.name + '"]').closest('.modal-dialog').find('.modal-header>.close').hide();
if($(this).find('.modal-actions>[data-dismiss="modal"]').length) parent.$('iframe[name="' + window.frameElement.name + '"]').closest('.modal-dialog').find('.modal-header>.close').hide();
}).on('hidden', '.modal', function()
{
setTimeout(function()
{
if(!$(this).find('.modal-actions>[data-dismiss="modal"]').length) parent.$('iframe[name="' + window.name + '"]').closest('.modal-dialog').find('.modal-header>.close').show();
if(!$(this).find('.modal-actions>[data-dismiss="modal"]').length) parent.$('iframe[name="' + window.frameElement.name + '"]').closest('.modal-dialog').find('.modal-header>.close').show();
}, 500);
});
$('body').on('click', '.modal [data-dismiss="modal"]', function(e){e.stopPropagation();});
@@ -50,7 +50,7 @@ $(function()
resizeModal();
$body.zuiInit().removeClass('invisible');
if(parent.$('iframe[name="' + window.name + '"]').closest('.modal-dialog').find('.modal-header>.close').length) $('body>.modal-dialog>.modal-content>.modal-actions>[data-dismiss="modal"]').hide();
if(parent.$('iframe[name="' + window.frameElement.name + '"]').closest('.modal-dialog').find('.modal-header>.close').length) $('body>.modal-dialog>.modal-content>.modal-actions>[data-dismiss="modal"]').hide();
}
});
www/js/zui3/zin.js
+1 -1
View File
@@ -30,7 +30,7 @@
const isIndexPage = config.currentModule === 'index' && config.currentMethod === 'index';
const DEBUG = config.debug;
const currentCode = window.name.split('-')[1];
const currentCode = (window.frameElement ? window.frameElement.name : window.name).split('-')[1];
const isInAppTab = parent.window !== window;
const fetchTasks = new Map();
const startTime = performance.now();