X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=js%2Ffk.autocomplete.js;h=509466bd9878f3810cadc00259af22db3bdc7198;hb=c47bae7a5f1ec1ee7966369dc0c9693564670065;hp=45de0cb2dd306bd53bd7bab1c8a7d878085de592;hpb=e19b5971804f0e07d7f3e4ad6d7b71e05ff49ed5;p=friendica.git
diff --git a/js/fk.autocomplete.js b/js/fk.autocomplete.js
old mode 100644
new mode 100755
index 45de0cb2dd..509466bd98
--- a/js/fk.autocomplete.js
+++ b/js/fk.autocomplete.js
@@ -1,5 +1,5 @@
/**
- * Friendika people autocomplete
+ * Friendica people autocomplete
*
* require jQuery, jquery.textareas
*/
@@ -20,11 +20,18 @@ function ACPopup(elm,backend_url){
h = $(elm).height();
}
else {
- style = $('.profile-jot-text').offset();
- w = 300;
- h = 150;
+ style = $(elm.container).offset();
+ w = elm.container.offsetWidth;
+ h = elm.container.offsetHeight;
+ // Quick fix for chrome until I get a tool to inspect the dom
+ // Chrome returns 0x0
+ if(! w)
+ w = 530;
+ if(! h)
+ h = 130;
+
+ }
- }
style.top=style.top+h;
style.width = w;
style.position = 'absolute';
@@ -73,7 +80,7 @@ ACPopup.prototype._search = function(){
that.cont.show();
$(data.items).each(function(){
html = "
{1} ({2})".format(this.photo, this.name, this.nick)
- that.add(html, this.nick + '+' + this.id + ' - ' + this.link);
+ that.add(html, this.nick.replace(' ','') + '+' + this.id + ' - ' + this.link);
});
} else {
that.cont.hide();
@@ -82,23 +89,36 @@ ACPopup.prototype._search = function(){
});
}
-ACPopup.prototype.add = function(label, value){
+ ACPopup.prototype.add = function(label, value){
var that=this;
var elm = $("
");
elm.click(function(e){
- t = $(this).attr('title').replace(new RegExp(' \- .*'),'');
- el=$(that.element);
- sel = el.getSelection();
- sel.start = sel.start- that.searchText.length;
- el.setSelection(sel.start,sel.end).replaceSelectedText(t).collapseSelection(false);
- that.close();
+ t = $(this).attr('title').replace(new RegExp(' \- .*'),'');
+ if(typeof(that.element.container) === "undefined") {
+ el=$(that.element);
+ sel = el.getSelection();
+ sel.start = sel.start- that.searchText.length;
+ el.setSelection(sel.start,sel.end).replaceSelectedText(t+' ').collapseSelection(false);
+ that.close();
+ }
+ else {
+ txt = tinyMCE.activeEditor.getContent();
+ newtxt = txt.replace(that.searchText,t+' ');
+ tinyMCE.activeEditor.setContent(newtxt);
+ tinyMCE.activeEditor.focus();
+ that.close();
+ }
});
$(this.cont).append(elm);
}
ACPopup.prototype.onkey = function(event){
- if (event.keyCode == '13' && this.idsel>-1) {
- this.cont.children()[this.idsel].click();
- event.preventDefault();
+ if (event.keyCode == '13') {
+ if(this.idsel>-1) {
+ this.cont.children()[this.idsel].click();
+ event.preventDefault();
+ }
+ else
+ this.close();
}
if (event.keyCode == '38') { //cursor up
cmax = this.cont.children().size()-1;
@@ -106,14 +126,14 @@ ACPopup.prototype.onkey = function(event){
if (this.idsel<0) this.idsel=cmax;
event.preventDefault();
}
- if (event.keyCode == '40') { //cursor down
+ if (event.keyCode == '40' || event.keyCode == '9') { //cursor down
cmax = this.cont.children().size()-1;
this.idsel++;
if (this.idsel>cmax) this.idsel=0;
event.preventDefault();
}
- if (event.keyCode == '38' || event.keyCode == '40' ) {
+ if (event.keyCode == '38' || event.keyCode == '40' || event.keyCode == '9') {
this.cont.children().removeClass('selected');
$(this.cont.children()[this.idsel]).addClass('selected');
}