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

Wait until DOM is loaded before trying to load etemplate or set message

Browse Source
This commit is contained in:
Nathan Gray 2014-01-10 09:13:56 +00:00
parent 8c44986e7b
commit 15bc1b3909
1 changed files with 34 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -40,6 +40,7 @@
var debug = false; var debug = false;
var egw_script = document.getElementById('egw_script_id'); var egw_script = document.getElementById('egw_script_id');
var start_time = (new Date).getTime(); var start_time = (new Date).getTime();
if(console.timeline) console.timeline("egw");
// Flag for if this is opened in a popup // Flag for if this is opened in a popup
var popup = (window.opener != null); var popup = (window.opener != null);
@ -155,6 +156,7 @@
window.egw_LAB.script(include).wait(function() window.egw_LAB.script(include).wait(function()
{ {
if(console.timelineEnd) console.timelineEnd("egw");
var end_time = (new Date).getTime(); var end_time = (new Date).getTime();
var gen_time_div = $j('#divGenTime_'+window.egw_appName); var gen_time_div = $j('#divGenTime_'+window.egw_appName);
if (!gen_time_div.length) gen_time_div = $j('.pageGenTime'); if (!gen_time_div.length) gen_time_div = $j('.pageGenTime');
@ -187,7 +189,6 @@
var data = egw_script.getAttribute('data-etemplate'); var data = egw_script.getAttribute('data-etemplate');
if (data) if (data)
{ {
data = JSON.parse(data) || {};
// Initialize application js // Initialize application js
var callback = null; var callback = null;
// Only initialize once // Only initialize once
@ -199,34 +200,41 @@
{ {
egw.debug("warn", "Did not load '%s' JS object",window.egw_appName); egw.debug("warn", "Did not load '%s' JS object",window.egw_appName);
} }
var node = document.getElementById(data.DOMNodeID); // Wait until DOM loaded before we load the etemplate to make sure the target is there
if(!node) $j(function() {
{ // Re-load data here, as later code may change the variable
egw.debug("error", "Could not find target node %s", data.DOMNodeID); var data = JSON.parse(egw_script.getAttribute('data-etemplate')) || {};
} var node = document.getElementById(data.DOMNodeID);
else if(!node)
{
if(popup || window.opener)
{ {
// Resize popup when et2 load is done egw.debug("error", "Could not find target node %s", data.DOMNodeID);
jQuery(node).one("load",function() {
window.resizeTo(jQuery(document).width()+10,jQuery(document).height()+70);
});
} }
var et2 = new etemplate2(node, window.egw_appName+".etemplate_new.ajax_process_content.etemplate"); else
et2.load(data.name,data.url,data.data,callback); {
if(popup || window.opener)
{
// Resize popup when et2 load is done
jQuery(node).one("load",function() {
window.resizeTo(jQuery(document).width()+10,jQuery(document).height()+70);
});
}
var et2 = new etemplate2(node, window.egw_appName+".etemplate_new.ajax_process_content.etemplate");
et2.load(data.name,data.url,data.data,callback);
}
});
}
$j(function() {
// set app-header
if (window.framework && (data = egw_script.getAttribute('data-app-header')))
{
window.egw_app_header(data);
} }
} // display a message
// set app-header if ((data = egw_script.getAttribute('data-message')) && (data = JSON.parse(data)))
if (window.framework && (data = egw_script.getAttribute('data-app-header'))) {
{ window.egw_message.apply(window, data);
window.egw_app_header(data); }
} });
// display a message
if ((data = egw_script.getAttribute('data-message')) && (data = JSON.parse(data)))
{
window.egw_message.apply(window, data);
}
}); });
/** /**