Merge pull request #3664 from annando/acl-mentions
ACL automentions are now in the new format
This commit is contained in:
commit
f27a731676
1 changed files with 16 additions and 2 deletions
14
js/acl.js
14
js/acl.js
|
@ -47,7 +47,14 @@ ACL.prototype.remove_mention = function(id) {
|
|||
return;
|
||||
}
|
||||
var nick = this.data[id].nick;
|
||||
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 addr = this.data[id].addr;
|
||||
|
||||
if (addr != "") {
|
||||
var searchText = "@" + addr + " ";
|
||||
} else {
|
||||
var searchText = "@" + nick + "+" + id + " ";
|
||||
}
|
||||
|
||||
if (this.element.val().indexOf( searchText) >= 0 ) {
|
||||
return;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue