diff options
Diffstat (limited to 'js')
| -rw-r--r-- | js/acl.js | 4 | ||||
| -rw-r--r-- | js/main.js | 21 |
2 files changed, 17 insertions, 8 deletions
@@ -247,8 +247,8 @@ ACL.prototype.populate = function(data){ var height = Math.ceil(data.tot / that.nw) * 42; that.list_content.height(height); $(data.items).each(function(){ - html = "<div class='acl-list-item {4} {5}' title='{6}' id='{2}{3}'>"+that.item_tpl+"</div>"; - html = html.format( this.photo, this.name, this.type, this.xid, '', this.network, this.link ); + html = "<div class='acl-list-item {4} {5} {7}' title='{6}' id='{2}{3}'>"+that.item_tpl+"</div>"; + html = html.format( this.photo, this.name, this.type, this.xid, '', this.network, this.link, this.taggable ); if (this.uids!=undefined) that.group_uids[this.id] = this.uids; //console.log(html); that.list_content.append(html); diff --git a/js/main.js b/js/main.js index 01aea6b22..f1a50e28a 100644 --- a/js/main.js +++ b/js/main.js @@ -118,6 +118,7 @@ var scroll_next = false; var next_page = 1; var page_load = true; + var loadingPage = false; $(function() { $.ajaxSetup({cache: false}); @@ -395,6 +396,10 @@ function updateConvItems(mode,data) { // $("div.wall-item-body").divgrow({ initialHeight: 400 }); } }); + + if(loadingPage) { + loadingPage = false; + } } if(mode === 'replace') { // clear existing content @@ -916,6 +921,7 @@ $(".autotime").timeago(); } + $(window).scroll(function () { if(typeof buildCmd == 'function') { $('#more').hide(); @@ -927,12 +933,15 @@ $(window).scroll(function () { } if($(window).scrollTop() + $(window).height() == $(document).height()) { - $('#more').hide(); - $('#no-more').hide(); - // alert('scroll'); - next_page++; - scroll_next = true; - liveUpdate(); + if(! loadingPage) { + $('#more').hide(); + $('#no-more').hide(); + // alert('scroll'); + next_page++; + scroll_next = true; + loadingPage = true; + liveUpdate(); + } } } |