extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-02-24 22:21:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

- Propagate clearSelection() to children

Browse Source 
- Fix missed change in previous commit
This commit is contained in:
Nathan Gray 2014-09-01 18:44:13 +00:00
parent 3a49e4cfec
commit 12ab21e6a4
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
etemplate/js/et2_dataview_controller_selection.js
View File

@ -181,6 +181,10 @@ var et2_dataview_selectionManager = Class.extend(
{ {
this.setSelected(key, false); this.setSelected(key, false);
} }
for(var i = 0; i < this._children.length; i++)
{
this._children[i].resetSelection();
}
}, },
setSelected: function (_uid, _selected) { setSelected: function (_uid, _selected) {
@ -453,7 +457,12 @@ var et2_dataview_selectionManager = Class.extend(
// If not "_ctrl" is set, reset the selection // If not "_ctrl" is set, reset the selection
if (!_ctrl) if (!_ctrl)
{ {
this.resetSelection(); var top = this;
while(top._parent !== null)
{
top = top._parent;
}
top.resetSelection();
this._actionObjectManager.setAllSelected(false); // needed for hirachical stuff this._actionObjectManager.setAllSelected(false); // needed for hirachical stuff
} }

4
etemplate/js/et2_extension_nextmatch_actions.js
View File

@ -355,12 +355,12 @@ function nm_open_popup(_action, _selected)
if(_selected.length && typeof _selected[0] == 'object') if(_selected.length && typeof _selected[0] == 'object')
{ {
_action.data.nextmatch = _selected[0]._context._widget; _action.data.nextmatch = _selected[0]._context._widget;
nm_popup_ids = _ids nm_popup_ids = _selected
} }
else else
{ {
egw().debug("warn", 'Not proper format for IDs, should be array of egwActionObject',_ids); egw().debug("warn", 'Not proper format for IDs, should be array of egwActionObject',_ids);
nm_popup_ids = _ids; nm_popup_ids = _selected;
} }
var dialog = jQuery('.action_popup-content',popup); var dialog = jQuery('.action_popup-content',popup);