bitPickups/friendica_2021.01_tupambae_shared_hosting
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #3664 from annando/acl-mentions

Browse source 
ACL automentions are now in the new format
This commit is contained in:
Tobias Diekershoff 2017-08-28 06:53:47 +02:00 committed by GitHub
commit f27a731676
1 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
js/acl.js
View file

@ -47,7 +47,14 @@ ACL.prototype.remove_mention = function(id) {
return; return;
} }
var nick = this.data[id].nick; var nick = this.data[id].nick;
var searchText = "@" + nick + "+" + id + " "; var addr = this.data[id].addr;
if (addr != "") {
var searchText = "@" + addr + " ";
} else {
var searchText = "@" + nick + "+" + id + " ";
}
var start = this.element.val().indexOf(searchText); var start = this.element.val().indexOf(searchText);
if (start < 0) { if (start < 0) {
return; return;
@ -61,7 +68,14 @@ ACL.prototype.add_mention = function(id) {
return; return;
} }
var nick = this.data[id].nick; var nick = this.data[id].nick;
var searchText = "@" + nick + "+" + id + " "; var addr = this.data[id].addr;
if (addr != "") {
var searchText = "@" + addr + " ";
} else {
var searchText = "@" + nick + "+" + id + " ";
}
if (this.element.val().indexOf( searchText) >= 0 ) { if (this.element.val().indexOf( searchText) >= 0 ) {
return; return;
} }