move jquery init into separate js file and server action

14 years ago · 662e3aac43
3 changed files with 38 additions and 32 deletions
--- a/assets/html/main.html
+++ b/assets/html/main.html
@ -8,38 +8,7 @@
 		<script type="text/javascript" src="/assets/js/jquery"></script>
 		<script type="text/javascript" src="/assets/js/serverval"></script>
 		<script type="text/javascript" src="/assets/js/session"></script>
-		<script>
-			//<![CDATA[
-			var sess = null;
-
-			$(document).ready(function() {
-				var sval = new ServerVal("#randval");
-
-				sess = new Session("#sessinfo");
-				$.getJSON("/sessinfo/", $.proxy(sess.loadJSON, sess));
-
-				$("ul#menu li:eq(0)").click(function() {
-					sval.start();
-				});
-
-				$("ul#menu li:eq(1)").click(function() {
-					$("#login").removeClass("hide");
-				});
-
-				$("#randval").click(function() {
-					sval.stop();
-				});
-
-				$("#login form").submit(function(event) {
-					event.preventDefault();
-					$.post("/login/",
-						$("#login form").serialize(),
-						$.proxy(sess.loadJSON, sess));
-					$("#login").addClass("hide");
-				});
-			});
-			//]]>
-		</script>
+		<script type="text/javascript" src="/assets/js/init"></script>
 	</head>
 	<body> 
 		<ul id="menu">
--- a/assets/js/init.js
+++ b/assets/js/init.js
@ -0,0 +1,30 @@
+var sess = null;
+
+$(document).ready(function() {
+	var sval = new ServerVal("#randval");
+
+	sess = new Session("#sessinfo");
+	$.getJSON("/sessinfo/", $.proxy(sess.loadJSON, sess));
+
+	$("ul#menu li:eq(0)").click(function() {
+		sval.start();
+	});
+
+	$("ul#menu li:eq(1)").click(function() {
+		$("#login").removeClass("hide");
+	});
+
+	$("#randval").click(function() {
+		sval.stop();
+	});
+
+	$("#login form").submit(function(event) {
+		event.preventDefault();
+		$.post("/login/",
+			$("#login form").serialize(),
+			$.proxy(sess.loadJSON, sess));
+		$("#login").addClass("hide");
+	});
+});
+
+// vim: set ts=4 sw=4:
--- a/src/http/worker/process.c
+++ b/src/http/worker/process.c
@ -168,6 +168,13 @@ httpWorkerProcess(HttpWorker this, Stream st)
 							CSTRA("text/javascript"));
 				}

+				if (0 == strcmp("/assets/js/init", request->uri)) {
+					response = httpWorkerGetAsset(
+							request,
+							"./assets/js/init.js",
+							CSTRA("text/javascript"));
+				}
+
 				if (0 == strcmp("/assets/style/common", request->uri)) {
 					response = httpWorkerGetAsset(
 							request,