From 9a94c35120480c5a12de8ab0954a16e9f10f7eb6 Mon Sep 17 00:00:00 2001 From: Fabrixxm Date: Wed, 18 Dec 2013 10:17:38 -0500 Subject: [PATCH] acl selector add and remove mentions when a forum is selected. --- include/acl_selectors.php | 6 +++-- js/acl.js | 48 ++++++++++++++++++++++++++++++--- js/fk.autocomplete.js | 2 +- view/templates/acl_selector.tpl | 6 +---- 4 files changed, 50 insertions(+), 12 deletions(-) diff --git a/include/acl_selectors.php b/include/acl_selectors.php index 6c0222e1c4..01c2f1d706 100644 --- a/include/acl_selectors.php +++ b/include/acl_selectors.php @@ -474,14 +474,15 @@ function acl_lookup(&$a, $out_type = 'json') { "name" => $g['name'], "id" => intval($g['id']), "uids" => array_map("intval", explode(",",$g['uids'])), - "link" => '' + "link" => '', + "forum" => '0' ); } } if ($type=='' || $type=='c'){ - $r = q("SELECT `id`, `name`, `nick`, `micro`, `network`, `url`, `attag` FROM `contact` + $r = q("SELECT `id`, `name`, `nick`, `micro`, `network`, `url`, `attag`, forum FROM `contact` WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 AND `pending` = 0 AND `archive` = 0 AND `notify` != '' $sql_extra2 ORDER BY `name` ASC ", @@ -541,6 +542,7 @@ function acl_lookup(&$a, $out_type = 'json') { "network" => $g['network'], "link" => $g['url'], "nick" => ($g['attag']) ? $g['attag'] : $g['nick'], + "forum" => $g['forum'] ); } } diff --git a/js/acl.js b/js/acl.js index fc6a6c0c1d..f258a29c73 100644 --- a/js/acl.js +++ b/js/acl.js @@ -26,10 +26,42 @@ function ACL(backend_url, preset){ $("#acl-search").keypress(that.on_search); $("#acl-wrapper").parents("form").submit(that.on_submit); + /* add/remove mentions */ + that.element = $("#profile-jot-text"); + that.htmlelm = that.element.get()[0]; + /* startup! */ that.get(0,100); } +ACL.prototype.remove_mention = function(nick) { + searchText = '@'+nick+ " "; + // 'editor' is defined in jot-header.tpl : false=plaintext, true:tinyMCE + if (editor==false) { + start = that.element.val().search(searchText); + if ( start<0) return; + end = start+searchText.length; + that.element.setSelection(start,end).replaceSelectedText('').collapseSelection(false); + } else { + start = tinyMCE.activeEditor.getContent({format : 'raw'}).search( searchText ); + if ( start<0 ) return; + txt = tinyMCE.activeEditor.getContent(); + newtxt = txt.replace(searchText, ''); + tinyMCE.activeEditor.setContent(newtxt); + } +} + +ACL.prototype.add_mention = function(nick) { + // 'editor' is defined in jot-header.tpl : false=plaintext, true:tinyMCE + if (editor==false) { + if ( that.element.val().search( '@'+nick) >= 0 ) return; + that.element.val( "@"+nick+" " + that.element.val() ); + } else { + if ( tinyMCE.activeEditor.getContent({format : 'raw'}).search( '@'+nick) >= 0 ) return; + tinyMCE.activeEditor.dom.add(tinyMCE.activeEditor.getBody(), 'span', {}, '@'+nick+" "); + } +} + ACL.prototype.on_submit = function(){ aclfileds = $("#acl-fields").html(""); $(that.allow_gid).each(function(i,v){ @@ -105,7 +137,8 @@ ACL.prototype.on_button_hide = function(event){ ACL.prototype.set_allow = function(itemid){ type = itemid[0]; - id = parseInt(itemid.substr(1)); + id = parseInt(itemid.substr(1)); + switch(type){ case "g": if (that.allow_gid.indexOf(id)<0){ @@ -118,8 +151,10 @@ ACL.prototype.set_allow = function(itemid){ case "c": if (that.allow_cid.indexOf(id)<0){ that.allow_cid.push(id) + if (that.data[id].forum=="1") that.add_mention(that.data[id].nick); } else { that.allow_cid.remove(id); + if (that.data[id].forum=="1") that.remove_mention(that.data[id].nick); } if (that.deny_cid.indexOf(id)>=0) that.deny_cid.remove(id); break; @@ -129,7 +164,8 @@ ACL.prototype.set_allow = function(itemid){ ACL.prototype.set_deny = function(itemid){ type = itemid[0]; - id = parseInt(itemid.substr(1)); + id = parseInt(itemid.substr(1)); + switch(type){ case "g": if (that.deny_gid.indexOf(id)<0){ @@ -140,6 +176,7 @@ ACL.prototype.set_deny = function(itemid){ if (that.allow_gid.indexOf(id)>=0) that.allow_gid.remove(id); break; case "c": + if (that.data[id].forum=="1") that.remove_mention(that.data[id].nick); if (that.deny_cid.indexOf(id)<0){ that.deny_cid.push(id) } else { @@ -246,17 +283,20 @@ ACL.prototype.get = function(start,count, search){ ACL.prototype.populate = function(data){ var height = Math.ceil(data.tot / that.nw) * 42; that.list_content.height(height); + that.data = {}; $(data.items).each(function(){ - html = "
"+that.item_tpl+"
"; - html = html.format(this.photo, this.name, this.type, this.id, '', this.network, this.link); + html = "
"+that.item_tpl+"
"; + html = html.format(this.photo, this.name, this.type, this.id, (this.forum=='1'?'forum':''), this.network, this.link); if (this.uids!=undefined) that.group_uids[this.id] = this.uids; //console.log(html); that.list_content.append(html); + that.data[this.id] = this; }); $(".acl-list-item img[data-src]", that.list_content).each(function(i, el){ // Add src attribute for images with a data-src attribute $(el).attr('src', $(el).data("src")); }); + that.update_view(); } diff --git a/js/fk.autocomplete.js b/js/fk.autocomplete.js index b1bc40be28..2334bb4a2c 100644 --- a/js/fk.autocomplete.js +++ b/js/fk.autocomplete.js @@ -89,7 +89,7 @@ ACPopup.prototype._search = function(){ }); } - ACPopup.prototype.add = function(label, value){ +ACPopup.prototype.add = function(label, value){ var that=this; var elm = $("
"+label+"
"); elm.click(function(e){ diff --git a/view/templates/acl_selector.tpl b/view/templates/acl_selector.tpl index 5fd11e7569..7a9514ea86 100644 --- a/view/templates/acl_selector.tpl +++ b/view/templates/acl_selector.tpl @@ -1,8 +1,4 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} +
{{$showall}} -- 2.39.5