extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-28 02:43:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

* Calendar: Fix Generate Page Time's indicator screws calendar view up

Browse Source
This commit is contained in:
Hadi Nategh 2016-07-15 09:51:57 +02:00
parent 1677dd205c
commit 1aa70236fa
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api/js/jsapi/egw.js
View File

@ -204,7 +204,9 @@
var end_time = (new Date).getTime(); var end_time = (new Date).getTime();
var gen_time_div = jQuery('#divGenTime_'+window.egw_appName); var gen_time_div = jQuery('#divGenTime_'+window.egw_appName);
if (!gen_time_div.length) gen_time_div = jQuery('.pageGenTime'); if (!gen_time_div.length) gen_time_div = jQuery('.pageGenTime');
gen_time_div.append('<span class="asyncIncludeTime">'+egw.lang('async includes took %1s', (end_time-start_time)/1000)+'</span>'); var gen_time_async = jQuery('.asyncIncludeTime').length > 0 ? jQuery('.asyncIncludeTime'):
gen_time_div.append('<span class="asyncIncludeTime"></span>').find('.asyncIncludeTime');
gen_time_async.text(egw.lang('async includes took %1s', (end_time-start_time)/1000));
// Make sure opener knows when we close - start a heartbeat // Make sure opener knows when we close - start a heartbeat
if((popup || window.opener) && window.name != '') if((popup || window.opener) && window.name != '')

7
api/js/jsapi/egw_json.js
View File

@ -170,7 +170,9 @@ egw.extend('json', egw.MODULE_WND_LOCAL, function(_app, _wnd)
this.handleResponse(data); this.handleResponse(data);
var gen_time_div = jQuery('#divGenTime'); var gen_time_div = jQuery('#divGenTime');
if (!gen_time_div.length) gen_time_div = jQuery('.pageGenTime'); if (!gen_time_div.length) gen_time_div = jQuery('.pageGenTime');
gen_time_div.append('<span class="asyncIncludeTime">'+egw.lang('async includes took %1s', (end_time-start_time)/1000)+'</span>'); var gen_time_async = jQuery('.asyncIncludeTime').length > 0 ? jQuery('.asyncIncludeTime'):
gen_time_div.append('<span class="asyncIncludeTime"></span>').find('.asyncIncludeTime');
gen_time_async.text(egw.lang('async includes took %1s', (end_time-start_time)/1000));
}, this); }, this);
return; return;
} }
@ -204,7 +206,8 @@ egw.extend('json', egw.MODULE_WND_LOCAL, function(_app, _wnd)
gen_time_div.find('span.pageTime').text(egw.lang("Page was generated in %1 seconds ", data.page_generation_time)); gen_time_div.find('span.pageTime').text(egw.lang("Page was generated in %1 seconds ", data.page_generation_time));
if (data.session_restore_time) if (data.session_restore_time)
{ {
var gen_time_session_span = gen_time_div.find('span.session').length > 0 ? gen_time_div.find('span.session'):gen_time_div.append('<span class="session"></span>'); var gen_time_session_span = gen_time_div.find('span.session').length > 0 ? gen_time_div.find('span.session'):
gen_time_div.append('<span class="session"></span>').find('.session');
gen_time_session_span.text(egw.lang("session restore time in %1 seconds ", data.page_generation_time)); gen_time_session_span.text(egw.lang("session restore time in %1 seconds ", data.page_generation_time));
} }
} }