aboutsummaryrefslogtreecommitdiffstats
path: root/view/tpl
diff options
context:
space:
mode:
authorStefan Parviainen <saparvia@caterva.eu>2015-01-04 12:54:23 +0100
committerStefan Parviainen <saparvia@caterva.eu>2015-01-04 12:54:23 +0100
commit386f361855663b445d1497bbbabcf87891ce94d9 (patch)
treee003894f63a59b8ca7b7f707d9d3bfab353b6204 /view/tpl
parent42773a11220a5bba7bdf3395e3f00913dce9f5a0 (diff)
downloadvolse-hubzilla-386f361855663b445d1497bbbabcf87891ce94d9.tar.gz
volse-hubzilla-386f361855663b445d1497bbbabcf87891ce94d9.tar.bz2
volse-hubzilla-386f361855663b445d1497bbbabcf87891ce94d9.zip
Autocmplete suggestions for non-local users, also suggest from visited channel's connections
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,