From e62a02673c0ba7304902cf53eefb44b82807ad60 Mon Sep 17 00:00:00 2001 From: calzoneman Date: Thu, 2 May 2013 22:02:25 -0500 Subject: [PATCH] Fix #82 --- www/assets/js/client.js | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/www/assets/js/client.js b/www/assets/js/client.js index a5749715..d0be639f 100644 --- a/www/assets/js/client.js +++ b/www/assets/js/client.js @@ -42,15 +42,24 @@ function parseBool(x) { return false; else return Boolean(x); } + +function getOrDefault(cookie, def) { + var cook = readCookie(cookie); + if(cook === null) { + return def; + } + return cook; +} + var USEROPTS = { - theme : readCookie("cytube_theme") || "default", - css : readCookie("cytube_css") || "", - layout : readCookie("cytube_layout") || "default", - synch : parseBool(readCookie("cytube_synch")) || true, - hidevid : parseBool(readCookie("cytube_hidevid")) || false, - show_timestamps : parseBool(readCookie("cytube_show_timestamps")) || false, - modhat : parseBool(readCookie("cytube_modhat")) || false, - blink_chat : parseBool(readCookie("cytube_blink_chat")) || false + theme : getOrDefault("cytube_theme", "default"), + css : getOrDefault("cytube_css", ""), + layout : getOrDefault("cytube_layout", "default"), + synch : parseBool(getOrDefault("cytube_synch", true)), + hidevid : parseBool(getOrDefault("cytube_hidevid", false)), + show_timestamps : parseBool(getOrDefault("cytube_show_timestamps", false)), + modhat : parseBool(getOrDefault("cytube_modhat", false)), + blink_title : parseBool(getOrDefault("cytube_blink_title", false)) }; applyOpts(); $("#optlink").click(showUserOpts);