diff options
| author | friendica <info@friendica.com> | 2015-01-07 14:39:09 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2015-01-07 14:39:09 -0800 |
| commit | 0657195125675700eeb9bcd1bc92f4299cac0304 (patch) | |
| tree | 2e6d2df8fd42b289b947a16f0c5f0009a2c98043 /view/tpl/jot-header.tpl | |
| parent | a1e5a661fa8f87793cab0fe9c34f507dafb65d99 (diff) | |
| parent | 087d6744fcd0c77cf3415b4ce6eaf50cdb63b4ef (diff) | |
| download | volse-hubzilla-0657195125675700eeb9bcd1bc92f4299cac0304.tar.gz volse-hubzilla-0657195125675700eeb9bcd1bc92f4299cac0304.tar.bz2 volse-hubzilla-0657195125675700eeb9bcd1bc92f4299cac0304.zip | |
Merge branch 'master' into trinidad
Diffstat (limited to 'view/tpl/jot-header.tpl')
| -rwxr-xr-x | view/tpl/jot-header.tpl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/view/tpl/jot-header.tpl b/view/tpl/jot-header.tpl index 8d26fc653..678d16a71 100755 --- a/view/tpl/jot-header.tpl +++ b/view/tpl/jot-header.tpl @@ -11,9 +11,9 @@ function initEditor(cb){ $("#profile-jot-text-loading").spin(false).hide(); $("#profile-jot-text").css({ 'height': 200, 'color': '#000' }); if(typeof channelId === 'undefined') - $("#profile-jot-text").contact_autocomplete(baseurl+"/acl"); + $("#profile-jot-text").editor_autocomplete(baseurl+"/acl"); else - $("#profile-jot-text").contact_autocomplete(baseurl+"/acl",[channelId]); // Also gives suggestions from current channel's connections + $("#profile-jot-text").editor_autocomplete(baseurl+"/acl",[channelId]); // Also gives suggestions from current channel's connections editor = true; $("a#jot-perms-icon").colorbox({ 'inline' : true, |