holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed toolbar preference sometimes not stored (caused by them being an array)

Browse Source
This commit is contained in:
Ralf Becker 2014-02-07 10:33:05 +00:00
parent 794cecabc1
commit f073db1f63
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
etemplate/js/et2_widget_toolbar.js
View File

@ -31,7 +31,7 @@ var et2_toolbar = et2_DOMWidget.extend(
"type": "string", "type": "string",
"default": "3", "default": "3",
"description": "Define minimum action view range to show actions by both icons and caption" "description": "Define minimum action view range to show actions by both icons and caption"
}, }
}, },
/** /**
@ -66,10 +66,6 @@ var et2_toolbar = et2_DOMWidget.extend(
this.dropdowns = {}; this.dropdowns = {};
this.preference = {}; this.preference = {};
if (typeof this.preference != "undefined")
{
console.log();
}
this._build_menu(this.default_toolbar); this._build_menu(this.default_toolbar);
}, },
@ -99,7 +95,8 @@ var et2_toolbar = et2_DOMWidget.extend(
this.actionbox.append('<h class="ui-toolbar-menulistHeader">'+egw.lang('more')+' ...'+'</h>'); this.actionbox.append('<h class="ui-toolbar-menulistHeader">'+egw.lang('more')+' ...'+'</h>');
this.actionbox.append('<div id="' + this.id + '-menulist' +'" class="ui-toolbar-menulist" ></div>'); this.actionbox.append('<div id="' + this.id + '-menulist' +'" class="ui-toolbar-menulist" ></div>');
this.preference = egw.preference(this.id,this.egw().getAppName())?egw.preference(this.id,this.egw().getAppName()):this.preference; var pref = egw.preference(this.id,this.egw().getAppName());
if (pref && !jQuery.isArray(pref)) this.preference = pref;
this.countActions = Object.keys(actions).length - Object.keys(this.preference).length; this.countActions = Object.keys(actions).length - Object.keys(this.preference).length;
var last_group = false; var last_group = false;
var last_group_id = false; var last_group_id = false;
@ -234,7 +231,7 @@ var et2_toolbar = et2_DOMWidget.extend(
toolbox.accordion({ toolbox.accordion({
heightStyle:"fill", heightStyle:"fill",
collapsible: true, collapsible: true,
active:'none', active:'none'
}); });
}, },
@ -250,7 +247,7 @@ var et2_toolbar = et2_DOMWidget.extend(
switch(_do) switch(_do)
{ {
case "add": case "add":
this.preference[_action] = _action; this.preference[_action] = true;
egw.set_preference(this.egw().getAppName(),this.id,this.preference); egw.set_preference(this.egw().getAppName(),this.id,this.preference);
break; break;
case "remove": case "remove":