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

Selections do now get properly synchronized betweed egwAction code and selection manager

Browse Source
This commit is contained in:
Andreas Stöckel 2012-03-28 16:35:28 +00:00
parent d52ab179a7
commit 74a15d8396
1 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
etemplate/js/et2_dataview_controller_selection.js
View File

@ -33,6 +33,7 @@ var et2_dataview_selectionManager = Class.extend({
this._registeredRows = {}; this._registeredRows = {};
this._focusedEntry = null; this._focusedEntry = null;
this._invertSelection = false; this._invertSelection = false;
this._inUpdate = false;
}, },
setIndexMap: function (_indexMap) { setIndexMap: function (_indexMap) {
@ -69,6 +70,20 @@ var et2_dataview_selectionManager = Class.extend({
if (_links) if (_links)
{ {
var dummyAOI = new egwActionObjectInterface(); var dummyAOI = new egwActionObjectInterface();
var self = this;
// Handling for Action Implementations updating the state
dummyAOI.doSetState = function (_state) {
if (egwBitIsSet(_state, EGW_AO_STATE_FOCUSED) && !self._inUpdate)
{
self.resetSelection();
self._updateState(_uid, _state);
self.setFocused(_uid, true);
}
};
// Implementation of the getDOMNode function, so that the event
// handlers can be properly bound
dummyAOI.getDOMNode = function () {return _tr}; dummyAOI.getDOMNode = function () {return _tr};
// Create an action object for the tr and connect it to a dummy AOI // Create an action object for the tr and connect it to a dummy AOI
@ -162,7 +177,7 @@ var et2_dataview_selectionManager = Class.extend({
_updateState: function (_uid, _state) { _updateState: function (_uid, _state) {
var entry = this._getRegisteredRowsEntry(_uid); var entry = this._getRegisteredRowsEntry(_uid);
this._updateEntryState(_entry, _state); this._updateEntryState(entry, _state);
return entry; return entry;
}, },
@ -180,6 +195,7 @@ var et2_dataview_selectionManager = Class.extend({
// Update the state if it has changed // Update the state if it has changed
if ((_entry.aoi && _entry.aoi.getState() !== _state) || _entry.state != _state) if ((_entry.aoi && _entry.aoi.getState() !== _state) || _entry.state != _state)
{ {
this._inUpdate = true; // Recursion prevention
// Update the visual state // Update the visual state
if (_entry.aoi) if (_entry.aoi)
@ -187,6 +203,15 @@ var et2_dataview_selectionManager = Class.extend({
_entry.aoi.setState(_state); _entry.aoi.setState(_state);
} }
// Update the state of the action object
if (_entry.ao)
{
_entry.ao.setSelected(egwBitIsSet(_state, EGW_AO_STATE_SELECTED));
_entry.ao.setFocused(egwBitIsSet(_state, EGW_AO_STATE_FOCUSED));
}
this._inUpdate = false;
// Delete the element if state was set to "NORMAL" and there is // Delete the element if state was set to "NORMAL" and there is
// no tr // no tr
if (_state === EGW_AO_STATE_NORMAL && !_entry.tr) if (_state === EGW_AO_STATE_NORMAL && !_entry.tr)