Merge branch 'HEAD' of ssh://git@git.raylu.net/pathery

2 files changed, 21 insertions, 16 deletions

diff --git a/js/globe.js b/js/globe.js
index 9538d9b..152ad71 100644
--- a/js/globe.js
+++ b/js/globe.js
@@ -1,4 +1,3 @@
-

 function showSignin() {

 	if (document.getElementById('oid_hidden') !== undefined) {

 		document.getElementById('oid_hidden').id = 'oid_wrapper';

@@ -26,6 +25,11 @@ function createSignin() {
 	document.body.appendChild(div.firstChild);

 }

 

-

-

-

+//Make unselectable elements unselectable (hack for IE 9.0 and below, which doesn't support our CSS)

+$(document).ready(function()

+{

+	if ($.browser.msie && $.browser.version < 10) 

+	{

+		$('.unselectable').find(':not(input)').attr('unselectable', 'on');

+	}

+});
\ No newline at end of file
diff --git a/js/scores.js b/js/scores.js
index 2b137cb..dc164f2 100644
--- a/js/scores.js
+++ b/js/scores.js
@@ -114,7 +114,7 @@ function scoresFormatPage(JO) {
 	//console.log("jo object", JO);

 	var navi = '';

 	if (JO.pageCount > 1) {

-		navi = "<tr><th colspan='3' style='text-align:center;'>"+formatPageNavi(JO, "scoresShowPage", JO.mapid)+"</th></tr>"; 

+		navi = "<tr><th class='unselectable' colspan='3' style='text-align:center;'>"+formatPageNavi(JO, "scoresShowPage", JO.mapid)+"</th></tr>"; 

 		p = p+navi;

 	}

 	

@@ -345,11 +345,12 @@ function formatPageNavi(JO, callback) {
 			if (!showedPrevPage) 

 				r = r + ' ... ';

 			if (JO.page == i) {

-				r = r + " <b style='color:#aaaabb; font-size:150%;'>" + i + "</b>";

+				r = r + " <b class='unselectable' style='color:#aaaabb; font-size:150%;'>" + i + "</b>";

 			} else if (i == JO.userPage) {

-				r = r + " <a href='javascript:"+callback+"("+i+", "+arguments[2]+", "+arguments[3]+")' style='color:#99cc99;' title='You are on this page'><i>" + i + '</i></a>';

+				r = r + " <a class='unselectable' 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:"+callback+"("+i+", "+arguments[2]+", "+arguments[3]+")'>" + i + '</a>';

+				r = r + " <a class='unselectable' href='javascript:"+callback+"("+i+", "+arguments[2]+", "+arguments[3]+")'>" + i + '</a>';

 			}

 			showedPrevPage = true;

 		} else {

@@ -360,18 +361,18 @@ function formatPageNavi(JO, callback) {
 	var prevPage = JO.page - 1;

 	if (JO.pageCount > 1) {

 		if (JO.page < JO.pageCount) {

-			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>";

+			r = r+" <a class='scoreRight unselectable' title='Last' href='javascript:"+callback+"("+JO.pageCount+", "+arguments[2]+", "+arguments[3]+")'>&gt;&gt;&gt;</a>";

+			r = r+" <a class='scoreRight unselectable' 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>";

+			r = r+" <span class='scoreRight unselectable'>&gt;&gt;&gt;</span>";

+			r = r+" <span class='scoreRight unselectable'>&gt;</span>";

 		}

 		if (JO.page > 1) {

-			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;

+			r = " <a class='scoreLeft unselectable' title='Previous' href='javascript:"+callback+"("+prevPage+", "+arguments[2]+", "+arguments[3]+")'>&lt;</a>"+r;

+			r = " <a class='scoreLeft unselectable' 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>";

+			r = r+" <span class='scoreLeft unselectable'>&lt;&lt;&lt;</span>";

+			r = r+" <span class='scoreLeft unselectable'>&lt;</span>";

 		}

 	}