extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-03 04:29:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Removes setMessage from framework, as egw_message handles all cases now, and bind click handler to dismiss the message when we create the element

Browse Source
This commit is contained in:
Hadi Nategh 2014-12-10 10:32:51 +00:00
parent 00b22e82bf
commit af05aa9471
2 changed files with 1 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
phpgwapi/js/framework/fw_base.js
View File

@ -830,35 +830,6 @@ var fw_base = Class.extend({
return framework.activeApp.appName; return framework.activeApp.appName;
}, },
/**
* Display an error or regular message
*
* @param {string} _msg message to show
* @param {string} _type 'error', 'warning' or 'success' (default)
*/
setMessage: function(_msg, _type)
{
if (typeof _type == 'undefined')
_type = _msg.match(/error/i) ? 'error' : 'success';
if (this.messageTimer)
{
window.clearTimeout(this.messageTimer);
delete this.messageTimer;
}
this.tabsUi.setAppHeader(_msg, _type+'_message');
this.resizeHandler();
if (_type != 'error') // clear message again after some time, if no error
{
var self = this;
this.messageTimer = window.setTimeout(function() {
self.refreshAppTitle.call(self);
}, 5000);
}
},
/** /**
* Change timezone and refresh current app * Change timezone and refresh current app
* @param _tz * @param _tz

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

@ -27,7 +27,6 @@ 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 error_reg_exp; var error_reg_exp;
var on_click_remove_installed = false;
var a_href_reg = /<a href="([^"]+)">([^<]+)<\/a>/img; var a_href_reg = /<a href="([^"]+)">([^<]+)<\/a>/img;
var new_line_reg = /<\/?(p|br)\s*\/?>\n?/ig; var new_line_reg = /<\/?(p|br)\s*\/?>\n?/ig;
@ -63,7 +62,6 @@ egw.extend('message', egw.MODULE_WND_LOCAL, function(_app, _wnd)
*/ */
message: function(_msg, _type) message: function(_msg, _type)
{ {
var framework = _wnd.framework;
var jQuery = _wnd.jQuery; var jQuery = _wnd.jQuery;
if (_msg && !_type) if (_msg && !_type)
@ -73,17 +71,6 @@ egw.extend('message', egw.MODULE_WND_LOCAL, function(_app, _wnd)
_type = _msg.match(error_reg_exp) ? 'error' : 'success'; _type = _msg.match(error_reg_exp) ? 'error' : 'success';
} }
// if we are NOT in a popup and have a framwork --> let it deal with it
if (!this.is_popup() && typeof framework != 'undefined')
{
// currently not using framework, but top windows message
//framework.setMessage.call(framework, _msg, _type);
if (_wnd !== _wnd.top)
{
egw(_wnd.top).message(_msg, _type);
return;
}
}
// handle message display for non-framework templates, eg. idots or jerryr // handle message display for non-framework templates, eg. idots or jerryr
if (message_timer) if (message_timer)
{ {
@ -100,14 +87,6 @@ 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;
}
// replace p and br-tags with newlines // replace p and br-tags with newlines
_msg = _msg.replace(new_line_reg, "\n"); _msg = _msg.replace(new_line_reg, "\n");
@ -115,6 +94,7 @@ egw.extend('message', egw.MODULE_WND_LOCAL, function(_app, _wnd)
.attr('id','egw_message') .attr('id','egw_message')
.text(_msg) .text(_msg)
.addClass(_type+'_message') .addClass(_type+'_message')
.click(function() {this.remove();})
.css('position', 'absolute'); .css('position', 'absolute');
parent.prepend(msg_div); parent.prepend(msg_div);