rainbownapkin/fore.st
1
0
Fork 0
Code Issues 13 Pull requests Projects Releases Packages Wiki Activity Actions

Reduce the number of places the default theme is hardcoded from 6 to 1.

Browse source
This commit is contained in:
Xaekai 2016-07-08 04:31:32 -07:00
parent 0de5f88eee
commit aa6066dfd5
5 changed files with 15 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
www/js/data.js
View file

@ -97,7 +97,7 @@ function getOrDefault(k, def) {
}
var USEROPTS = {
theme : getOrDefault("theme", "/css/themes/slate.css"),
theme : getOrDefault("theme", DEFAULT_THEME), // Set in head template
layout : getOrDefault("layout", "fluid"),
synch : getOrDefault("synch", true),
hidevid : getOrDefault("hidevid", false),
@ -204,9 +204,9 @@ function eraseCookie(name) {
(function () {
var localVersion = parseFloat(getOpt("version"));
if (isNaN(localVersion)) {
USEROPTS.theme = "/css/themes/slate.css";
USEROPTS.theme = DEFAULT_THEME;
USEROPTS.layout = "fluid";
setOpt("theme", "/css/themes/slate.css");
setOpt("theme", DEFAULT_THEME);
setOpt("layout", "fluid");
setOpt("version", CL_VERSION);
}

7
www/js/theme.js
View file

@ -3,7 +3,8 @@
return s.trim();
});
var theme = "/css/themes/slate.css";
// Set in the head template.
var theme = DEFAULT_THEME;
for (var i = 0; i < c.length; i++) {
if (c[i].indexOf("cytube-theme=") === 0) {
theme = c[i].split("=")[1];
@ -15,8 +16,8 @@
return;
}
if (theme !== "/css/themes/slate.css") {
console.log("THEME COOKIE:", theme);
if (theme !== DEFAULT_THEME) {
console.info("THEME COOKIE:", theme);
var cur = document.getElementById("usertheme");
cur.parentNode.removeChild(cur);
var css = document.createElement("link");

2
www/js/util.js
View file

@ -696,7 +696,7 @@ function applyOpts() {
var old = $("#usertheme").attr("id", "usertheme_old");
var theme = USEROPTS.theme;
if (theme === "default") {
theme = "/css/themes/slate.css";
theme = DEFAULT_THEME;
}
$("<link/>").attr("rel", "stylesheet")
.attr("type", "text/css")