diff options
| author | Maxence Lange <maxence@artificial-owl.com> | 2020-12-02 20:42:03 +0300 |
|---|---|---|
| committer | Maxence Lange <maxence@artificial-owl.com> | 2020-12-02 20:42:03 +0300 |
| commit | 0810fbbc0fcbe690fe871ac8181ecfe2ee29434c (patch) | |
| tree | d2cd934849863d770263aa3a6d71e913b41c63ed /js | |
| parent | f98d97244ab607ce65540a301974509656209ecb (diff) | |
display result by order
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
Diffstat (limited to 'js')
| -rw-r--r-- | js/circles.app.js | 2 | ||||
| -rw-r--r-- | js/circles.app.results.members.js | 11 | ||||
| -rw-r--r-- | js/circles.v1.members.js | 5 |
3 files changed, 14 insertions, 4 deletions
diff --git a/js/circles.app.js b/js/circles.app.js index 4f2c837a..79235e7e 100644 --- a/js/circles.app.js +++ b/js/circles.app.js @@ -60,6 +60,8 @@ var curr = { allowed_linked_groups: 0, allowed_federated_circles: 0, allowed_circles: 0, + searchOrder: 0, + searchOrderDisplayed: 0, defineCircle: function (data) { curr.circle = data.circle_id; diff --git a/js/circles.app.results.members.js b/js/circles.app.results.members.js index a995b9b3..e125420d 100644 --- a/js/circles.app.results.members.js +++ b/js/circles.app.results.members.js @@ -98,14 +98,19 @@ var resultMembers = { searchMembersResult: function(response) { - - elements.membersSearchResult.children().remove(); - if (response === null) { + elements.membersSearchResult.children().remove(); elements.membersSearchResult.fadeOut(0); return; } + if (response.order < curr.searchOrderDisplayed) { + return; + } + + elements.membersSearchResult.children().remove(); + curr.searchOrderDisplayed = response.order; + var currSearch = response.search; $.each(response.result, function(index, value) { elements.membersSearchResult.append('<div class="members_search" data-type="' + diff --git a/js/circles.v1.members.js b/js/circles.v1.members.js index 050a375b..c6568582 100644 --- a/js/circles.v1.members.js +++ b/js/circles.v1.members.js @@ -25,15 +25,18 @@ /** global: OC */ /** global: OCA */ +/** global: curr */ var members = { searchUsers: function(search, callback) { + curr.searchOrder++; OCA.Circles.api.request({ method: 'GET', url: OC.generateUrl('/apps/circles/v1/globalsearch'), data: { - search: search + search: search, + order: curr.searchOrder } }, callback); }, |