From 9376ac646f71fb4454aa3f64c034cc36cf0c2dcd Mon Sep 17 00:00:00 2001 From: David Kelly Date: Wed, 12 Apr 2017 08:24:46 -0700 Subject: [PATCH 1/2] offline people sort change --- interface/resources/qml/hifi/Pal.qml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/interface/resources/qml/hifi/Pal.qml b/interface/resources/qml/hifi/Pal.qml index 1e72d71b18..8dfc277f05 100644 --- a/interface/resources/qml/hifi/Pal.qml +++ b/interface/resources/qml/hifi/Pal.qml @@ -1401,6 +1401,13 @@ Rectangle { var selectedIDs = getSelectedConnectionsUserNames(); connectionsUserModelData.sort(function (a, b) { var aValue = a[sortProperty].toString().toLowerCase(), bValue = b[sortProperty].toString().toLowerCase(); + if (!aValue && !bValue) { + return 0; + } else if (!aValue) { + return after; + } else if (!bValue) { + return before + } switch (true) { case (aValue < bValue): return before; case (aValue > bValue): return after; From 058a5b14a42c14e8038e5dc3e38f00df93b347af Mon Sep 17 00:00:00 2001 From: David Kelly Date: Wed, 12 Apr 2017 10:22:40 -0700 Subject: [PATCH 2/2] damn linter didn't run - vimrc work ahead... --- interface/resources/qml/hifi/Pal.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interface/resources/qml/hifi/Pal.qml b/interface/resources/qml/hifi/Pal.qml index 8dfc277f05..833e641b09 100644 --- a/interface/resources/qml/hifi/Pal.qml +++ b/interface/resources/qml/hifi/Pal.qml @@ -1406,7 +1406,7 @@ Rectangle { } else if (!aValue) { return after; } else if (!bValue) { - return before + return before; } switch (true) { case (aValue < bValue): return before;