hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-19 07:53:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix #1347 : Export dialog box does not open in lightbox

Browse Source
This commit is contained in:
Romain Neutron
2013-07-17 11:55:34 +02:00
parent 2b6a284e9c
commit 6d8af80dee
3 changed files with 26 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/conf.d/minifyGroupsConfig.php
View File

@@ -122,6 +122,7 @@ $groups = array(
, '//include/jslibs/jquery.cookie.js' , '//include/jslibs/jquery.cookie.js'
, '//include/jslibs/jquery.contextmenu_scroll.js' , '//include/jslibs/jquery.contextmenu_scroll.js'
, '//include/jquery.common.js' , '//include/jquery.common.js'
, '//skins/prod/jquery.Dialog.js'
, '//skins/lightbox/jquery.lightbox.js' , '//skins/lightbox/jquery.lightbox.js'
, '//include/jslibs/flowplayer/flowplayer-3.2.11.min.js' , '//include/jslibs/flowplayer/flowplayer-3.2.11.min.js'
), ),
@@ -133,6 +134,7 @@ $groups = array(
, '//include/jslibs/jquery.cookie.js' , '//include/jslibs/jquery.cookie.js'
, '//include/jslibs/jquery.contextmenu_scroll.js' , '//include/jslibs/jquery.contextmenu_scroll.js'
, '//include/jquery.common.js' , '//include/jquery.common.js'
, '//skins/prod/jquery.Dialog.js'
, '//skins/lightbox/jquery.lightbox.ie6.js' , '//skins/lightbox/jquery.lightbox.ie6.js'
, '//include/jslibs/flowplayer/flowplayer-3.2.11.min.js' , '//include/jslibs/flowplayer/flowplayer-3.2.11.min.js'
), ),

15
www/skins/lightbox/jquery.lightbox.ie6.js
View File

@@ -1,5 +1,10 @@
var p4 = { var p4 = p4 || {};
releasable:false
p4.releasable = false;
var bodySize = {
x:0,
y:0
}; };
$(window).bind('beforeunload', function(){ $(window).bind('beforeunload', function(){
@@ -13,7 +18,8 @@ $(window).bind('beforeunload', function(){
}); });
$(document).ready(function(){ $(document).ready(function(){
bodySize.y = $('#mainContainer').height();
bodySize.x = $('#mainContainer').width();
$(window).bind('resize',function(){ $(window).bind('resize',function(){
resize(); resize();
@@ -21,6 +27,9 @@ $(document).ready(function(){
function resize() function resize()
{ {
bodySize.y = $('#mainContainer').height();
bodySize.x = $('#mainContainer').width();
var h = $(window).height(); var h = $(window).height();
var w = $(window).width(); var w = $(window).width();

14
www/skins/lightbox/jquery.lightbox.js
View File

@@ -1,9 +1,17 @@
var p4 = { var p4 = p4 || {};
releasable:false
p4.releasable = false;
var bodySize = {
x:0,
y:0
}; };
$(document).ready(function(){ $(document).ready(function(){
bodySize.y = $('#mainContainer').height();
bodySize.x = $('#mainContainer').width();
$(this).data('slideshow',false); $(this).data('slideshow',false);
$(this).data('slideshow_ctime', false); $(this).data('slideshow_ctime', false);
@@ -191,6 +199,8 @@ function is_shift_key(event)
function resize() function resize()
{ {
bodySize.y = $('#mainContainer').height();
bodySize.x = $('#mainContainer').width();
display_record($('#record_compare').css('visibility') != 'hidden'); display_record($('#record_compare').css('visibility') != 'hidden');
} }