diff options
| author | zotlabs <mike@macgirvin.com> | 2017-09-25 19:34:56 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-09-25 19:34:56 -0700 |
| commit | b9664f6980452390b120e0c7443fd773d527b3bd (patch) | |
| tree | 07c1a2ddb752a087344d8844967c5888d7e03bca /view/js | |
| parent | 0e76cec28ff734fdec4ba00d9787beb31ffd2cbb (diff) | |
| parent | 741af8c1644a16f1ec44064090013953232bdce9 (diff) | |
| download | volse-hubzilla-b9664f6980452390b120e0c7443fd773d527b3bd.tar.gz volse-hubzilla-b9664f6980452390b120e0c7443fd773d527b3bd.tar.bz2 volse-hubzilla-b9664f6980452390b120e0c7443fd773d527b3bd.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
Diffstat (limited to 'view/js')
| -rw-r--r-- | view/js/autocomplete.js | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/view/js/autocomplete.js b/view/js/autocomplete.js index 313e501e2..1a507a28c 100644 --- a/view/js/autocomplete.js +++ b/view/js/autocomplete.js @@ -192,6 +192,16 @@ function string2bb(element) { template: contact_format }; + // Autocomplete forums + forums = { + match: /(^|\s)(\!)([^ \n]+)$/, + index: 3, + search: function(term, callback) { contact_search(term, callback, backend_url, 'f', extra_channels, spinelement=false); }, + replace: editor_replace, + template: contact_format + }; + + smilies = { match: /(^|\s)(:[a-z_:]{2,})$/, index: 2, @@ -201,7 +211,7 @@ function string2bb(element) { template: smiley_format }; this.attr('autocomplete','off'); - this.textcomplete([contacts,smilies], {className:'acpopup', zIndex:1020}); + this.textcomplete([contacts,forums,smilies], {className:'acpopup', zIndex:1020}); }; })( jQuery ); |