extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-10-06 02:02:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

Don't apply selection if it is not returned after an update, but keep it in case the user needs to scroll first.

Browse Source
This commit is contained in:
Nathan Gray 2015-04-14 16:48:53 +00:00
parent 897a16cd8f
commit b08f90d930
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
etemplate/js/et2_extension_nextmatch_controller.js
View File

@ -565,12 +565,13 @@ var et2_nextmatch_controller = et2_dataview_controller.extend(et2_IDataProvider,
{ {
this.self._selectionMgr.selectAll(); this.self._selectionMgr.selectAll();
} }
for(var i = 0; i < this.self.kept_selection.ids.length || 0; i++) for(var i = (this.self.kept_selection.ids.length || 1)-1; i >= 0; i--)
{ {
// Only keep the selected if they came back in the fetch // Only keep the selected if they came back in the fetch
if(_response.order.indexOf(this.self.kept_selection.ids[i]) >= 0) if(_response.order.indexOf(this.self.kept_selection.ids[i]) >= 0)
{ {
this.self._selectionMgr.setSelected(this.self.kept_selection.ids[i],true); this.self._selectionMgr.setSelected(this.self.kept_selection.ids[i],true);
this.self.kept_selection.ids.splice(i,1);
} }
} }
if(this.self.kept_focus && _response.order.indexOf(this.self.kept_focus) >= 0) if(this.self.kept_focus && _response.order.indexOf(this.self.kept_focus) >= 0)
@ -579,7 +580,10 @@ var et2_nextmatch_controller = et2_dataview_controller.extend(et2_IDataProvider,
} }
// Re-expanding rows handled in et2_extension_nextmatch_rowProvider // Re-expanding rows handled in et2_extension_nextmatch_rowProvider
// Expansions might still be valid, so we don't clear them // Expansions might still be valid, so we don't clear them
this.self.kept_selection = null; if(this.self.kept_selection != null && this.self.kept_selection.length == 0)
{
this.self.kept_selection = null;
}
this.self.kept_focus = null; this.self.kept_focus = null;
} }
}, },