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

* Do not use colorbox when pager is in colorbox.

Browse Source
This commit is contained in:
wangyidong
2013-07-03 07:54:05 +00:00
parent edf0f2da82
commit 957f01c7ed
5 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/bug/js/view.js
+1 -1
View File
@@ -1,4 +1,4 @@
function setModal4List(colorboxClass, replaceID)
{
$('.iframe').colorbox({width:900, height:500, iframe:true, transition:'none', onCleanup:function(){parent.location.href=parent.location.href;}})
if(onlybody != 'yes') $('.iframe').colorbox({width:900, height:500, iframe:true, transition:'none', onCleanup:function(){parent.location.href=parent.location.href;}})
}
module/company/js/view.js
+1 -1
View File
@@ -1,4 +1,4 @@
$(function()
{
$('#editCompany').colorbox({width:750, height:500, iframe:true, transition:'none'});
if(onlybody != 'yes') $('#editCompany').colorbox({width:750, height:500, iframe:true, transition:'none'});
});
module/story/js/view.js
+1 -1
View File
@@ -1,4 +1,4 @@
$(function()
{
$(function(){$('.iframe').colorbox({width:900, height:500, iframe:true, transition:'none', onCleanup:function(){parent.location.href=parent.location.href;}});})
if(onlybody != 'yes') $(function(){$('.iframe').colorbox({width:900, height:500, iframe:true, transition:'none', onCleanup:function(){parent.location.href=parent.location.href;}});})
});
module/task/js/view.js
+4 -1
View File
@@ -4,4 +4,7 @@ function assign(taskID, assignedTo)
$('.assign').height(40);
$('.assign').load(createLink('user', 'ajaxGetUser', 'taskID=' + taskID + '&assignedTo=' + assignedTo));
}
$(function(){$('.iframe').colorbox({width:900, height:500, iframe:true, transition:'none', onCleanup:function(){parent.location.href=parent.location.href;}});})
$(function()
{
if(onlybody != 'yes') $('.iframe').colorbox({width:900, height:500, iframe:true, transition:'none', onCleanup:function(){parent.location.href=parent.location.href;}});
})
module/testcase/js/view.js
+2 -2
View File
@@ -1,5 +1,5 @@
$(document).ready(function()
{
$(".runCase").colorbox({width:900, height:550, iframe:true, transition:'none', onCleanup:function(){parent.location.href=parent.location.href;}});
$(".results").colorbox({width:900, height:550, iframe:true, transition:'none'});
if(onlybody != 'yes')$(".runCase").colorbox({width:900, height:550, iframe:true, transition:'none', onCleanup:function(){parent.location.href=parent.location.href;}});
if(onlybody != 'yes')$(".results").colorbox({width:900, height:550, iframe:true, transition:'none'});
})