sforkowany z mirror/friendica
Merge pull request #3664 from annando/acl-mentions
ACL automentions are now in the new format2022.09-rc
commit
f27a731676
18
js/acl.js
18
js/acl.js
|
@ -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;
|
||||||
}
|
}
|
||||||
|
|
Ładowanie…
Reference in New Issue