X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=view%2Fjs%2Fautocomplete.js;h=dc649084afe83b45ae7a91d8c6907cba83aa125c;hb=96d2cddb54f3ea3ead6e43e5ca1f814ed6327987;hp=0405715ac99071557b52c2f779607dd918002b4e;hpb=692bb2a8952722df3181cd5af8d09ce958a35986;p=friendica.git
diff --git a/view/js/autocomplete.js b/view/js/autocomplete.js
index 0405715ac9..dc649084af 100644
--- a/view/js/autocomplete.js
+++ b/view/js/autocomplete.js
@@ -13,7 +13,7 @@
function contact_search(term, callback, backend_url, type, mode) {
- // Check if there is a conversation id to include the unkonwn contacts of the conversation
+ // Check if there is a conversation id to include the unknown contacts of the conversation
var conv_id = document.activeElement.id.match(/\d+$/);
// Check if there is a cached result that contains the same information we would get with a full server-side search
@@ -24,8 +24,8 @@ function contact_search(term, callback, backend_url, type, mode) {
for(var t in contact_search.cache[bt]) {
if(lterm.indexOf(t) >= 0) { // A more broad search has been performed already, so use those results
// Filter old results locally
- var matching = contact_search.cache[bt][t].filter(function (x) { return (x.name.toLowerCase().indexOf(lterm) >= 0 || (typeof x.nick !== 'undefined' && x.nick.toLowerCase().indexOf(lterm) >= 0)); }); // Need to check that nick exists because groups don't have one
- matching.unshift({forum:false, text: term, replace: term});
+ var matching = contact_search.cache[bt][t].filter(function (x) { return (x.name.toLowerCase().indexOf(lterm) >= 0 || (typeof x.nick !== 'undefined' && x.nick.toLowerCase().indexOf(lterm) >= 0)); }); // Need to check that nick exists because circles don't have one
+ matching.unshift({group: false, text: term, replace: term});
setTimeout(function() { callback(matching); } , 1); // Use "pseudo-thread" to avoid some problems
return;
}
@@ -69,10 +69,10 @@ function contact_format(item) {
// Show contact information if not explicitly told to show something else
if(typeof item.text === 'undefined') {
var desc = ((item.label) ? item.nick + ' ' + item.label : item.nick);
- var forum = ((item.forum) ? 'forum' : '');
+ var group = ((item.group) ? 'group' : '');
if(typeof desc === 'undefined') desc = '';
if(desc) desc = ' ('+desc+')';
- return "
".format(forum, item.photo, item.name, desc, item.link);
+ return "".format(group, item.photo, item.name, desc, item.link);
}
else
return "" + item.text + "
";
@@ -258,8 +258,8 @@ function string2bb(element) {
template: contact_format,
};
- // Autocomplete forums
- forums = {
+ // Autocomplete groups
+ groups = {
match: /(^|\s)(!\!*)([^ \n]+)$/,
index: 3,
search: function(term, callback) { contact_search(term, callback, backend_url, 'f'); },
@@ -294,7 +294,7 @@ function string2bb(element) {
};
this.attr('autocomplete','off');
- this.textcomplete([contacts, forums, smilies, tags], {className:'acpopup', zIndex:10000});
+ this.textcomplete([contacts, groups, smilies, tags], {dropdown: {className:'acpopup'}});
this.fixTextcompleteEscape();
return this;
@@ -310,7 +310,7 @@ function string2bb(element) {
template: contact_format,
};
- // Autocomplete forum accounts
+ // Autocomplete group accounts
community = {
match: /(^!)([^\n]{2,})$/,
index: 2,
@@ -329,7 +329,7 @@ function string2bb(element) {
};
this.attr('autocomplete', 'off');
- this.textcomplete([contacts, community, tags], {className:'acpopup', maxCount:100, zIndex: 10000, appendTo:'nav'});
+ this.textcomplete([contacts, community, tags], {dropdown: {className:'acpopup', maxCount:100}});
this.fixTextcompleteEscape();
this.on('textComplete:select', function(e, value, strategy) { submit_form(this); });
@@ -350,7 +350,7 @@ function string2bb(element) {
};
this.attr('autocomplete','off');
- this.textcomplete([names], {className:'acpopup', zIndex:10000});
+ this.textcomplete([names], {dropdown: {className:'acpopup'}});
this.fixTextcompleteEscape();
if(autosubmit) {
@@ -366,7 +366,7 @@ function string2bb(element) {
$.fn.bbco_autocomplete = function(type) {
if (type === 'bbcode') {
- var open_close_elements = ['bold', 'italic', 'underline', 'overline', 'strike', 'quote', 'code', 'spoiler', 'map', 'img', 'url', 'audio', 'video', 'embed', 'youtube', 'vimeo', 'list', 'ul', 'ol', 'li', 'table', 'tr', 'th', 'td', 'center', 'color', 'font', 'size', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'nobb', 'noparse', 'pre', 'abstract'];
+ var open_close_elements = ['bold', 'italic', 'underline', 'overline', 'strike', 'quote', 'code', 'spoiler', 'map', 'img', 'url', 'audio', 'video', 'embed', 'youtube', 'vimeo', 'list', 'ul', 'ol', 'li', 'table', 'tr', 'th', 'td', 'center', 'color', 'font', 'size', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'nobb', 'noparse', 'pre', 'abstract', 'share'];
var open_elements = ['*', 'hr'];
var elements = open_close_elements.concat(open_elements);
@@ -400,7 +400,7 @@ function string2bb(element) {
};
this.attr('autocomplete','off');
- this.textcomplete([bbco], {className:'acpopup', zIndex:10000});
+ this.textcomplete([bbco], {dropdown: {className:'acpopup'}});
this.fixTextcompleteEscape();
this.on('textComplete:select', function(e, value, strategy) { value; });