extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-06-26 04:41:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

stop event propagation after calling setState, fixes "double sidebox" in CRM view, if called via a favorite (caused 2 identical requests to server, which both added their sidebox)

Browse Source
This commit is contained in:
Ralf Becker 2014-03-11 08:16:52 +00:00
parent 293a7166de
commit 086195c0aa
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
phpgwapi/js/jsapi/app_base.js
View File

@ -301,12 +301,14 @@ var AppJS = Class.extend(
// removed .on("mouse(enter|leave)" (wrapping trash icon), as it stalls delete in IE11 // removed .on("mouse(enter|leave)" (wrapping trash icon), as it stalls delete in IE11
.on("click","div.ui-icon-trash", this, this.delete_favorite) .on("click","div.ui-icon-trash", this, this.delete_favorite)
// need to install a favorite handler, as we switch original one off with .off() // need to install a favorite handler, as we switch original one off with .off()
.on('click','li[data-id]', this, function(){ .on('click','li[data-id]', this, function(event) {
var href = jQuery('a[href^="javascript:"]', this).prop('href'); var href = jQuery('a[href^="javascript:"]', this).prop('href');
var matches = href ? href.match(/^javascript:([^\(]+)\((.*)?\);?$/) : null; var matches = href ? href.match(/^javascript:([^\(]+)\((.*)?\);?$/) : null;
if (matches && matches.length > 1 && matches[2] !== undefined) if (matches && matches.length > 1 && matches[2] !== undefined)
{ {
return self.setState.call(self, JSON.parse(matches[2])); event.stopImmediatePropagation();
self.setState.call(self, JSON.parse(matches[2]));
return false;
} }
}) })
.addClass("ui-helper-clearfix"); .addClass("ui-helper-clearfix");
@ -531,7 +533,7 @@ var AppJS = Class.extend(
$j("#filters",self.favorite_popup).empty(); $j("#filters",self.favorite_popup).empty();
$j(this).dialog("close"); $j(this).dialog("close");
}, }
}; };
buttons[this.egw.lang("cancel")] = function() { buttons[this.egw.lang("cancel")] = function() {
if(typeof self.favorite_popup.group !== 'undefined' && self.favorite_popup.group.set_value) if(typeof self.favorite_popup.group !== 'undefined' && self.favorite_popup.group.set_value)