Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-04-10 00:04:18 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix broken merge

Browse source
This commit is contained in:
howard-stearns 2017-03-07 12:10:52 -08:00
parent 8a489f36f4
commit cb41b9135b
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
interface/resources/qml/hifi/Pal.qml
View file

@ -627,6 +627,8 @@ Rectangle {
var sortProperty = column ? column.role : "displayName";
var before = (table.sortIndicatorOrder === Qt.AscendingOrder) ? -1 : 1;
var after = -1 * before;
// get selection(s) before sorting
var selectedIDs = getSelectedSessionIDs();
userModelData.sort(function (a, b) {
var aValue = a[sortProperty].toString().toLowerCase(), bValue = b[sortProperty].toString().toLowerCase();
switch (true) {
@ -639,7 +641,6 @@ Rectangle {
userModel.clear();
var userIndex = 0;
// get selection(s) before sorting
var newSelectedIndexes = [];
userModelData.forEach(function (datum) {
function init(property) {