mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-11-08 00:54:15 +01:00
fixed javascript error, if favorite has no href AND make sure all new favorites are created with an href, like they are created server-side
This commit is contained in:
parent
e4d65ae94d
commit
af1e70ab32
@ -301,8 +301,8 @@ var AppJS = Class.extend(
|
||||
// need to install a favorite handler, as we switch original one off with .off()
|
||||
.on('click','li[data-id]', this, function(){
|
||||
var href = jQuery('a[href^="javascript:"]', this).prop('href');
|
||||
var matches = href.match(/^javascript:([^\(]+)\((.*)?\);?$/);
|
||||
if (matches.length > 1 && matches[2] !== undefined)
|
||||
var matches = href ? href.match(/^javascript:([^\(]+)\((.*)?\);?$/) : null;
|
||||
if (matches && matches.length > 1 && matches[2] !== undefined)
|
||||
{
|
||||
return self.setState.call(self, JSON.parse(matches[2]));
|
||||
}
|
||||
@ -486,11 +486,7 @@ var AppJS = Class.extend(
|
||||
else
|
||||
{
|
||||
// Normal user - just save to preferences client side
|
||||
self.egw.set_preference(self.appname,favorite_pref,{
|
||||
name: name.val(),
|
||||
group: false,
|
||||
state:self.favorite_popup.state
|
||||
});
|
||||
self.egw.set_preference(self.appname,favorite_pref,favorite);
|
||||
}
|
||||
|
||||
// Add to list immediately
|
||||
@ -501,20 +497,13 @@ var AppJS = Class.extend(
|
||||
|
||||
// Create new item
|
||||
var html = "<li data-id='"+safe_name+"' data-group='" + favorite.group + "' class='ui-menu-item' role='menuitem'>\n";
|
||||
html += "<a href='#' class='ui-corner-all' tabindex='-1'>";
|
||||
var href = 'javascript:app.'+self.appname+'.setState('+JSON.stringify(favorite)+');';
|
||||
html += "<a href='"+href+"' class='ui-corner-all' tabindex='-1'>";
|
||||
html += "<div class='" + 'sideboxstar' + "'></div>"+
|
||||
favorite.name;
|
||||
html += "<div class='ui-icon ui-icon-trash' title='" + egw.lang('Delete') + "'/>";
|
||||
html += "</a></li>\n";
|
||||
$j(html).on('click.favorites',jQuery.proxy(function(event) {
|
||||
// Don't apply on delete
|
||||
if($j(event.target).hasClass('ui-icon-trash'))
|
||||
{
|
||||
return;
|
||||
}
|
||||
app[self.appname].setState(this);
|
||||
},favorite))
|
||||
.insertBefore($j('li',self.sidebox).last());
|
||||
$j(html).insertBefore($j('li',self.sidebox).last());
|
||||
self._init_sidebox(self.sidebox);
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user