diff options
| author | friendica <info@friendica.com> | 2015-01-04 19:57:15 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2015-01-04 19:57:15 -0800 |
| commit | 0c0a004e45dc3ae97062db09e057223675fd077c (patch) | |
| tree | 503422dd7d23104a4178b19d4b9c45258e4765ab | |
| parent | aa18a43effabc389e789626b511fa83c0d8dbf34 (diff) | |
| parent | fc72762f52a5c3aec2f06b49153392333cacba2f (diff) | |
| download | volse-hubzilla-0c0a004e45dc3ae97062db09e057223675fd077c.tar.gz volse-hubzilla-0c0a004e45dc3ae97062db09e057223675fd077c.tar.bz2 volse-hubzilla-0c0a004e45dc3ae97062db09e057223675fd077c.zip | |
Merge branch 'master' into trinidad
| -rw-r--r-- | view/js/autocomplete.js | 3 | ||||
| -rwxr-xr-x | view/tpl/jot-header.tpl | 5 |
2 files changed, 6 insertions, 2 deletions
diff --git a/view/js/autocomplete.js b/view/js/autocomplete.js index 259dca1bc..cc14f75d1 100644 --- a/view/js/autocomplete.js +++ b/view/js/autocomplete.js @@ -43,7 +43,8 @@ function replace(item) { * jQuery plugin 'contact_autocomplete' */ (function( $ ){ - $.fn.contact_autocomplete = function(backend_url, extra_channels = null) { + $.fn.contact_autocomplete = function(backend_url, extra_channels) { + if (typeof extra_channels === 'undefined') extra_channels = false; // Autocomplete contacts contacts = { 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, |