MrPetovan/friendica
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

fix textarea/tinymce, add contact id to mention

Browse source
This commit is contained in:
Fabrixxm 2013-12-18 10:48:09 -05:00
parent 9a94c35120
commit 53dc1ce31f
1 changed files with 22 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
js/acl.js
View file

@ -34,11 +34,11 @@ function ACL(backend_url, preset){
that.get(0,100); that.get(0,100);
} }
ACL.prototype.remove_mention = function(nick) { ACL.prototype.remove_mention = function(id) {
searchText = '@'+nick+ " "; var nick = that.data[id].nick;
// 'editor' is defined in jot-header.tpl : false=plaintext, true:tinyMCE var searchText = "@"+nick+"+"+id+" ";
if (editor==false) { if (tinyMCE.activeEditor===null) {
start = that.element.val().search(searchText); start = that.element.val().indexOf(searchText);
if ( start<0) return; if ( start<0) return;
end = start+searchText.length; end = start+searchText.length;
that.element.setSelection(start,end).replaceSelectedText('').collapseSelection(false); that.element.setSelection(start,end).replaceSelectedText('').collapseSelection(false);
@ -51,14 +51,15 @@ ACL.prototype.remove_mention = function(nick) {
} }
} }
ACL.prototype.add_mention = function(nick) { ACL.prototype.add_mention = function(id) {
// 'editor' is defined in jot-header.tpl : false=plaintext, true:tinyMCE var nick = that.data[id].nick;
if (editor==false) { var searchText = "@"+nick+"+"+id+" ";
if ( that.element.val().search( '@'+nick) >= 0 ) return; if (tinyMCE.activeEditor===null) {
that.element.val( "@"+nick+" " + that.element.val() ); if ( that.element.val().indexOf( searchText) >= 0 ) return;
that.element.val( searchText + that.element.val() );
} else { } else {
if ( tinyMCE.activeEditor.getContent({format : 'raw'}).search( '@'+nick) >= 0 ) return; if ( tinyMCE.activeEditor.getContent({format : 'raw'}).search(searchText) >= 0 ) return;
tinyMCE.activeEditor.dom.add(tinyMCE.activeEditor.getBody(), 'span', {}, '@'+nick+" "); tinyMCE.activeEditor.dom.add(tinyMCE.activeEditor.getBody(), 'span', {}, searchText);
} }
} }
@ -151,10 +152,10 @@ ACL.prototype.set_allow = function(itemid){
case "c": case "c":
if (that.allow_cid.indexOf(id)<0){ if (that.allow_cid.indexOf(id)<0){
that.allow_cid.push(id) that.allow_cid.push(id)
if (that.data[id].forum=="1") that.add_mention(that.data[id].nick); if (that.data[id].forum=="1") that.add_mention(id);
} else { } else {
that.allow_cid.remove(id); that.allow_cid.remove(id);
if (that.data[id].forum=="1") that.remove_mention(that.data[id].nick); if (that.data[id].forum=="1") that.remove_mention(id);
} }
if (that.deny_cid.indexOf(id)>=0) that.deny_cid.remove(id); if (that.deny_cid.indexOf(id)>=0) that.deny_cid.remove(id);
break; break;
@ -176,7 +177,7 @@ ACL.prototype.set_deny = function(itemid){
if (that.allow_gid.indexOf(id)>=0) that.allow_gid.remove(id); if (that.allow_gid.indexOf(id)>=0) that.allow_gid.remove(id);
break; break;
case "c": case "c":
if (that.data[id].forum=="1") that.remove_mention(that.data[id].nick); if (that.data[id].forum=="1") that.remove_mention(id);
if (that.deny_cid.indexOf(id)<0){ if (that.deny_cid.indexOf(id)<0){
that.deny_cid.push(id) that.deny_cid.push(id)
} else { } else {
@ -188,9 +189,13 @@ ACL.prototype.set_deny = function(itemid){
that.update_view(); that.update_view();
} }
ACL.prototype.is_show_all = function() {
return (that.allow_gid.length==0 && that.allow_cid.length==0 &&
that.deny_gid.length==0 && that.deny_cid.length==0);
}
ACL.prototype.update_view = function(){ ACL.prototype.update_view = function(){
if (that.allow_gid.length==0 && that.allow_cid.length==0 && if (this.is_show_all()){
that.deny_gid.length==0 && that.deny_cid.length==0){
that.showall.addClass("selected"); that.showall.addClass("selected");
/* jot acl */ /* jot acl */
$('#jot-perms-icon').removeClass('lock').addClass('unlock'); $('#jot-perms-icon').removeClass('lock').addClass('unlock');