diff options
| author | Paolo T <tuscanhobbit@users.noreply.github.com> | 2013-10-11 00:24:25 -0700 |
|---|---|---|
| committer | Paolo T <tuscanhobbit@users.noreply.github.com> | 2013-10-11 00:24:25 -0700 |
| commit | 7a63d5e50b0ae16a38e673867abd6043d4becc07 (patch) | |
| tree | 6d174d12a0de707ed8f875801a8dbc0c35f70d3f /js/main.js | |
| parent | c2a88c3e4858e3eb2c553bdc775d2f684b0d46b4 (diff) | |
| parent | 89fc319c900873be58fa677707518646f6c79eec (diff) | |
| download | volse-hubzilla-7a63d5e50b0ae16a38e673867abd6043d4becc07.tar.gz volse-hubzilla-7a63d5e50b0ae16a38e673867abd6043d4becc07.tar.bz2 volse-hubzilla-7a63d5e50b0ae16a38e673867abd6043d4becc07.zip | |
Merge pull request #2 from friendica/master
Upgraded to latest red
Diffstat (limited to 'js/main.js')
| -rw-r--r-- | js/main.js | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/js/main.js b/js/main.js index 9d764c74e..d5260a4be 100644 --- a/js/main.js +++ b/js/main.js @@ -119,6 +119,7 @@ var next_page = 1; var page_load = true; var loadingPage = false; + var pageHasMoreContent = true; $(function() { $.ajaxSetup({cache: false}); @@ -580,11 +581,11 @@ function updateConvItems(mode,data) { function imgbright(node) { - $(node).removeClass("drophide").addClass("drop"); +// $(node).removeClass("drophide").addClass("drop"); } function imgdull(node) { - $(node).removeClass("drop").addClass("drophide"); +// $(node).removeClass("drop").addClass("drophide"); } function notify_popup_loader(notifyType) { @@ -657,12 +658,16 @@ function updateConvItems(mode,data) { if(data.result == 1) { $('#starred-' + ident).addClass('starred'); $('#starred-' + ident).removeClass('unstarred'); + $('#starred-' + ident).addClass('icon-star-full'); + $('#starred-' + ident).removeClass('icon-star-empty'); $('#star-' + ident).addClass('hidden'); $('#unstar-' + ident).removeClass('hidden'); } else { $('#starred-' + ident).addClass('unstarred'); $('#starred-' + ident).removeClass('starred'); + $('#starred-' + ident).addClass('icon-star-empty'); + $('#starred-' + ident).removeClass('icon-star-full'); $('#star-' + ident).removeClass('hidden'); $('#unstar-' + ident).addClass('hidden'); } @@ -984,7 +989,7 @@ $(window).scroll(function () { } if($(window).scrollTop() + $(window).height() == $(document).height()) { - if(! loadingPage) { + if((pageHasMoreContent) && (! loadingPage)) { $('#more').hide(); $('#no-more').hide(); // alert('scroll'); |