friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Merge pull request #3664 from annando/acl-mentions 

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
parent ccb54f3ee4 1190863e1e
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;
}
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);
if (start < 0) {
return;
@ -61,7 +68,14 @@ ACL.prototype.add_mention = function(id) {
return;
}
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 ) {
return;
}