aboutsummaryrefslogtreecommitdiffstats
path: root/js
diff options
context:
space:
mode:
Diffstat (limited to 'js')
-rw-r--r--js/fk.autocomplete.js33
1 files changed, 21 insertions, 12 deletions
diff --git a/js/fk.autocomplete.js b/js/fk.autocomplete.js
index 45de0cb2d..3f73c6fbb 100644
--- a/js/fk.autocomplete.js
+++ b/js/fk.autocomplete.js
@@ -20,11 +20,11 @@ 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;
+ }
- }
style.top=style.top+h;
style.width = w;
style.position = 'absolute';
@@ -73,7 +73,7 @@ ACPopup.prototype._search = function(){
that.cont.show();
$(data.items).each(function(){
html = "<img src='{0}' height='16px' width='16px'>{1} ({2})".format(this.photo, this.name, this.nick)
- that.add(html, this.nick + '+' + this.id + ' - ' + this.link);
+ that.add(html, this.nick + '+' + this.id + ' - ' + this.link);
});
} else {
that.cont.hide();
@@ -82,16 +82,25 @@ ACPopup.prototype._search = function(){
});
}
-ACPopup.prototype.add = function(label, value){
+ ACPopup.prototype.add = function(label, value){
var that=this;
var elm = $("<div class='acpopupitem' title='"+value+"'>"+label+"</div>");
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);
}