Merge branch 'master' of astrom.hq.c3d2.de:ds-quiz

quiz.js

@@ -32,7 +32,7 @@ var questions;
 var currentQuestion = 0;
 
 function loadQuizData(done) {
-    $.ajax({ url: 'data/questions.json',
+    $.ajax({ url: 'data/questions.json?' + Math.round(Math.random() * 1000),
              contentType: 'json',
              success: function(data, status) {
                  if (typeof data === 'string')
@@ -141,7 +141,7 @@ function startQuiz() {
         if (name) {
             playerNames[i] = name;
             playerScores[i] = 0;
-            $('#scoreboard dl').append('<dt></dt><dd><span class="score">0</span><img src="fiftyfifty.png" class="fiftyfifty"><img src="audience.png" class="audience"><img src="phone.png" class="phone"><img src="nedap.png" class="nedap"><img src="irc.png" class="irc"><img src="fwd.png" class="fwd"></dd>');
+            $('#scoreboard dl').append('<dt></dt><dd><span class="score">0</span><img src="fiftyfifty.png" class="fiftyfifty"><img src="nedap.png" class="nedap"><img src="irc.png" class="irc"><img src="fwd.png" class="fwd"></dd>');
             $('#scoreboard dl dt').last().text(name);
             $('#players').append('<li class="player'+i+'"><span class="name"></span><span class="score">0</span></li>');
             $('#players li.player'+i+' span.name').text(name);
@@ -217,7 +217,7 @@ function takeJoker(activePlayer, joker) {
 	sendToBackend({ nedap: { joker: { question: q.text,
 					  answers: q.answers
 	} } });
-	
+
 	$('#nedap').show();
 	var scores = [0, 0, 0, 0];
 	var redraw = function() {

server.js

@@ -87,11 +87,20 @@ function pushIrcInfo() {
 /*
  * Web server
  */
+function noCache(req, res, next) {
+    var writeHead = res.writeHead;
+    res.writeHead = function(status, headers) {
+	headers['Cache-Control'] = 'no-cache';
+	writeHead.call(this, status, headers);
+    };
+    next();
+}
 
 var server = Connect.createServer(
     Connect.logger(),
+    noCache,
     Connect.bodyDecoder(),
-    Connect.staticProvider(__dirname),
+    Connect.staticProvider({ root: __dirname, maxAge: 1000 }),
     Connect.errorHandler({ dumpExceptions: true, showStack: true })
 );