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

Lock UI with loader while waiting for selected rows query to complete

Browse Source
This commit is contained in:
nathangray 2018-05-02 14:10:03 -06:00
parent 2b903281e2
commit b05662201f
1 changed files with 50 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
api/js/etemplate/et2_dataview_controller_selection.js
View File

@ -57,6 +57,11 @@ var et2_dataview_selectionManager = (function(){ "use strict"; return Class.exte
this._parent._children.push(this); this._parent._children.push(this);
} }
// Use our selection instead of object manager's to handle not-loaded rows
this._actionObjectManager.getAllSelected = jQuery.proxy(
this.getAllSelected, this
);
// Internal map which contains all curently selected uids and their // Internal map which contains all curently selected uids and their
// state // state
this._registeredRows = {}; this._registeredRows = {};
@ -195,6 +200,12 @@ var et2_dataview_selectionManager = (function(){ "use strict"; return Class.exte
egwSetBit(entry.state, EGW_AO_STATE_SELECTED, _selected)); egwSetBit(entry.state, EGW_AO_STATE_SELECTED, _selected));
}, },
getAllSelected: function()
{
var selected = this.getSelected();
return selected.all || (selected.ids.length === this._total);
},
setFocused: function (_uid, _focused) { setFocused: function (_uid, _focused) {
// Reset the state of the currently focused entry // Reset the state of the currently focused entry
if (this._focusedEntry) if (this._focusedEntry)
@ -406,6 +417,23 @@ var et2_dataview_selectionManager = (function(){ "use strict"; return Class.exte
_state ^= EGW_AO_STATE_SELECTED; _state ^= EGW_AO_STATE_SELECTED;
} }
// Attach ao if not there, happens for rows loaded for selection, but
// not displayed yet
if(!_entry.ao && _entry.uid)
{
var _links = [];
for (var key in this._registeredRows)
{
if(this._registeredRows[key].ao && this._registeredRows[key].ao.actionLinks)
{
_links = this._registeredRows[key].ao.actionLinks;
break;
}
}
this._attachActionObjectInterface(_entry, null, _entry.uid);
this._attachActionObject(_entry, null, _entry.uid, _links, _entry.idx);
}
// 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)
{ {
@ -527,16 +555,29 @@ var et2_dataview_selectionManager = (function(){ "use strict"; return Class.exte
} }
// Query all unknown ranges from the server // Query all unknown ranges from the server
for (var i = 0; i < queryRanges.length; i++) var that = this;
this._fetchPromise = new Promise(function (resolve)
{ {
this._queryRangeCallback.call(this._context, queryRanges[i], var count = queryRanges.length;
function (_order) { for (var i = 0; i < queryRanges.length; i++)
for (var j = 0; j < _order.length; j++) {
{ that._queryRangeCallback.call(that._context, queryRanges[i],
this.setSelected(_order[j], true); function (_order) {
} for (var j = 0; j < _order.length; j++)
}, this); {
} this.setSelected(_order[j], true);
}
if(--count <= 0)
{
// Done waiting
resolve();
}
}, that);
}
}).finally(function() {egw.loading_prompt('select_wait', false)});
// Lock the UI - we NEED these before the user does something with them
egw.loading_prompt('select_wait', true);
} }
});}).call(this); });}).call(this);