From b9f1176ec19714d81aed088a1905d9040cd91857 Mon Sep 17 00:00:00 2001
From: Julian Lam <julian.lam@gmail.com>
Date: Sat, 30 Nov 2013 21:36:35 -0500
Subject: [PATCH] moved paginator progress bar into paginator block, better
 mobile handling, and hiding it on page load

---
 public/src/ajaxify.js       | 4 +++-
 public/src/forum/topic.js   | 6 ++++--
 public/templates/header.tpl | 6 +++---
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/public/src/ajaxify.js b/public/src/ajaxify.js
index 64c55691e2..e30b000470 100644
--- a/public/src/ajaxify.js
+++ b/public/src/ajaxify.js
@@ -29,7 +29,7 @@ var ajaxify = {};
 		}
 	};
 
-	var pagination;
+	var pagination, paginator_bar;
 
 	ajaxify.go = function (url, callback, template, quiet) {
 		// 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');
 
 		pagination = pagination || document.getElementById('pagination');
+		paginator_bar = pagination ? document.body.querySelector('.progress-container') : undefined;
 		if (pagination) {
 			pagination.parentNode.style.display = 'none';
+			paginator_bar.style.display = 'none';
 		}
 
 		window.onscroll = null;
diff --git a/public/src/forum/topic.js b/public/src/forum/topic.js
index 759b13d68f..e7706df99d 100644
--- a/public/src/forum/topic.js
+++ b/public/src/forum/topic.js
@@ -789,12 +789,14 @@ define(function() {
 			}
 			pagination = pagination || document.getElementById('pagination');
 
-			pagination.parentNode.style.display = 'block';
-
 			var windowHeight = jQuery(window).height();
 			var scrollTop = jQuery(window).scrollTop();
 			var scrollBottom = scrollTop + windowHeight;
 			var progressBar = $('.progress-bar');
+			var	progressBarContainer = $('.progress-container');
+
+			pagination.parentNode.style.display = 'block';
+			progressBarContainer.css('display', '');
 
 			if (scrollTop < 50 && Topic.postCount > 1) {
 				localStorage.removeItem("topic:" + tid + ":bookmark");
diff --git a/public/templates/header.tpl b/public/templates/header.tpl
index 7a97f72ea2..bb49273b2f 100644
--- a/public/templates/header.tpl
+++ b/public/templates/header.tpl
@@ -140,10 +140,10 @@
 							<i class="fa fa-chevron-up pointer"></i>
 							<span id="pagination"></span>
 							<i class="fa fa-chevron-down pointer"></i>
+							<div class="progress-container">
+								<div class="progress-bar"></div>
+							</div>
 						</a>
-						<div class="progress-container">
-							<div class="progress-bar"></div>
-						</div>
 					</li>
 				</ul>
 			</div>