extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-10 16:08:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Added data property to egwAction, fixed bug in popup menu group generation

Browse Source
This commit is contained in:
Andreas Stöckel 2011-03-23 20:08:33 +00:00
parent 4b380ca119
commit bbe645ee02
2 changed files with 28 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
phpgwapi/js/egw_action/egw_action.js
View File

@ -54,6 +54,8 @@ function egwAction(_parent, _id, _caption, _iconUrl, _onExecute, _allowOnMultipl
this.iconUrl = _iconUrl;
this.allowOnMultiple = _allowOnMultiple;
this.enabled = true;
this.hideOnDisabled = false;
this.data = null; // Data which can be freely assigned to the action
this.type = "default"; //All derived classes have to override this!
this.canHaveChildren = false; //Has to be overwritten by inherited action classes
@ -271,12 +273,21 @@ egwAction.prototype.set_allowOnMultiple = function(_value)
this.allowOnMultiple = _value;
}
egwAction.prototype.set_hideOnDisabled = function(_value)
{
this.hideOnDisabled = _value;
}
egwAction.prototype.set_data = function(_value)
{
this.data = _value;
}
egwAction.prototype.updateAction = function(_data)
{
egwActionStoreJSON(_data, this, true);
}
function _egwActionTreeContains(_tree, _elem)
{
for (var i = 0; i < _tree.length; i++)
@ -1354,7 +1365,7 @@ egwActionObject.prototype.getSelectedLinks = function(_actionType)
var llink = actionLinks[olink.actionId];
llink.enabled = olink.actionObj.enabled && llink.enabled &&
olink.enabled && olink.visible;
llink.visible = llink.visible || olink.visible;
llink.visible = (llink.visible || olink.visible);
llink.cnt++;
}
}
@ -1368,6 +1379,8 @@ egwActionObject.prototype.getSelectedLinks = function(_actionType)
(actionLinks[k].cnt >= testedSelected.length) &&
(actionLinks[k].actionObj.allowOnMultiple ||
actionLinks[k].cnt == 1);
actionLinks[k].visible = actionLinks[k].visible &&
(actionLinks[k].enabled || !actionLinks[k].actionObj.hideOnDisabled);
}
// Return an object which contains the accumulated actionLinks and all selected

18
phpgwapi/js/egw_action/egw_action_popup.js
View File

@ -256,13 +256,11 @@ function egwPopupActionImplementation()
*/
ai._buildMenuLayer = function(_menu, _groups, _selected, _enabled)
{
var firstGroup = true;
for (var i = 0; i < _groups.length; i++)
{
// Add an seperator after each group
if (i != 0)
{
_menu.addItem("", "-");
}
var firstElem = true;
// Go through the elements of each group
for (var j = 0; j < _groups[i].length; j++)
@ -271,6 +269,14 @@ function egwPopupActionImplementation()
if (link.visible)
{
// Add an seperator after each group
if (!firstGroup && firstElem)
{
_menu.addItem("", "-");
}
firstElem = false;
var item = _menu.addItem(link.actionObj.id, link.actionObj.caption,
link.actionObj.iconUrl);
item["default"] = link.actionObj["default"];
@ -293,6 +299,8 @@ function egwPopupActionImplementation()
}
}
}
firstGroup = firstGroup && firstElem;
}
}