aboutsummaryrefslogtreecommitdiffstats
path: root/view/tpl
diff options
context:
space:
mode:
authorRedMatrix <info@friendica.com>2015-01-05 07:30:07 +1100
committerRedMatrix <info@friendica.com>2015-01-05 07:30:07 +1100
commitebb1a616849e275111cd24a20d08031aff4c4161 (patch)
tree72a12265027374eef1fb04a12abaa34c284c7337 /view/tpl
parentcb181993a8c63cca8f13c7890a6ab1544f44676f (diff)
parentac4c17dd4c4df70b31fd7246108fdbc9d6f2a593 (diff)
downloadvolse-hubzilla-ebb1a616849e275111cd24a20d08031aff4c4161.tar.gz
volse-hubzilla-ebb1a616849e275111cd24a20d08031aff4c4161.tar.bz2
volse-hubzilla-ebb1a616849e275111cd24a20d08031aff4c4161.zip
Merge pull request #816 from pafcu/acl
Autocomplete improvements
Diffstat (limited to 'view/tpl')
-rwxr-xr-xview/tpl/head.tpl2
-rwxr-xr-xview/tpl/jot-header.tpl2
2 files changed, 3 insertions, 1 deletions
diff --git a/view/tpl/head.tpl b/view/tpl/head.tpl
index 9c9e7b970..8a32bd7f6 100755
--- a/view/tpl/head.tpl
+++ b/view/tpl/head.tpl
@@ -26,6 +26,8 @@
var localUser = {{if $local_user}}{{$local_user}}{{else}}false{{/if}};
var zid = {{if $zid}}'{{$zid}}'{{else}}null{{/if}};
var justifiedGalleryActive = false;
+ {{if $channel_hash}}var channelHash = '{{$channel_hash}}';{{/if}}
+ {{if $channel_id}}var channelId = '{{$channel_id}}';{{/if}}{{* Used in e.g. autocomplete *}}
</script>
diff --git a/view/tpl/jot-header.tpl b/view/tpl/jot-header.tpl
index bdbb7d09c..c23395b03 100755
--- a/view/tpl/jot-header.tpl
+++ b/view/tpl/jot-header.tpl
@@ -10,7 +10,7 @@ function initEditor(cb){
if(plaintext == 'none') {
$("#profile-jot-text-loading").spin(false).hide();
$("#profile-jot-text").css({ 'height': 200, 'color': '#000' });
- $("#profile-jot-text").contact_autocomplete(baseurl+"/acl");
+ $("#profile-jot-text").contact_autocomplete(baseurl+"/acl",[channelId]); // Also gives suggestions from current channel's connections
editor = true;
$("a#jot-perms-icon").colorbox({
'inline' : true,