Merge branch '0.0.6' of github.com:owncast/owncast-admin into 0.0.6

This commit is contained in:
gingervitis
2021-02-08 02:56:36 -08:00
2 changed files with 5 additions and 5 deletions

View File

@@ -79,18 +79,18 @@ export default function VideoVariantForm({
}; };
const handleScaledWidthChanged = (args: UpdateArgs) => { const handleScaledWidthChanged = (args: UpdateArgs) => {
const value = Number(args.value); const value = Number(args.value);
if (!isNaN(value)) { if (isNaN(value)) {
return; return;
} }
onUpdateField({ fieldName: 'scaledWidth', value: value }); onUpdateField({ fieldName: 'scaledWidth', value: value || '' });
}; };
const handleScaledHeightChanged = (args: UpdateArgs) => { const handleScaledHeightChanged = (args: UpdateArgs) => {
const value = Number(args.value); const value = Number(args.value);
if (!isNaN(value)) { if (isNaN(value)) {
return; return;
} }
onUpdateField({ fieldName: 'scaledHeight', value: value }); onUpdateField({ fieldName: 'scaledHeight', value: value || '' });
}; };
const framerateDefaults = VIDEO_VARIANT_DEFAULTS.framerate; const framerateDefaults = VIDEO_VARIANT_DEFAULTS.framerate;
const framerateMin = framerateDefaults.min; const framerateMin = framerateDefaults.min;

View File

@@ -81,7 +81,7 @@ export const TEXTFIELD_PROPS_LOGO = {
placeholder: '/img/mylogo.png', placeholder: '/img/mylogo.png',
label: 'Logo', label: 'Logo',
tip: tip:
'Path to your logo from website root. We recommend that you use a square image that is at least 256x256. (upload functionality coming soon)', 'Name of your logo in the data directory. We recommend that you use a square image that is at least 256x256.',
}; };
export const TEXTFIELD_PROPS_STREAM_KEY = { export const TEXTFIELD_PROPS_STREAM_KEY = {
apiPath: API_STREAM_KEY, apiPath: API_STREAM_KEY,