friendica
/
friendica
mirror of https://git.friendi.ca/friendica/friendica.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #4704 from MrPetovan/bug/4608-hashtag-autocomplete-ci 

Make hashtag autocomplete case-insensitive
pull/4711/head
Tobias Diekershoff 2018-03-29 09:41:30 +02:00 committed by GitHub
parent f84c8d665a 84b4ff58b6
commit 4326fa4e19
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Module/Hashtag.php
View File

@ -31,7 +31,7 @@ class Hashtag extends BaseModule
intval(TERM_HASHTAG) intval(TERM_HASHTAG)
); );
while ($tag = dba::fetch($taglist)) { while ($tag = dba::fetch($taglist)) {
$result[] = ['text' => strtolower($tag['term'])]; $result[] = ['text' => $tag['term']];
} }
dba::close($taglist); dba::close($taglist);

10
view/js/autocomplete.js
View File

@ -220,7 +220,15 @@ function string2bb(element) {
tags = { tags = {
match: /(^|\s)(\#)([^ \n]{2,})$/, match: /(^|\s)(\#)([^ \n]{2,})$/,
index: 3, index: 3,
search: function(term, callback) { $.getJSON(baseurl + '/hashtag/' + '?f=&t=' + term).done(function(data) { callback($.map(data, function(entry) { return entry.text.indexOf(term) === 0 ? entry : null; })); }); }, search: function(term, callback) {
$.getJSON(baseurl + '/hashtag/' + '?f=&t=' + term)
.done(function(data) {
callback($.map(data, function(entry) {
// .toLowerCase() enables case-insensitive search
return entry.text.toLowerCase().indexOf(term.toLowerCase()) === 0 ? entry : null;
}));
});
},
replace: function(item) { return "$1$2" + item.text + ' '; }, replace: function(item) { return "$1$2" + item.text + ' '; },
template: tag_format template: tag_format
}; };