diff options
author | Marvin Borner | 2018-06-03 00:25:14 +0200 |
---|---|---|
committer | Marvin Borner | 2018-06-03 00:25:14 +0200 |
commit | 5dd1aeed623821c2bce410e20926c97a656bcbed (patch) | |
tree | dd47ebb7a2485d1d4a9d86f4e6063c59e413aa9f /main/app/sprinkles/core/assets | |
parent | edd4feedadcebd6d872f56d6099057316f244067 (diff) |
Improved searching query (added 'like wildcards')
Diffstat (limited to 'main/app/sprinkles/core/assets')
-rw-r--r-- | main/app/sprinkles/core/assets/SiteAssets/css/main.css | 1 | ||||
-rw-r--r-- | main/app/sprinkles/core/assets/SiteAssets/js/main.js | 27 |
2 files changed, 17 insertions, 11 deletions
diff --git a/main/app/sprinkles/core/assets/SiteAssets/css/main.css b/main/app/sprinkles/core/assets/SiteAssets/css/main.css index da6243e..2afc962 100644 --- a/main/app/sprinkles/core/assets/SiteAssets/css/main.css +++ b/main/app/sprinkles/core/assets/SiteAssets/css/main.css @@ -223,6 +223,7 @@ hr.ChatHeaderDivider { /* main chat */ .SelectedReceiver { display: none; + height: 100%; } .ChatMessages { diff --git a/main/app/sprinkles/core/assets/SiteAssets/js/main.js b/main/app/sprinkles/core/assets/SiteAssets/js/main.js index b7ebd1f..0f3dfd8 100644 --- a/main/app/sprinkles/core/assets/SiteAssets/js/main.js +++ b/main/app/sprinkles/core/assets/SiteAssets/js/main.js @@ -143,26 +143,31 @@ $("#ImageUploadButton").on("click", function () { * SEARCH */ UserSearchBar.keyup(function () { - SearchResults.empty(); const RequestedUser = UserSearchBar.val(); - if (RequestedUser !== " " && RequestedUser !== "") + if (RequestedUser !== " " && RequestedUser !== "") { $.ajax({ - url: site.uri.public + "/api/users/u/" + RequestedUser, - success: function (answer) { - console.log("%c[SEARCH LOGGER] User " + RequestedUser + " was found!", "color: green"); - //var GifUrls = ["https://media.giphy.com/media/xUPGcg01dIAot4zyZG/giphy.gif", "https://media.giphy.com/media/IS9LfP9oSLdcY/giphy.gif", "https://media.giphy.com/media/5wWf7H0WTquIU1DFY4g/giphy.gif"]; - //var RandomGif = Math.floor((Math.random() * GifUrls.length)); - //var RandomGifUrl = GifUrls[RandomGif]; - //console.image(RandomGifUrl, 0.5); - - SearchResults.append("<img class='Avatar' src='" + answer.avatar + "'/><div class='UsersFullName'>" + answer.full_name + "</div>"); + url: site.uri.public + "/api/search/user/" + RequestedUser, + success: function (UserArray) { + SearchResults.empty(); + UserArray.forEach(function(User) { + console.log("%c[SEARCH LOGGER] User " + RequestedUser + " was found!", "color: green"); + //var GifUrls = ["https://media.giphy.com/media/xUPGcg01dIAot4zyZG/giphy.gif", "https://media.giphy.com/media/IS9LfP9oSLdcY/giphy.gif", "https://media.giphy.com/media/5wWf7H0WTquIU1DFY4g/giphy.gif"]; + //var RandomGif = Math.floor((Math.random() * GifUrls.length)); + //var RandomGifUrl = GifUrls[RandomGif]; + //console.image(RandomGifUrl, 0.5); + SearchResults.append("<img class='Avatar' src='" + User.avatar + "'/><div class='UsersFullName'>" + User.full_name + "</div>"); + }) }, error: function () { + SearchResults.empty(); console.log("%c[SEARCH LOGGER] User " + RequestedUser + " was not found!", "color: red"); alerts.ufAlerts().ufAlerts('fetch'); } }); + } else { + SearchResults.empty(); + } }); /** |