holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

making popup resize a bit more relyable by using an extra timeout and trigger it for every load, not just first one

Browse Source
This commit is contained in:
Ralf Becker 2014-10-30 11:10:03 +00:00
parent 2cb639dd9c
commit 6b1c36f6d3
1 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
phpgwapi/js/jsapi/egw.js
View File

@ -223,22 +223,23 @@
if(popup || window.opener) if(popup || window.opener)
{ {
// Resize popup when et2 load is done // Resize popup when et2 load is done
jQuery(node).one("load",function() { jQuery(node).on("load",function() {
var $main_div = $j('#popupMainDiv'); window.setTimeout(function() {
var $et2 = $j('.et2_container'); var $main_div = $j('#popupMainDiv');
var w = { var $et2 = $j('.et2_container');
width: egw_getWindowInnerWidth(), var w = {
height: egw_getWindowInnerHeight() width: egw_getWindowInnerWidth(),
}; height: egw_getWindowInnerHeight()
// Use et2_container for width since #popupMainDiv is full width, but we still need };
// to take padding/margin into account // Use et2_container for width since #popupMainDiv is full width, but we still need
var delta_width = w.width - ($et2.outerWidth(true) + ($main_div.outerWidth(true) - $main_div.width())); // to take padding/margin into account
var delta_height = w.height - ($et2.outerHeight(true) + ($main_div.outerHeight(true) - $main_div.height())); var delta_width = w.width - ($et2.outerWidth(true) + ($main_div.outerWidth(true) - $main_div.width()));
debugger; var delta_height = w.height - ($et2.outerHeight(true) + ($main_div.outerHeight(true) - $main_div.height()));
if(delta_width != 0 || delta_height != 0) if(delta_width != 0 || delta_height != 0)
{ {
window.resizeTo(egw_getWindowOuterWidth() - delta_width,egw_getWindowOuterHeight() - delta_height); window.resizeTo(egw_getWindowOuterWidth() - delta_width,egw_getWindowOuterHeight() - delta_height);
} }
}, 200);
}); });
} }
var et2 = new etemplate2(node, currentapp+".etemplate_new.ajax_process_content.etemplate"); var et2 = new etemplate2(node, currentapp+".etemplate_new.ajax_process_content.etemplate");