aboutsummaryrefslogtreecommitdiffstats
path: root/view/tpl/jot-header.tpl
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2015-01-04 19:57:15 -0800
committerfriendica <info@friendica.com>2015-01-04 19:57:15 -0800
commit0c0a004e45dc3ae97062db09e057223675fd077c (patch)
tree503422dd7d23104a4178b19d4b9c45258e4765ab /view/tpl/jot-header.tpl
parentaa18a43effabc389e789626b511fa83c0d8dbf34 (diff)
parentfc72762f52a5c3aec2f06b49153392333cacba2f (diff)
downloadvolse-hubzilla-0c0a004e45dc3ae97062db09e057223675fd077c.tar.gz
volse-hubzilla-0c0a004e45dc3ae97062db09e057223675fd077c.tar.bz2
volse-hubzilla-0c0a004e45dc3ae97062db09e057223675fd077c.zip
Merge branch 'master' into trinidad
Diffstat (limited to 'view/tpl/jot-header.tpl')
-rwxr-xr-xview/tpl/jot-header.tpl5
1 files changed, 4 insertions, 1 deletions
diff --git a/view/tpl/jot-header.tpl b/view/tpl/jot-header.tpl
index c23395b03..8d26fc653 100755
--- a/view/tpl/jot-header.tpl
+++ b/view/tpl/jot-header.tpl
@@ -10,7 +10,10 @@ 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",[channelId]); // Also gives suggestions from current channel's connections
+ if(typeof channelId === 'undefined')
+ $("#profile-jot-text").contact_autocomplete(baseurl+"/acl");
+ else
+ $("#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,