harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

don't offer forum (@name+) completion in comments, since it won't do anything.

Browse Source
This commit is contained in:
friendica 2014-10-23 22:00:16 -07:00
parent 34781433c1
commit 1a9b8d4f0c
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mod/acl.php
View File

@ -11,7 +11,7 @@ function acl_init(&$a){
$count = (x($_REQUEST,'count')?$_REQUEST['count']:100); $count = (x($_REQUEST,'count')?$_REQUEST['count']:100);
$search = (x($_REQUEST,'search')?$_REQUEST['search']:""); $search = (x($_REQUEST,'search')?$_REQUEST['search']:"");
$type = (x($_REQUEST,'type')?$_REQUEST['type']:""); $type = (x($_REQUEST,'type')?$_REQUEST['type']:"");
$noforums = (x($_REQUEST,'n') ? $_REQUEST['n'] : false);
// For use with jquery.autocomplete for private mail completion // For use with jquery.autocomplete for private mail completion
@ -230,7 +230,7 @@ function acl_init(&$a){
if(strpos($g['hash'],'/')) if(strpos($g['hash'],'/'))
continue; continue;
if(($g['abook_their_perms'] & PERMS_W_TAGWALL) && $type == 'c') { if(($g['abook_their_perms'] & PERMS_W_TAGWALL) && $type == 'c' && (! $noforums)) {
$contacts[] = array( $contacts[] = array(
"type" => "c", "type" => "c",
"photo" => "images/twopeople.png", "photo" => "images/twopeople.png",

2
view/js/main.js
View File

@ -575,7 +575,7 @@ function updateConvItems(mode,data) {
} }
/* autocomplete @nicknames */ /* autocomplete @nicknames */
$(".comment-edit-form textarea").contact_autocomplete(baseurl+"/acl"); $(".comment-edit-form textarea").contact_autocomplete(baseurl+"/acl?f=&n=1");
var bimgs = $(".wall-item-body img").not(function() { return this.complete; }); var bimgs = $(".wall-item-body img").not(function() { return this.complete; });
var bimgcount = bimgs.length; var bimgcount = bimgs.length;

4
view/tpl/display-head.tpl
View File

@ -1,8 +1,8 @@
<script> <script>
$(document).ready(function() { $(document).ready(function() {
$(".comment-edit-wrapper textarea").contact_autocomplete(baseurl+"/acl"); $(".comment-edit-wrapper textarea").contact_autocomplete(baseurl+"/acl?f=&n=1");
// make auto-complete work in more places // make auto-complete work in more places
$(".wall-item-comment-wrapper textarea").contact_autocomplete(baseurl+"/acl"); $(".wall-item-comment-wrapper textarea").contact_autocomplete(baseurl+"/acl?f=&n=1");
}); });
</script> </script>