Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-07 06:25:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

moved paginator progress bar into paginator block, better mobile handling, and hiding it on page load

Browse Source
This commit is contained in:
Julian Lam
2013-11-30 21:36:35 -05:00
parent b3b4d3c37d
commit b9f1176ec1
3 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
public/src/ajaxify.js
View File

@@ -29,7 +29,7 @@ var ajaxify = {};
} }
}; };
var pagination; var pagination, paginator_bar;
ajaxify.go = function (url, callback, template, quiet) { ajaxify.go = function (url, callback, template, quiet) {
// start: the following should be set like so: ajaxify.onchange(function(){}); where the code actually belongs // start: the following should be set like so: ajaxify.onchange(function(){}); where the code actually belongs
@@ -37,8 +37,10 @@ var ajaxify = {};
app.enterRoom('global'); app.enterRoom('global');
pagination = pagination || document.getElementById('pagination'); pagination = pagination || document.getElementById('pagination');
paginator_bar = pagination ? document.body.querySelector('.progress-container') : undefined;
if (pagination) { if (pagination) {
pagination.parentNode.style.display = 'none'; pagination.parentNode.style.display = 'none';
paginator_bar.style.display = 'none';
} }
window.onscroll = null; window.onscroll = null;

6
public/src/forum/topic.js
View File

@@ -789,12 +789,14 @@ define(function() {
} }
pagination = pagination || document.getElementById('pagination'); pagination = pagination || document.getElementById('pagination');
pagination.parentNode.style.display = 'block';
var windowHeight = jQuery(window).height(); var windowHeight = jQuery(window).height();
var scrollTop = jQuery(window).scrollTop(); var scrollTop = jQuery(window).scrollTop();
var scrollBottom = scrollTop + windowHeight; var scrollBottom = scrollTop + windowHeight;
var progressBar = $('.progress-bar'); var progressBar = $('.progress-bar');
var progressBarContainer = $('.progress-container');
pagination.parentNode.style.display = 'block';
progressBarContainer.css('display', '');
if (scrollTop < 50 && Topic.postCount > 1) { if (scrollTop < 50 && Topic.postCount > 1) {
localStorage.removeItem("topic:" + tid + ":bookmark"); localStorage.removeItem("topic:" + tid + ":bookmark");

2
public/templates/header.tpl
View File

@@ -140,10 +140,10 @@
<i class="fa fa-chevron-up pointer"></i> <i class="fa fa-chevron-up pointer"></i>
<span id="pagination"></span> <span id="pagination"></span>
<i class="fa fa-chevron-down pointer"></i> <i class="fa fa-chevron-down pointer"></i>
</a>
<div class="progress-container"> <div class="progress-container">
<div class="progress-bar"></div> <div class="progress-bar"></div>
</div> </div>
</a>
</li> </li>
</ul> </ul>
</div> </div>