From f65cf9406397ac688ec4060ba070e172af0cd90b Mon Sep 17 00:00:00 2001
From: Patrick Davison <snapwilliam@gmail.com>
Date: Thu, 14 Feb 2013 00:42:29 -0800
Subject: Lots'n Lots of work on the scoreboard...

---
 js/scores.js | 67 +++++++++++++++++++-----------------------------------------
 1 file changed, 21 insertions(+), 46 deletions(-)

(limited to 'js/scores.js')

diff --git a/js/scores.js b/js/scores.js
index 47a37c3..7c97a2d 100644
--- a/js/scores.js
+++ b/js/scores.js
@@ -55,7 +55,7 @@ function scoresUpdatePage(mapid, page, html) {
 	scorePages[mapid][page].html = html;
 	//if (scorePages[mapid][page] == currentPage[mapid]) {
 	if (page == currentPage[mapid]) {
-		scoresShowPage(mapid, page);
+		scoresShowPage(page, mapid);
 	}
 }
 
@@ -63,7 +63,7 @@ function scoresShowMyPage(mapid) {
 	//Future use
 }
 
-function scoresShowPage(mapid, page) {
+function scoresShowPage(page, mapid) {
 	mapid = mapid - 0;
 	page = page - 0;
 	// console.log('scoresShowPage', mapid, page);
@@ -106,13 +106,16 @@ function scoresPreparePage (mapid, page) {
 	return true;
 }
 
+var scoresShowNavSideBtns = false;
 function scoresFormatPage(JO) {
 	// console.log("Formating page");
 	
 	var p = "<table class='score'>";
+	console.log("jo object", JO);
+	var navi = '';
 	if (JO.pageCount > 1) {
-		var navi = scoresFormatPageNavi(JO);
-		p = p+"<tr><td colspan='3' style='text-align:center;'>"+navi+"</td></tr>";
+		navi = "<tr><th colspan='3' style='text-align:center;'>"+formatPageNavi(JO, "scoresShowPage", JO.mapid)+"</th></tr>"; 
+		p = p+navi;
 	}
 	p = p+"<tr title='Updated "+JO.updateTime+"'>";
 	p = p+"<th>Rank</th>";
@@ -183,18 +186,20 @@ function scoresFormatPage(JO) {
 	}
 	
 	//p = p+"<tr><th colspan='3' style='text-align:center;'>"+navi+"</th></tr>";
+	p = p+navi;
 	p = p+"</table>";
 	
 	var nextPage = JO.page - 0 + 1;
 	var prevPage = JO.page - 1;
 	
-	if (JO.pageCount > 1) {
+	//TODO: Re'enable this somehow?
+	if (JO.pageCount > 1 && scoresShowNavSideBtns) {
 		if (JO.page < JO.pageCount) {
-			p = p+"<a href='javascript:scoresShowPage("+JO.mapid+", "+nextPage+")' class='rightBtn scoreActive'>&gt;</a>";
+			p = p+"<a href='javascript:scoresShowPage("+nextPage+", "+JO.mapid+")' class='rightBtn scoreActive'>&gt;</a>";
 		} else
 			p = "<div class='rightBtn scoreDisabled'>&gt;</div>"+p;
 		if (JO.page > 1) {
-			p = "<a href='javascript:scoresShowPage("+JO.mapid+", "+prevPage+")' class='leftBtn scoreActive'>&lt;</a>"+p;
+			p = "<a href='javascript:scoresShowPage("+prevPage+", "+JO.mapid+")' class='leftBtn scoreActive'>&lt;</a>"+p;
 		} else 
 			p = "<div class='leftBtn scoreDisabled'>&lt;</div>"+p;
 	}
@@ -208,36 +213,6 @@ function scoresFormatPage(JO) {
 	return p;
 }
 
-function scoresFormatPageNavi(JO) {
-	var r = '';
-	var showedPrevPage = true;
-	for (var i = 1; i <= JO.pageCount; i++) {
-		if ( 
-				(JO.page > i - 3 && JO.page < i + 3) 
-				|| (i == 1) 
-				|| (i == JO.pageCount)
-				|| (i == JO.userPage)
-			) {
-			
-			if (!showedPrevPage) 
-				r = r + ' ... ';
-			if (JO.page == i) {
-				r = r + " <b style='color:#aaaabb; font-size:150%;'>" + i + "</b>";
-			} else if (i == JO.userPage) {
-				r = r + " <a href='javascript:scoresShowPage("+JO.mapid+", "+i+")' style='color:#99cc99;' title='You are on this page'><i>" + i + '</i></a>';
-			} else {
-				r = r + " <a href='javascript:scoresShowPage("+JO.mapid+", "+i+")'>" + i + '</a>';
-			}
-			showedPrevPage = true;
-		} else {
-			showedPrevPage = false;
-		}
-	}
-
-	return r;
-}
-
-
 //Memberlist related functions:
 var membersPages = new Object;
 var membersCurrentPage = 1;
@@ -346,7 +321,7 @@ function membersUpdatePage(page, html) {
 	}
 }
 
-function membersFormatPageNavi(JO) {
+function formatPageNavi(JO, callback) {
 	var r = '';
 	var showedPrevPage = true;
 	for (var i = 1; i <= JO.pageCount; i++) {
@@ -362,9 +337,9 @@ function membersFormatPageNavi(JO) {
 			if (JO.page == i) {
 				r = r + " <b style='color:#aaaabb; font-size:150%;'>" + i + "</b>";
 			} else if (i == JO.userPage) {
-				r = r + " <a href='javascript:membersShowPage("+i+")' style='color:#99cc99;' title='You are on this page'><i>" + i + '</i></a>';
+				r = r + " <a href='javascript:"+callback+"("+i+", "+arguments[2]+", "+arguments[3]+")' style='color:#99cc99;' title='You are on this page'><i>" + i + '</i></a>';
 			} else {
-				r = r + " <a href='javascript:membersShowPage("+i+")'>" + i + '</a>';
+				r = r + " <a href='javascript:"+callback+"("+i+", "+arguments[2]+", "+arguments[3]+")'>" + i + '</a>';
 			}
 			showedPrevPage = true;
 		} else {
@@ -375,15 +350,15 @@ function membersFormatPageNavi(JO) {
 	var prevPage = JO.page - 1;
 	if (JO.pageCount > 1) {
 		if (JO.page < JO.pageCount) {
-			r = r+" <a class='scoreRight' title='Last' href='javascript:membersShowPage("+JO.pageCount+")'>&gt;&gt;&gt;</a>";
-			r = r+" <a class='scoreRight' title='Next' href='javascript:membersShowPage("+nextPage+")'>&gt;</a>";
+			r = r+" <a class='scoreRight' title='Last' href='javascript:"+callback+"("+JO.pageCount+", "+arguments[2]+", "+arguments[3]+")'>&gt;&gt;&gt;</a>";
+			r = r+" <a class='scoreRight' title='Next' href='javascript:"+callback+"("+nextPage+", "+arguments[2]+", "+arguments[3]+")'>&gt;</a>";
 		} else {
 			r = r+" <span class='scoreRight'>&gt;&gt;&gt;</span>";
 			r = r+" <span class='scoreRight'>&gt;</span>";
 		}
 		if (JO.page > 1) {
-			r = " <a class='scoreLeft' title='Previous' href='javascript:membersShowPage("+prevPage+")'>&lt;</a>"+r;
-			r = " <a class='scoreLeft' title='First' href='javascript:membersShowPage(1)'>&lt;&lt;&lt;</a>"+r;
+			r = " <a class='scoreLeft' title='Previous' href='javascript:"+callback+"("+prevPage+", "+arguments[2]+", "+arguments[3]+")'>&lt;</a>"+r;
+			r = " <a class='scoreLeft' title='First' href='javascript:"+callback+"(1, "+arguments[2]+", "+arguments[3]+")'>&lt;&lt;&lt;</a>"+r;
 		} else {
 			r = r+" <span class='scoreLeft'>&lt;&lt;&lt;</span>";
 			r = r+" <span class='scoreLeft'>&lt;</span>";
@@ -399,7 +374,7 @@ function membersFormatPage(JO) {
 	var p = "<table class='membersList score'>";
 	var navi = '';
 	if (JO.pageCount > 1) {
-		navi = "<tr><th colspan='10' style='text-align:center;'>"+membersFormatPageNavi(JO)+"</th></tr>"; 
+		navi = "<tr><th colspan='10' style='text-align:center;'>"+formatPageNavi(JO, "membersShowPage")+"</th></tr>"; 
 		p = p+navi;
 	}
 	
@@ -476,7 +451,7 @@ function membersFormatPage(JO) {
 		
 		previousI = i;
 	}
-	p = p+navi
+	p = p+navi;
 	p = p+"</table>";
 	return p;
 }
-- 
cgit v1.2.3