Skip to content
Snippets Groups Projects
Commit c0ed0eed authored by jojohoch's avatar jojohoch
Browse files

Refactor the initialization of number properties of elements

The explicit check for undefined ensures that the value 0 of a
number property is taken from serialized elements.
parent 809457e9
No related branches found
No related tags found
No related merge requests found
...@@ -5,8 +5,8 @@ export function initFontElement(serializedElement: UIElement): FontElement { ...@@ -5,8 +5,8 @@ export function initFontElement(serializedElement: UIElement): FontElement {
return { return {
fontColor: serializedElement.fontColor as string || '#000000', fontColor: serializedElement.fontColor as string || '#000000',
font: serializedElement.font as string || 'Roboto', font: serializedElement.font as string || 'Roboto',
fontSize: serializedElement.fontSize as number || 20, fontSize: serializedElement.fontSize !== undefined ? serializedElement.fontSize as number : 20,
lineHeight: serializedElement.lineHeight as number || 120, lineHeight: serializedElement.lineHeight !== undefined ? serializedElement.lineHeight as number : 120,
bold: serializedElement.bold !== undefined ? serializedElement.bold as boolean : false, bold: serializedElement.bold !== undefined ? serializedElement.bold as boolean : false,
italic: serializedElement.italic !== undefined ? serializedElement.italic as boolean : false, italic: serializedElement.italic !== undefined ? serializedElement.italic as boolean : false,
underline: serializedElement.underline !== undefined ? serializedElement.underline as boolean : false underline: serializedElement.underline !== undefined ? serializedElement.underline as boolean : false
...@@ -20,7 +20,7 @@ export function initSurfaceElement(serializedElement: UIElement): SurfaceUIEleme ...@@ -20,7 +20,7 @@ export function initSurfaceElement(serializedElement: UIElement): SurfaceUIEleme
export function initPlayerElement(serializedElement: UIElement): PlayerElement { export function initPlayerElement(serializedElement: UIElement): PlayerElement {
return { return {
autostart: serializedElement.autostart !== undefined ? serializedElement.autostart as boolean : false, autostart: serializedElement.autostart !== undefined ? serializedElement.autostart as boolean : false,
autostartDelay: serializedElement.autostartDelay as number || 0, autostartDelay: serializedElement.autostartDelay !== undefined ? serializedElement.autostartDelay as number : 0,
loop: serializedElement.loop !== undefined ? serializedElement.loop as boolean : false, loop: serializedElement.loop !== undefined ? serializedElement.loop as boolean : false,
startControl: serializedElement.startControl !== undefined ? serializedElement.startControl as boolean : true, startControl: serializedElement.startControl !== undefined ? serializedElement.startControl as boolean : true,
pauseControl: serializedElement.pauseControl !== undefined ? serializedElement.pauseControl as boolean : false, pauseControl: serializedElement.pauseControl !== undefined ? serializedElement.pauseControl as boolean : false,
...@@ -29,16 +29,16 @@ export function initPlayerElement(serializedElement: UIElement): PlayerElement { ...@@ -29,16 +29,16 @@ export function initPlayerElement(serializedElement: UIElement): PlayerElement {
serializedElement.interactiveProgressbar as boolean : false, serializedElement.interactiveProgressbar as boolean : false,
volumeControl: serializedElement.volumeControl !== undefined ? serializedElement.volumeControl as boolean : true, volumeControl: serializedElement.volumeControl !== undefined ? serializedElement.volumeControl as boolean : true,
hintLabel: serializedElement.hintLabel as string || '', hintLabel: serializedElement.hintLabel as string || '',
hintLabelDelay: serializedElement.hintLabelDelay as number || 0, hintLabelDelay: serializedElement.hintLabelDelay !== undefined ? serializedElement.hintLabelDelay as number : 0,
uninterruptible: uninterruptible:
serializedElement.uninterruptible !== undefined ? serializedElement.uninterruptible as boolean : false, serializedElement.uninterruptible !== undefined ? serializedElement.uninterruptible as boolean : false,
hideOtherPages: hideOtherPages:
serializedElement.hideOtherPages !== undefined ? serializedElement.hideOtherPages as boolean : false, serializedElement.hideOtherPages !== undefined ? serializedElement.hideOtherPages as boolean : false,
activeAfterID: serializedElement.activeAfterID as string || '', activeAfterID: serializedElement.activeAfterID as string || '',
minRuns: serializedElement.minRuns as number || 1, minRuns: serializedElement.minRuns !== undefined ? serializedElement.minRuns as number : 1,
maxRuns: serializedElement.maxRuns as number | null || null, maxRuns: serializedElement.maxRuns !== undefined ? serializedElement.maxRuns as number | null : null,
showRestRuns: serializedElement.showRestRuns !== undefined ? serializedElement.showRestRuns as boolean : false, showRestRuns: serializedElement.showRestRuns !== undefined ? serializedElement.showRestRuns as boolean : false,
showRestTime: serializedElement.showRestTime !== undefined ? serializedElement.showRestTime as boolean : true, showRestTime: serializedElement.showRestTime !== undefined ? serializedElement.showRestTime as boolean : true,
playbackTime: serializedElement.playbackTime as number || 0 playbackTime: serializedElement.playbackTime !== undefined ? serializedElement.playbackTime as number : 0
}; };
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment