From: ec2-user <ec2-user@fcdev4.finalsclub.org>
Date: Mon, 14 Nov 2011 19:45:37 +0000 (+0000)
Subject: more 1page work
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=736133e6b7a780dd04363bc65772b811b6b10f7d;p=oweals%2Ffinalsclub.git

more 1page work
---

diff --git a/public/index.html b/public/index.html
index 374cfbf..d99afa2 100644
--- a/public/index.html
+++ b/public/index.html
@@ -1,5 +1,17 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html>
+	<!-- 
+
+		 Currently tested with:
+
+						Mac		Windows
+					 ______________________
+		 	Chrome 	|	15		-
+			Safari	|	5		-
+			FF		|	8		8
+			IE		|	N/A		9
+
+	-->
 
 	<head>
 		<title>FinalsClub.org</title>
@@ -51,6 +63,7 @@
 
 
 		<div class="content">
+
 			<style>
 				/* The is here is because it's related less to "styling" and more to UI "behavior" */
 				.page { display: none; }
diff --git a/public/javascripts/main.js b/public/javascripts/main.js
index d06a72d..eacaea1 100644
--- a/public/javascripts/main.js
+++ b/public/javascripts/main.js
@@ -313,25 +313,41 @@ function showPage(y) {
 */
 var topQueue = [0]
 function goPage(path) {
-	var y = 0 + window.pageYOffset
-	topQueue.push(y)
-	history.pushState({}, path, path);
-	showPage(0);
+	if(history.pushState !== undefined) {
+		topQueue.push(window.pageYOffset)
+		history.pushState({}, path, path);
+		showPage(0);
+	}
+	else {
+		document.location = path;
+	}
 }
 
 
 /* Simulates a "back" browser navigation.  */
+var popped = false;
 function goBack(event) {
-	var y = topQueue.pop()
-	showPage( y );
+	popped = true;
+	showPage( topQueue.pop() );
 }
 
 
+
 $(document).ready(function() {
 
 	// This code executes after the page has been fully loaded
 
+	$(".proto").css("display", "none");		// make all the prototypes invisible
+
+	//$("body").get(0).onunload = function() { }	// fires when leaving the page proper
+
+	ProtoDiv.each = function(e) { $(e).show() }
+
 	window.onpopstate = goBack
+	setTimeout(function() {
+		if(!popped)
+			showPage(0)
+	}, 2000);
 
 	// xxx older FF browsers don't fire a page load/reload - deal with it somehow.
 	// showPage( 0 );		// needed for some older browsers, redundant for chrome
diff --git a/public/javascripts/protodiv.js b/public/javascripts/protodiv.js
index e74f143..bf07460 100644
--- a/public/javascripts/protodiv.js
+++ b/public/javascripts/protodiv.js
@@ -112,6 +112,8 @@ ProtoDiv.replicate = function(id, arr, keep) {
 		delete e.id
 		mom.insertBefore(e, sib)
 		ProtoDiv.inject(e, obj, i)
+		if(ProtoDiv.each)
+			ProtoDiv.each(e, i, obj, mom)
 	}
 
 	if(!keep)
diff --git a/public/stylesheets/fc2.css b/public/stylesheets/fc2.css
index 2b7ab0c..d6a1e22 100644
--- a/public/stylesheets/fc2.css
+++ b/public/stylesheets/fc2.css
@@ -240,7 +240,7 @@ div#wrapper div#header div.buttons {
 }
 
 div#wrapper div#header {
-	background: #444;
+	background: #333;
 }
 
 div#wrapper div#header .rcol {
@@ -883,8 +883,4 @@ div.conduct p.vague {
 	-webkit-border-radius: 0.20em;
 }
 
-.proto {
-	/*display: none;*/
-}
-
 
