custom themes now need to be saved

This commit is contained in:
Jack 2020-07-02 20:14:55 +01:00
parent 8047f38076
commit b9fe640f85
2 changed files with 32 additions and 21 deletions

View file

@ -105,9 +105,10 @@ function setActiveThemeTab() {
function setCustomThemeInputs() {
$("[type=color]").each((n, index) => {
let currentColor = config.customThemeColors[colorVars.indexOf($(index).attr("id"))]
$(index).val(currentColor)
$(index).prev().text(currentColor)
let currentColor = config.customThemeColors[colorVars.indexOf($(index).attr("id"))];
$(index).val(currentColor);
$(index).attr('value',currentColor);
$(index).prev().text(currentColor);
})
}
@ -471,35 +472,42 @@ $(".tab").click(e => {
$('.tab').removeClass("active")
var $target = $(e.currentTarget)
$target.addClass("active")
setCustomThemeInputs();
if($target.attr("tab") == "preset") {
setCustomTheme(false)
setCustomTheme(false);
applyCustomThemeColors();
$('[tabContent="custom"]').removeClass("reveal")
$('[tabContent="preset"]').addClass("reveal")
// setTimeout(() => {
// }, 0);
} else {
setCustomTheme(true)
setCustomTheme(true);
applyCustomThemeColors();
$('[tabContent="preset"]').removeClass("reveal")
$('[tabContent="custom"]').addClass("reveal")
// setTimeout(() => {
// }, 0);
}
})
$("[type='color']").on('input', e => {
let $colorVar = $(e.currentTarget).attr('id')
setCustomTheme(true, true);
let $colorVar = $(e.currentTarget).attr('id');
let $pickedColor = $(e.currentTarget).val();
document.documentElement.style.setProperty($colorVar, $pickedColor)
$("[for="+$colorVar+"]").text($pickedColor)
document.documentElement.style.setProperty($colorVar, $pickedColor);
$("#"+$colorVar).attr('value',$pickedColor);
$("[for="+$colorVar+"]").text($pickedColor);
config.customThemeColors[colorVars.indexOf($colorVar)] = $pickedColor
// config.customThemeColors[colorVars.indexOf($colorVar)] = $pickedColor
})
$('.colorPicker').on('change', e => {
setCustomTheme(true) // Save a color once picked
// Save a color once picked
})
$('.pageSettings .saveCustomThemeButton').click(e => {
let save = [];
$.each($(".pageSettings .section.customTheme [type='color']"),(index, element) => {
save.push($(element).attr('value'));
})
setCustomThemeColors(save);
showNotification('Custom theme colors saved',1000);
})

View file

@ -477,11 +477,16 @@ function setTheme(name,nosave) {
function setCustomTheme(boolean, nosave) {
config.customTheme = boolean;
setCustomThemeColors(config.customThemeColors, nosave);
// setCustomThemeColors(config.customThemeColors, nosave);
if(!nosave) saveConfigToCookie();
}
function setCustomThemeColors(array, nosave) {
function setCustomThemeColors(colors, nosave){
config.customThemeColors = colors;
if(!nosave) saveConfigToCookie();
}
function applyCustomThemeColors() {
array = config.customThemeColors;
if(config.customTheme === true) {
@ -497,8 +502,6 @@ function setCustomThemeColors(array, nosave) {
setTimeout(() => {
updateFavicon(32,14);
}, 500);
if(!nosave) saveConfigToCookie();
}
function updateFavicon(size, curveSize) {