Merge branch 'screenshare2' into outline

This commit is contained in:
David Négrier 2020-08-24 18:24:47 +02:00
commit 7dc9e32b84

View File

@ -208,8 +208,8 @@ class LayoutManager {
const mainSectionChildren = Array.from(document.querySelectorAll<HTMLDivElement>('div.main-section > div').values()); const mainSectionChildren = Array.from(document.querySelectorAll<HTMLDivElement>('div.main-section > div').values());
const sidebarChildren = Array.from(document.querySelectorAll<HTMLDivElement>('aside.sidebar > div').values()); const sidebarChildren = Array.from(document.querySelectorAll<HTMLDivElement>('aside.sidebar > div').values());
// Nothing? Let's center // No presentation? Let's center on the screen
if (mainSectionChildren.length === 0 && sidebarChildren.length === 0) { if (mainSectionChildren.length === 0) {
return { return {
xStart: 0, xStart: 0,
yStart: 0, yStart: 0,
@ -218,18 +218,6 @@ class LayoutManager {
} }
} }
if (mainSectionChildren.length === 0) {
const lastSidebarDiv = sidebarChildren[sidebarChildren.length-1];
// No presentation? Let's center on the main-section space
return {
xStart: 0,
yStart: 0,
xEnd: lastSidebarDiv.offsetLeft,
yEnd: window.innerHeight
}
}
// At this point, we know we have at least one element in the main section. // At this point, we know we have at least one element in the main section.
const lastPresentationDiv = mainSectionChildren[mainSectionChildren.length-1]; const lastPresentationDiv = mainSectionChildren[mainSectionChildren.length-1];