extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-22 14:41:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix dropdown action in toolbar widget

Browse Source
This commit is contained in:
Hadi Nategh 2014-02-19 17:52:31 +00:00
parent 26e0f079a1
commit 3b8eeb12ca
1 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
etemplate/js/et2_widget_toolbar.js
View File

@ -175,7 +175,6 @@ var et2_toolbar = et2_DOMWidget.extend(
if(action.children) if(action.children)
{ {
var children = {}; var children = {};
var toolbar = this;
var add_children = function(root, children) { var add_children = function(root, children) {
for(var id in root.children) for(var id in root.children)
{ {
@ -194,7 +193,7 @@ var et2_toolbar = et2_DOMWidget.extend(
} }
children[id] = info; children[id] = info;
if (toolbar.flat_list) if (that.flat_list)
{ {
childaction = root.children[id]; childaction = root.children[id];
if (typeof root.children[id].group != 'undefined' && if (typeof root.children[id].group != 'undefined' &&
@ -202,7 +201,7 @@ var et2_toolbar = et2_DOMWidget.extend(
{ {
childaction.group = root.group; childaction.group = root.group;
} }
toolbar._make_button (childaction); that._make_button (childaction);
} }
} }
}; };
@ -212,19 +211,17 @@ var et2_toolbar = et2_DOMWidget.extend(
continue; continue;
} }
this.dropdowns[action.id] = $j(document.createElement('span'))
.addClass("ui-state-default")
.appendTo(last_group);
var dropdown = et2_createWidget("dropdown_button", { var dropdown = et2_createWidget("dropdown_button", {
id: action.id, id: action.id
label: action.caption
},this); },this);
dropdown.set_select_options(children);
dropdown.set_select_options(children);
dropdown.set_label (action.caption);
dropdown.set_image (action.iconUrl);
dropdown.onchange = jQuery.proxy(function(selected, dropdown) dropdown.onchange = jQuery.proxy(function(selected, dropdown)
{ {
var action = toolbar._actionManager.getActionById(selected.attr('data-id')); var action = that._actionManager.getActionById(selected.attr('data-id'));
if(action) if(action)
{ {
if(action) if(action)
@ -236,7 +233,7 @@ var et2_toolbar = et2_DOMWidget.extend(
},action); },action);
dropdown.onclick = jQuery.proxy(function(selected, dropdown) dropdown.onclick = jQuery.proxy(function(selected, dropdown)
{ {
var action = toolbar._actionManager.getActionById(this.getValue()); var action = that._actionManager.getActionById(this.getValue());
if(action) if(action)
{ {
if(action) if(action)
@ -246,6 +243,10 @@ var et2_toolbar = et2_DOMWidget.extend(
} }
console.debug(selected, this, action); console.debug(selected, this, action);
},dropdown); },dropdown);
$j(dropdown.getDOMNode())
.attr('id',this.id + '-' + dropdown.id)
.addClass(this.preference[action.id]?'et2_toolbar-dropdown et2_toolbar-dropdown-menulist':'et2_toolbar-dropdown')
.appendTo(this.preference[action.id]?this.actionbox.children()[1]:$j('[data-group='+action.group+']',this.actionlist));
} }
else else
{ {
@ -261,7 +262,7 @@ var et2_toolbar = et2_DOMWidget.extend(
this.actionlist.appendTo(this.div); this.actionlist.appendTo(this.div);
this.actionbox.appendTo(this.div); this.actionbox.appendTo(this.div);
var toolbar =jQuery('#'+this.id+'-'+'actionlist').find('button'), var toolbar =jQuery('#'+this.id+'-'+'actionlist').find('span').children(),
toolbox = jQuery('#'+this.id+'-'+'actionbox'), toolbox = jQuery('#'+this.id+'-'+'actionbox'),
menulist = jQuery('#'+this.id+'-'+'menulist'); menulist = jQuery('#'+this.id+'-'+'menulist');
@ -396,10 +397,6 @@ var et2_toolbar = et2_DOMWidget.extend(
getDOMNode: function(asker) getDOMNode: function(asker)
{ {
if(asker != this && asker.id && this.dropdowns[asker.id])
{
return this.dropdowns[asker.id][0];
}
return this.div[0]; return this.div[0];
} }
}); });