extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-24 23:08:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixed "undefined is not a function" error originating from egw_message, because jQuery not loaded, when egw_message get initialised

Browse Source
This commit is contained in:
Ralf Becker 2014-02-10 16:10:01 +00:00
parent 8b064bcfb4
commit 195c63a9d3
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
phpgwapi/js/jsapi/egw_message.js
View File

@ -26,13 +26,8 @@ egw.extend('message', egw.MODULE_WND_LOCAL, function(_app, _wnd)
{ {
_app; // not used, but required by function signature _app; // not used, but required by function signature
var message_timer; var message_timer;
var jQuery = _wnd.jQuery;
var error_reg_exp; var error_reg_exp;
var on_click_remove_installed = false;
// install handler to remove message on click
jQuery('body').on('click', 'div#egw_message', function(e) {
jQuery('div#egw_message').remove();
});
return { return {
/** /**
@ -44,6 +39,7 @@ egw.extend('message', egw.MODULE_WND_LOCAL, function(_app, _wnd)
message: function(_msg, _type) message: function(_msg, _type)
{ {
var framework = _wnd.framework; var framework = _wnd.framework;
var jQuery = _wnd.jQuery;
if (_msg && typeof _type == 'undefined') if (_msg && typeof _type == 'undefined')
{ {
@ -79,6 +75,14 @@ egw.extend('message', egw.MODULE_WND_LOCAL, function(_app, _wnd)
if (_msg) // empty _msg just removes pervious message if (_msg) // empty _msg just removes pervious message
{ {
if (!on_click_remove_installed)
{
// install handler to remove message on click
jQuery('body').on('click', 'div#egw_message', function(e) {
jQuery('div#egw_message').remove();
});
on_click_remove_installed = true;
}
parent.prepend(jQuery(_wnd.document.createElement('div')) parent.prepend(jQuery(_wnd.document.createElement('div'))
.attr('id','egw_message') .attr('id','egw_message')
.text(_msg) .text(_msg)
@ -141,7 +145,7 @@ egw.extend('message', egw.MODULE_WND_LOCAL, function(_app, _wnd)
_wnd.framework.setWebsiteTitle.call(_wnd.framework, app, title, _header); _wnd.framework.setWebsiteTitle.call(_wnd.framework, app, title, _header);
return; return;
} }
jQuery('div#divAppboxHeader').text(_header); _wnd.jQuery('div#divAppboxHeader').text(_header);
_wnd.document.title = _wnd.document.title.replace(/[.*]$/, '['+_header+']'); _wnd.document.title = _wnd.document.title.replace(/[.*]$/, '['+_header+']');
} }