X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=inline;f=js%2Fautocomplete.js;h=8702abbcf92e3b23b3522a2655a827eb6bd2d3bd;hb=f94a10bf00de699a5f3d22ea74665053a5661175;hp=931085fd2b16eaaf16ae07de78160a362259876e;hpb=d5bfbeab6e57e7edc32923ecc0f2006e8c945f1c;p=friendica.git diff --git a/js/autocomplete.js b/js/autocomplete.js index 931085fd2b..8702abbcf9 100644 --- a/js/autocomplete.js +++ b/js/autocomplete.js @@ -2,10 +2,10 @@ * @brief Friendica people autocomplete * * require jQuery, jquery.textcomplete - * + * * for further documentation look at: * http://yuku-t.com/jquery-textcomplete/ - * + * * https://github.com/yuku-t/jquery-textcomplete/blob/master/doc/how_to_use.md */ @@ -41,7 +41,7 @@ function contact_search(term, callback, backend_url, type, mode) { postdata['conversation'] = conv_id[0]; if(mode !== null) - postdata['mode'] = mode; + postdata['smode'] = mode; $.ajax({ @@ -84,9 +84,14 @@ function editor_replace(item) { // $2 ensures that prefix (@,@!) is preserved var id = item.id; - // 16 chars of hash should be enough. Full hash could be used if it can be done in a visually appealing way. + + // don't add the id if it is empty (the id empty eg. if there are unknow contacts in thread) + if(id.length < 1) + return '$1$2' + item.nick.replace(' ', '') + ' '; + + // 16 chars of hash should be enough. Full hash could be used if it can be done in a visually appealing way. // 16 chars is also the minimum length in the backend (otherwise it's interpreted as a local id). - if(id.length > 16) + if(id.length > 16) id = item.id.substring(0,16); return '$1$2' + item.nick.replace(' ', '') + '+' + id + ' '; @@ -99,6 +104,13 @@ function basic_replace(item) { return '$1'+item.name+' '; } +function webbie_replace(item) { + if(typeof item.replace !== 'undefined') + return '$1'+item.replace; + + return '$1'+item.nick+' '; +} + function trim_replace(item) { if(typeof item.replace !== 'undefined') return '$1'+item.replace; @@ -158,6 +170,9 @@ function listNewLineAutocomplete(id) { setCaretPosition(text, caretPos + 5); return true; } + else { + return false; + } } function string2bb(element) { @@ -208,7 +223,7 @@ function string2bb(element) { match: /(^@)([^\n]{2,})$/, index: 2, search: function(term, callback) { contact_search(term, callback, backend_url, 'x', 'contact'); }, - replace: basic_replace, + replace: webbie_replace, template: contact_format, }; @@ -217,7 +232,7 @@ function string2bb(element) { match: /(^!)([^\n]{2,})$/, index: 2, search: function(term, callback) { contact_search(term, callback, backend_url, 'x', 'community'); }, - replace: basic_replace, + replace: webbie_replace, template: contact_format, }; this.attr('autocomplete', 'off'); @@ -281,7 +296,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', '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']; var open_elements = ['*', 'hr']; var elements = open_close_elements.concat(open_elements); @@ -320,72 +335,50 @@ function string2bb(element) { a.on('textComplete:select', function(e, value, strategy) { value; }); a.keypress(function(e){ - e.stopImmediatePropagation(); if (e.keyCode == 13) { var x = listNewLineAutocomplete(this.id); - if(x) + if(x) { + e.stopImmediatePropagation(); e.preventDefault(); + } } }); }; })( jQuery ); /** - * Friendica people autocomplete legacy - * code which is needed for tinymce + * Friendica people autocomplete legacy code * * require jQuery, jquery.textareas */ - -function ACPopup(elm,backend_url){ - this.idsel=-1; +function ACPopup(elm, backend_url){ + this.idsel = -1; this.element = elm; - this.searchText=""; - this.ready=true; + this.searchText = ''; + this.ready = true; this.kp_timer = false; this.url = backend_url; this.conversation_id = null; var conv_id = this.element.id.match(/\d+$/); - if (conv_id) this.conversation_id = conv_id[0]; - console.log("ACPopup elm id",this.element.id,"conversation",this.conversation_id); - - var w = 530; - var h = 130; - - - if(tinyMCE.activeEditor == null) { - style = $(elm).offset(); - w = $(elm).width(); - h = $(elm).height(); - } - else { - // I can't find an "official" way to get the element who get all - // this fraking thing that is tinyMCE. - // This code will broke again at some point... - var container = $(tinyMCE.activeEditor.getContainer()).find("table"); - style = $(container).offset(); - w = $(container).width(); - h = $(container).height(); + if (conv_id) { + this.conversation_id = conv_id[0]; } - style.top=style.top+h; + var w = $(elm).width(); + var h = $(elm).height(); + + var style = $(elm).offset(); + style.top = style.top + h; style.width = w; style.position = 'absolute'; - /* style['max-height'] = '150px'; - style.border = '1px solid red'; - style.background = '#cccccc'; - - style.overflow = 'auto'; - style['z-index'] = '100000'; - */ style.display = 'none'; - this.cont = $("
"); + this.cont = $(''); this.cont.css(style); - $("body").append(this.cont); - } + $('body').append(this.cont); +} ACPopup.prototype.close = function(){ $(this.cont).remove(); @@ -433,48 +426,42 @@ ACPopup.prototype._search = function(){ } ACPopup.prototype.add = function(label, value){ - var that=this; - var elm = $("