Fix usercard from breaking with certain colors, clean up code structure a bit.

This commit is contained in:
shpuld 2017-11-20 22:45:09 +02:00
parent 8020363680
commit f6b2f6eaee
5 changed files with 103 additions and 90 deletions

View file

@ -1,4 +1,5 @@
import { times, map } from 'lodash'
import { times } from 'lodash'
import { rgb2hex, hex2rgb } from '../color_convert/color_convert.js'
// While this is not used anymore right now, I left it in if we want to do custom
// styles that aren't just colors, so user can pick from a few different distinct
@ -56,16 +57,6 @@ const setStyle = (href, commit) => {
cssEl.addEventListener('load', setDynamic)
}
const rgb2hex = (r, g, b) => {
[r, g, b] = map([r, g, b], (val) => {
val = Math.ceil(val)
val = val < 0 ? 0 : val
val = val > 255 ? 255 : val
return val
})
return `#${((1 << 24) + (r << 16) + (g << 8) + b).toString(16).slice(1)}`
}
const setColors = (col, commit) => {
const head = document.head
const body = document.body
@ -108,15 +99,6 @@ const setColors = (col, commit) => {
commit('setOption', { name: 'customTheme', value: col })
}
const hex2rgb = (hex) => {
const result = /^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i.exec(hex)
return result ? {
r: parseInt(result[1], 16),
g: parseInt(result[2], 16),
b: parseInt(result[3], 16)
} : null
}
const setPreset = (val, commit) => {
window.fetch('/static/styles.json')
.then((data) => data.json())