BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Prevented html5 from throwing exceptions if the slide file doesn't exist

Browse Source
This commit is contained in:
Oleksandr Zhurbenko 2017-09-21 14:02:50 -07:00
parent a46469557f
commit d19814dc55
2 changed files with 77 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bigbluebutton-html5/imports/api/2.0/slides/server/modifiers/addSlide.js
View File

@ -93,6 +93,14 @@ export default function addSlide(meetingId, presentationId, slide) {
return fetchImageSizes(imageUri)
.then(({ width, height }) => {
// there is a rare case when for a very long not-active meeting
// the presentation files just disappear
// in that case just set the whole calculatedData to undefined
if (!width && !height) {
modifier.$set.calculatedData = undefined;
return Slides.upsert(selector, modifier, cb);
}
// pre-calculating the width, height, and vieBox coordinates / dimensions
// to unload the client-side
const slideData = {

139
bigbluebutton-html5/imports/ui/components/presentation/component.jsx
View File

@ -132,19 +132,19 @@ export default class PresentationArea extends React.Component {
// renders the whole presentation area
renderPresentationArea() {
// sometimes tomcat publishes the slide url, but the actual file is not accessible (why?)
if (this.props.currentSlide &&
this.props.currentSlide.calculatedData &&
this.props.currentSlide.calculatedData.width &&
this.props.currentSlide.calculatedData.height) {
if (!this.props.currentSlide ||
!this.props.currentSlide.calculatedData) {
return null;
}
// to control the size of the svg wrapper manually
// and adjust cursor's thickness, so that svg didn't scale it automatically
const adjustedSizes = this.calculateSize();
const adjustedSizes = this.calculateSize();
// a reference to the slide object
const slideObj = this.props.currentSlide;
const slideObj = this.props.currentSlide;
// retrieving the pre-calculated data from the slide object
const {
const {
x,
y,
width,
@ -154,70 +154,68 @@ export default class PresentationArea extends React.Component {
imageUri,
} = slideObj.calculatedData;
return (
<div
style={{
width: adjustedSizes.width,
height: adjustedSizes.height,
WebkitTransition: 'width 0.2s', /* Safari */
transition: 'width 0.2s',
return (
<div
style={{
width: adjustedSizes.width,
height: adjustedSizes.height,
WebkitTransition: 'width 0.2s', /* Safari */
transition: 'width 0.2s',
}}
>
<CSSTransitionGroup
transitionName={{
enter: styles.enter,
enterActive: styles.enterActive,
appear: styles.appear,
appearActive: styles.appearActive,
}}
transitionAppear
transitionEnter
transitionLeave={false}
transitionAppearTimeout={400}
transitionEnterTimeout={400}
transitionLeaveTimeout={400}
>
<CSSTransitionGroup
transitionName={{
enter: styles.enter,
enterActive: styles.enterActive,
appear: styles.appear,
appearActive: styles.appearActive,
}}
transitionAppear
transitionEnter
transitionLeave={false}
transitionAppearTimeout={400}
transitionEnterTimeout={400}
transitionLeaveTimeout={400}
<svg
width={width}
height={height}
ref={(ref) => { if (ref != null) { this.svggroup = ref; } }}
viewBox={`${x} ${y} ${viewBoxWidth} ${viewBoxHeight}`}
version="1.1"
xmlns="http://www.w3.org/2000/svg"
className={styles.svgStyles}
key={slideObj.id}
>
<svg
width={width}
height={height}
ref={(ref) => { if (ref != null) { this.svggroup = ref; } }}
viewBox={`${x} ${y} ${viewBoxWidth} ${viewBoxHeight}`}
version="1.1"
xmlns="http://www.w3.org/2000/svg"
className={styles.svgStyles}
key={slideObj.id}
>
<defs>
<clipPath id="viewBox">
<rect x={x} y={y} width="100%" height="100%" fill="none" />
</clipPath>
</defs>
<g clipPath="url(#viewBox)">
<Slide
id="slideComponent"
imageUri={imageUri}
svgWidth={width}
svgHeight={height}
/>
<AnnotationGroupContainer
width={width}
height={height}
whiteboardId={slideObj.id}
/>
<CursorWrapperContainer
widthRatio={slideObj.widthRatio}
physicalWidthRatio={adjustedSizes.width / width}
slideWidth={width}
slideHeight={height}
/>
</g>
{this.renderOverlays(slideObj, adjustedSizes)}
</svg>
</CSSTransitionGroup>
</div>
);
}
return null;
<defs>
<clipPath id="viewBox">
<rect x={x} y={y} width="100%" height="100%" fill="none" />
</clipPath>
</defs>
<g clipPath="url(#viewBox)">
<Slide
id="slideComponent"
imageUri={imageUri}
svgWidth={width}
svgHeight={height}
/>
<AnnotationGroupContainer
width={width}
height={height}
whiteboardId={slideObj.id}
/>
<CursorWrapperContainer
widthRatio={slideObj.widthRatio}
physicalWidthRatio={adjustedSizes.width / width}
slideWidth={width}
slideHeight={height}
/>
</g>
{this.renderOverlays(slideObj, adjustedSizes)}
</svg>
</CSSTransitionGroup>
</div>
);
}
renderOverlays(slideObj, adjustedSizes) {
@ -271,7 +269,8 @@ export default class PresentationArea extends React.Component {
}
renderWhiteboardToolbar() {
if (!this.props.currentSlide) {
if (!this.props.currentSlide ||
!this.props.currentSlide.calculatedData) {
return null;
}
@ -329,7 +328,7 @@ PresentationArea.propTypes = {
viewBoxWidth: PropTypes.number.isRequired,
viewBoxHeight: PropTypes.number.isRequired,
imageUri: PropTypes.string.isRequired,
}).isRequired,
}),
}),
// current multi-user status
multiUser: PropTypes.bool.isRequired,