From 0f6a0d790205580e14c11e19d0100ed3c400c89d Mon Sep 17 00:00:00 2001 From: Marco Nassabain Date: Wed, 17 Mar 2021 21:24:08 +0100 Subject: =?UTF-8?q?=F0=9F=90=9B=20Share=20dropdown:=20only=20show=20result?= =?UTF-8?q?s=20of=20most=20recent=20search?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Marco Nassabain --- js/controller/ShareController.js | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/js/controller/ShareController.js b/js/controller/ShareController.js index e1255e92a..7c1b1a649 100644 --- a/js/controller/ShareController.js +++ b/js/controller/ShareController.js @@ -15,23 +15,29 @@ app.controller('ShareController', function (ShareResource, Loading) { /** Array containing users to share an item with */ this.userList = []; + /** Value used to check if the received response is the most recent one */ + this.searchQuery = ''; + /** * @param search Username search query * * Retrieve users matching search query using OC */ this.searchUsers = function(search) { - Loading.setLoading('user', true); if (!search || search === '') { this.userList = []; - Loading.setLoading('user', false); return; } + Loading.setLoading('user', true); + this.searchQuery = search; + var response = ShareResource.getUsers(search); response.then((response) => { - this.userList = response.ocs.data.users; - Loading.setLoading('user', false); + if (this.searchQuery === search) { + this.userList = response.ocs.data.users; + Loading.setLoading('user', false); + } }); // TODO: catch error }; -- cgit v1.2.3