diff options
Diffstat (limited to 'js')
| -rw-r--r-- | js/fk.autocomplete.js | 6 | ||||
| -rw-r--r-- | js/main.js | 16 |
2 files changed, 19 insertions, 3 deletions
diff --git a/js/fk.autocomplete.js b/js/fk.autocomplete.js index fc41f9cbe..cd0a1c044 100644 --- a/js/fk.autocomplete.js +++ b/js/fk.autocomplete.js @@ -80,7 +80,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.replace(' ','') + '+' + this.id + ' - ' + this.link); + that.add(this.taggable, html, this.nick.replace(' ','') + '+' + this.id + ' - ' + this.link); }); } else { that.cont.hide(); @@ -89,9 +89,9 @@ ACPopup.prototype._search = function(){ }); } - ACPopup.prototype.add = function(label, value){ +ACPopup.prototype.add = function(taggable, label, value){ var that=this; - var elm = $("<div class='acpopupitem' title='"+value+"'>"+label+"</div>"); + var elm = $("<div class='acpopupitem " + taggable +"' title='"+value+"'>"+label+"</div>"); elm.click(function(e){ t = $(this).attr('title').replace(new RegExp(' \- .*'),''); if(typeof(that.element.container) === "undefined") { diff --git a/js/main.js b/js/main.js index f1a50e28a..8b1114d19 100644 --- a/js/main.js +++ b/js/main.js @@ -343,6 +343,8 @@ function updateConvItems(mode,data) { + var expanded_comments = false; + if(mode === 'update') { prev = 'threads-begin'; @@ -353,7 +355,14 @@ function updateConvItems(mode,data) { $('img',this).each(function() { $(this).attr('src',$(this).attr('dst')); }); +// expanded_comments = false; +// $('.collapsed-comments',this).each(function() { +// if($(this).is(':visible')) +// expanded_comments = this; +// }); $('#' + prev).after($(this)); +// if(expanded_comments) +// $(expanded_comments).show(); $(".autotime").timeago(); // divgrow doesn't prevent itself from attaching a second (or 500th) // "show more" div to a content region - it also has a few other @@ -365,7 +374,14 @@ function updateConvItems(mode,data) { $('img',this).each(function() { $(this).attr('src',$(this).attr('dst')); }); +// expanded_comments = false; +// $('.collapsed-comments',this).each(function() { +// if($(this).is(':visible')) +// expanded_comments = this; +// }); $('#' + ident).replaceWith($(this)); +// if(expanded_comments) +// $(expanded_comments).show(); $(".autotime").timeago(); // $("div.wall-item-body").divgrow({ initialHeight: 400 }); |