javascript:S7770
This commit is contained in:
parent
5ce2ce63be
commit
11c4239ceb
10 changed files with 19 additions and 19 deletions
|
|
@ -39,7 +39,7 @@ const USERS_URL_LIST = ({
|
||||||
isAdmin && 'is_admin',
|
isAdmin && 'is_admin',
|
||||||
isModerator && 'is_moderator',
|
isModerator && 'is_moderator',
|
||||||
]
|
]
|
||||||
.filter((x) => x)
|
.filter(Boolean)
|
||||||
.join(',')
|
.join(',')
|
||||||
return `/api/v1/pleroma/admin/users?page=${page}&page_size=${pageSize}&filters=${filters_str}&query=${query}&name=${name}&email=${email}`
|
return `/api/v1/pleroma/admin/users?page=${page}&page_size=${pageSize}&filters=${filters_str}&query=${query}&name=${name}&email=${email}`
|
||||||
}
|
}
|
||||||
|
|
@ -236,7 +236,7 @@ export const changeStatusScope = ({
|
||||||
opts: { id, sensitive, visibility },
|
opts: { id, sensitive, visibility },
|
||||||
credentials,
|
credentials,
|
||||||
}) => {
|
}) => {
|
||||||
var payload = {}
|
const payload = {}
|
||||||
if (typeof sensitive !== 'undefined') {
|
if (typeof sensitive !== 'undefined') {
|
||||||
payload['sensitive'] = sensitive
|
payload['sensitive'] = sensitive
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -335,7 +335,7 @@ export default {
|
||||||
this.pauseMfm ? '-pause' : '',
|
this.pauseMfm ? '-pause' : '',
|
||||||
this.scaleMfm ? '-scale' : '',
|
this.scaleMfm ? '-scale' : '',
|
||||||
]
|
]
|
||||||
.filter((x) => x)
|
.filter(Boolean)
|
||||||
.join(' ')
|
.join(' ')
|
||||||
newAttrs['data-mfm-operator'] = mfmOperator
|
newAttrs['data-mfm-operator'] = mfmOperator
|
||||||
switch (mfmOperator) {
|
switch (mfmOperator) {
|
||||||
|
|
|
||||||
|
|
@ -401,7 +401,7 @@ const AppearanceTab = {
|
||||||
}
|
}
|
||||||
|
|
||||||
theme3 = init({
|
theme3 = init({
|
||||||
inputRuleset: [...input, paletteRule].filter((x) => x),
|
inputRuleset: [...input, paletteRule].filter(Boolean),
|
||||||
ultimateBackgroundColor: '#000000',
|
ultimateBackgroundColor: '#000000',
|
||||||
liteMode: true,
|
liteMode: true,
|
||||||
onlyNormalState: true,
|
onlyNormalState: true,
|
||||||
|
|
|
||||||
|
|
@ -602,7 +602,7 @@ export default {
|
||||||
.map((x) => Object.entries(x.directives))
|
.map((x) => Object.entries(x.directives))
|
||||||
.flat()
|
.flat()
|
||||||
})
|
})
|
||||||
.filter((x) => x)
|
.filter(Boolean)
|
||||||
.flat()
|
.flat()
|
||||||
.map(([name, value]) => {
|
.map(([name, value]) => {
|
||||||
const [valType, valVal] = value.split('|')
|
const [valType, valVal] = value.split('|')
|
||||||
|
|
|
||||||
|
|
@ -126,7 +126,7 @@ const generateTheme = (inputRuleset, callbacks, debug) => {
|
||||||
const chunk = chunks[counter]
|
const chunk = chunks[counter]
|
||||||
Promise.all(chunk.map((x) => x())).then((result) => {
|
Promise.all(chunk.map((x) => x())).then((result) => {
|
||||||
getCssRules(
|
getCssRules(
|
||||||
result.filter((x) => x),
|
result.filter(Boolean),
|
||||||
debug,
|
debug,
|
||||||
).forEach((rule) => {
|
).forEach((rule) => {
|
||||||
onNewRule(rule, true)
|
onNewRule(rule, true)
|
||||||
|
|
|
||||||
|
|
@ -104,7 +104,7 @@ export const getCssRules = (rules, debug) =>
|
||||||
: '',
|
: '',
|
||||||
' --background: ' + v,
|
' --background: ' + v,
|
||||||
]
|
]
|
||||||
.filter((x) => x)
|
.filter(Boolean)
|
||||||
.join(';\n')
|
.join(';\n')
|
||||||
}
|
}
|
||||||
const color = getCssColorString(
|
const color = getCssColorString(
|
||||||
|
|
@ -115,7 +115,7 @@ export const getCssRules = (rules, debug) =>
|
||||||
if (rule.directives.backgroundNoCssColor !== 'yes') {
|
if (rule.directives.backgroundNoCssColor !== 'yes') {
|
||||||
cssDirectives.push('background-color: ' + color)
|
cssDirectives.push('background-color: ' + color)
|
||||||
}
|
}
|
||||||
return cssDirectives.filter((x) => x).join(';\n')
|
return cssDirectives.filter(Boolean).join(';\n')
|
||||||
}
|
}
|
||||||
case 'blur': {
|
case 'blur': {
|
||||||
const cssDirectives = []
|
const cssDirectives = []
|
||||||
|
|
@ -157,7 +157,7 @@ export const getCssRules = (rules, debug) =>
|
||||||
return null
|
return null
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
.filter((x) => x)
|
.filter(Boolean)
|
||||||
.map((x) => ' ' + x + ';')
|
.map((x) => ' ' + x + ';')
|
||||||
.join('\n')
|
.join('\n')
|
||||||
|
|
||||||
|
|
@ -172,10 +172,10 @@ export const getCssRules = (rules, debug) =>
|
||||||
virtualDirectives,
|
virtualDirectives,
|
||||||
footer,
|
footer,
|
||||||
]
|
]
|
||||||
.filter((x) => x)
|
.filter(Boolean)
|
||||||
.join('\n')
|
.join('\n')
|
||||||
})
|
})
|
||||||
.filter((x) => x)
|
.filter(Boolean)
|
||||||
|
|
||||||
export const getScopedVersion = (rules, newScope) => {
|
export const getScopedVersion = (rules, newScope) => {
|
||||||
return rules.map((x) => {
|
return rules.map((x) => {
|
||||||
|
|
|
||||||
|
|
@ -62,6 +62,6 @@ export const serialize = (ruleset) => {
|
||||||
|
|
||||||
return `${header} {\n${content.join(';\n')}\n}`
|
return `${header} {\n${content.join(';\n')}\n}`
|
||||||
})
|
})
|
||||||
.filter((x) => x)
|
.filter(Boolean)
|
||||||
.join('\n\n')
|
.join('\n\n')
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -558,9 +558,9 @@ export const convertTheme2To3 = (data) => {
|
||||||
)
|
)
|
||||||
|
|
||||||
const flatExtRules = extendedRules
|
const flatExtRules = extendedRules
|
||||||
.filter((x) => x)
|
.filter(Boolean)
|
||||||
.reduce((acc, x) => [...acc, ...x], [])
|
.reduce((acc, x) => [...acc, ...x], [])
|
||||||
.filter((x) => x)
|
.filter(Boolean)
|
||||||
.reduce((acc, x) => [...acc, ...x], [])
|
.reduce((acc, x) => [...acc, ...x], [])
|
||||||
|
|
||||||
return [
|
return [
|
||||||
|
|
|
||||||
|
|
@ -338,10 +338,10 @@ export const init = ({
|
||||||
const relevantRules = ruleset.filter((r) => r.component === component.name)
|
const relevantRules = ruleset.filter((r) => r.component === component.name)
|
||||||
const backgrounds = relevantRules
|
const backgrounds = relevantRules
|
||||||
.map((r) => r.directives.background)
|
.map((r) => r.directives.background)
|
||||||
.filter((x) => x)
|
.filter(Boolean)
|
||||||
const opacities = relevantRules
|
const opacities = relevantRules
|
||||||
.map((r) => r.directives.opacity)
|
.map((r) => r.directives.opacity)
|
||||||
.filter((x) => x)
|
.filter(Boolean)
|
||||||
if (
|
if (
|
||||||
backgrounds.some((x) => x.match(/--parent/)) ||
|
backgrounds.some((x) => x.match(/--parent/)) ||
|
||||||
opacities.some((x) => x != null && x < 1)
|
opacities.some((x) => x != null && x < 1)
|
||||||
|
|
@ -596,7 +596,7 @@ export const init = ({
|
||||||
const shadow = value
|
const shadow = value
|
||||||
.split(/,/g)
|
.split(/,/g)
|
||||||
.map((s) => s.trim())
|
.map((s) => s.trim())
|
||||||
.filter((x) => x)
|
.filter(Boolean)
|
||||||
dynamicVars[k] = shadow
|
dynamicVars[k] = shadow
|
||||||
if (combination.component === rootComponentName) {
|
if (combination.component === rootComponentName) {
|
||||||
staticVars[k.substring(2)] = shadow
|
staticVars[k.substring(2)] = shadow
|
||||||
|
|
@ -752,7 +752,7 @@ export const init = ({
|
||||||
return processCombination(combination)
|
return processCombination(combination)
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
.filter((x) => x)
|
.filter(Boolean)
|
||||||
const t2 = performance.now()
|
const t2 = performance.now()
|
||||||
if (debug) {
|
if (debug) {
|
||||||
console.debug('Eager processing took ' + (t2 - t1) + ' ms')
|
console.debug('Eager processing took ' + (t2 - t1) + ' ms')
|
||||||
|
|
|
||||||
|
|
@ -749,7 +749,7 @@ export const useInterfaceStore = defineStore('interface', {
|
||||||
this.styleDataUsed,
|
this.styleDataUsed,
|
||||||
paletteIss,
|
paletteIss,
|
||||||
hacks,
|
hacks,
|
||||||
].filter((x) => x)
|
].filter(Boolean)
|
||||||
|
|
||||||
return applyTheme(
|
return applyTheme(
|
||||||
rulesetArray.flat(),
|
rulesetArray.flat(),
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue