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

- Use top-level preferences to load favorites

Browse Source 
- Empty sidebox target on unload to prevent handlers hanging around
This commit is contained in:
Nathan Gray 2013-03-18 20:58:55 +00:00
parent 0e89b309e3
commit cbbd03f388
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
etemplate/js/et2_widget_favorites.js
View File

@ -95,7 +95,7 @@ var et2_favorites = et2_dropdown_button.extend([et2_INextmatchHeader],{
var apps = egw().user('apps'); var apps = egw().user('apps');
this.is_admin = (typeof apps['admin'] != "undefined"); this.is_admin = (typeof apps['admin'] != "undefined");
this.preferred = this.egw().preference(this.options.default_pref,this.options.app); this.preferred = egw.preference(this.options.default_pref,this.options.app);
if(!this.preferred || typeof this.stored_filters[this.preferred] == "undefined") if(!this.preferred || typeof this.stored_filters[this.preferred] == "undefined")
{ {
this.preferred = "blank"; this.preferred = "blank";
@ -122,7 +122,7 @@ var et2_favorites = et2_dropdown_button.extend([et2_INextmatchHeader],{
if(this.sidebox_target.length) if(this.sidebox_target.length)
{ {
this.sidebox_target this.sidebox_target
.off("mouseenter mouseleave click") .off()
.on("mouseenter","div.ui-icon-trash", function() {$j(this).wrap("<span class='ui-state-active'/>");}) .on("mouseenter","div.ui-icon-trash", function() {$j(this).wrap("<span class='ui-state-active'/>");})
.on("mouseleave","div.ui-icon-trash", function() {$j(this).unwrap();}) .on("mouseleave","div.ui-icon-trash", function() {$j(this).unwrap();})
.on("click","div.ui-icon-trash", this, this.delete_favorite) .on("click","div.ui-icon-trash", this, this.delete_favorite)
@ -179,6 +179,12 @@ var et2_favorites = et2_dropdown_button.extend([et2_INextmatchHeader],{
destroy: function() { destroy: function() {
this.popup.dialog("destroy"); this.popup.dialog("destroy");
this.popup = null; this.popup = null;
if(this.sidebox_target.length)
{
this.sidebox_target
.off()
.empty();
}
this._super.apply(this, arguments); this._super.apply(this, arguments);
}, },
@ -198,7 +204,7 @@ var et2_favorites = et2_dropdown_button.extend([et2_INextmatchHeader],{
}; };
// Load saved favorites // Load saved favorites
var preferences = this.egw().preference("*",app); var preferences = egw.preference("*",app);
for(var pref_name in preferences) for(var pref_name in preferences)
{ {
if(pref_name.indexOf(this.favorite_prefix) == 0) if(pref_name.indexOf(this.favorite_prefix) == 0)