diff options
| author | friendica <info@friendica.com> | 2015-01-04 12:30:51 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2015-01-04 12:30:51 -0800 |
| commit | 82a37ebae3622c28b7ffcc21c5e3d8b78279ebdf (patch) | |
| tree | fdbd9a9692bc00cada8f2604daa569fd356ea9b4 /view/tpl | |
| parent | edd1ad37c47e6f8154fd2da352decc457d6af55c (diff) | |
| parent | ebb1a616849e275111cd24a20d08031aff4c4161 (diff) | |
| download | volse-hubzilla-82a37ebae3622c28b7ffcc21c5e3d8b78279ebdf.tar.gz volse-hubzilla-82a37ebae3622c28b7ffcc21c5e3d8b78279ebdf.tar.bz2 volse-hubzilla-82a37ebae3622c28b7ffcc21c5e3d8b78279ebdf.zip | |
Merge branch 'master' into trinidad
Diffstat (limited to 'view/tpl')
| -rwxr-xr-x | view/tpl/head.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/jot-header.tpl | 2 |
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, |