e.stopPropagation()} onPointerUp={e => e.stopPropagation()} onPointerDown={e => e.stopPropagation()}>
-
activeItem.playAuto = !activeItem.playAuto}>Play automatically
-
activeItem.playAuto = !activeItem.playAuto}>Play on next
+
activeItem.playAuto = !activeItem.playAuto}>Play automatically
+
activeItem.playAuto = !activeItem.playAuto}>Play on next
- {/* {targetDoc.type === DocumentType.VID ?
activeItem.presVidFullScreen = !activeItem.presVidFullScreen}>Full screen
: (null)} */}
+ {/* {targetDoc.type === DocumentType.VID ?
activeItem.presVidFullScreen = !activeItem.presVidFullScreen}>Full screen
: (null)} */}
{targetDoc.type === DocumentType.AUDIO ?
Start time
@@ -1214,7 +1256,7 @@ export class PresBox extends ViewBoxBaseComponent
: (null)}
{this.panable || this.scrollable || this.targetDoc.type === DocumentType.COMPARISON ? 'Pinned view' : (null)}
-
{activeItem.presPinView ? "Turn off pin with view" : "Turn on pin with view"}
}>{activeItem.presPinView ? "Turn off pin with view" : "Turn on pin with view"}
}>
{
activeItem.presPinView = !activeItem.presPinView;
targetDoc.presPinView = activeItem.presPinView;
@@ -1315,15 +1357,15 @@ export class PresBox extends ViewBoxBaseComponent
e.stopPropagation()} onPointerUp={e => e.stopPropagation()} onPointerDown={e => e.stopPropagation()}>
-
{ this.layout = 'blank'; this.createNewSlide(this.layout); })} />
-
{ this.layout = 'title'; this.createNewSlide(this.layout); })}>
+
{ this.layout = 'blank'; this.createNewSlide(this.layout); })} />
+
{ this.layout = 'title'; this.createNewSlide(this.layout); })}>
Title
Subtitle
-
{ this.layout = 'header'; this.createNewSlide(this.layout); })}>
+
{ this.layout = 'header'; this.createNewSlide(this.layout); })}>
Section header
-
{ this.layout = 'content'; this.createNewSlide(this.layout); })}>
+
{ this.layout = 'content'; this.createNewSlide(this.layout); })}>
Title
Text goes here
@@ -1355,26 +1397,26 @@ export class PresBox extends ViewBoxBaseComponent
Choose type:
-
this.addFreeform = !this.addFreeform)}>Text
-
this.addFreeform = !this.addFreeform)}>Freeform
+
this.addFreeform = !this.addFreeform)}>Text
+
this.addFreeform = !this.addFreeform)}>Freeform
Preset layouts:
-
this.layout = 'blank')} />
-
this.layout = 'title')}>
+
this.layout = 'blank')} />
+
this.layout = 'title')}>
Title
Subtitle
-
this.layout = 'header')}>
+
this.layout = 'header')}>
Section header
-
this.layout = 'content')}>
+
this.layout = 'content')}>
Title
Text goes here
-
this.layout = 'twoColumns')}>
+
this.layout = 'twoColumns')}>
Title
Column one text
Column two text
@@ -1533,8 +1575,8 @@ export class PresBox extends ViewBoxBaseComponent
{/*
{this.stringType} selected
-
Contents
-
Edit
+
Contents
+
Edit
Active text color
@@ -1549,12 +1591,12 @@ export class PresBox extends ViewBoxBaseComponent
{this.viewedColorPicker}
-
Zoom
-
Edit
+
Zoom
+
Edit
-
Scroll
-
Edit
+
Scroll
+
Edit
@@ -1564,7 +1606,7 @@ export class PresBox extends ViewBoxBaseComponent
{ e.stopPropagation(); this.prevKeyframe(targetDoc, activeItem); }}>
- targetDoc.editing = !targetDoc.editing)} >
{NumCast(targetDoc._currentFrame)}
@@ -1578,7 +1620,7 @@ export class PresBox extends ViewBoxBaseComponent
{this.frameListHeader}
{this.frameList}
console.log(" TODO: play frames")}>Play
+ console.log(" TODO: play frames")}>Play
@@ -1794,7 +1836,7 @@ export class PresBox extends ViewBoxBaseComponent
tags.push({this.checkMovementLists(doc, doc["x-indexed"], doc["y-indexed"])}
);
}
tags.push(
- { if (NumCast(targetDoc._currentFrame) < NumCast(doc.appearFrame)) doc.opacity = 0; }} onPointerOver={() => { if (NumCast(targetDoc._currentFrame) < NumCast(doc.appearFrame)) doc.opacity = 0.5; }} onClick={e => { this.toggleDisplayMovement(doc); e.stopPropagation(); }} style={{ backgroundColor: doc.displayMovement ? "#aedff8" : "#c8c8c8", top: NumCast(doc.y), left: NumCast(doc.x) }}>
+
{ if (NumCast(targetDoc._currentFrame) < NumCast(doc.appearFrame)) doc.opacity = 0; }} onPointerOver={() => { if (NumCast(targetDoc._currentFrame) < NumCast(doc.appearFrame)) doc.opacity = 0.5; }} onClick={e => { this.toggleDisplayMovement(doc); e.stopPropagation(); }} style={{ backgroundColor: doc.displayMovement ? PresColor.LightBlue : "#c8c8c8", top: NumCast(doc.y), left: NumCast(doc.x) }}>
{ e.stopPropagation(); this.prevAppearFrame(doc, index); }} />
{doc.appearFrame}
{ e.stopPropagation(); this.nextAppearFrame(doc, index); }} />
@@ -1884,7 +1926,7 @@ export class PresBox extends ViewBoxBaseComponent
*/}
{"View paths"}
}>
- 1 ? 1 : 0.3, color: this._pathBoolean ? PresColors.DarkBlue : 'white', width: isMini ? "100%" : undefined }} className={"toolbar-button"} onClick={this.childDocs.length > 1 ? this.viewPaths : undefined}>
+
1 ? 1 : 0.3, color: this._pathBoolean ? PresColor.DarkBlue : 'white', width: isMini ? "100%" : undefined }} className={"toolbar-button"} onClick={this.childDocs.length > 1 ? this.viewPaths : undefined}>
@@ -1901,12 +1943,12 @@ export class PresBox extends ViewBoxBaseComponent
*/}
{presKeyEvents ? "Keys are active" : "Keys are not active - click anywhere on the presentation trail to activate keys"}
}>
-
+
{propTitle}
}>
- 0 ? PresColors.DarkBlue : 'white' }} />
+ 0 ? PresColor.DarkBlue : 'white' }} />
@@ -2033,14 +2075,17 @@ export class PresBox extends ViewBoxBaseComponent
}
@computed get playButtons() {
+ const presEnd: boolean = !this.layoutDoc.presLoop && (this.itemIndex === this.childDocs.length - 1);
+ const presStart: boolean = !this.layoutDoc.presLoop && (this.itemIndex === 0);
// Case 1: There are still other frames and should go through all frames before going to next slide
return (
-
{"Loop"}
}> this.layoutDoc.presLoop = !this.layoutDoc.presLoop}>
+
{"Loop"}
}> this.layoutDoc.presLoop = !this.layoutDoc.presLoop}>
-
{ this.back(); if (this._presTimer) { clearTimeout(this._presTimer); this.layoutDoc.presStatus = PresStatus.Manual; } }}>
+
{ this.back(); if (this._presTimer) { clearTimeout(this._presTimer); this.layoutDoc.presStatus = PresStatus.Manual; } }}>
{this.layoutDoc.presStatus === PresStatus.Autoplay ? "Pause" : "Autoplay"}
}>
-
{ this.next(); if (this._presTimer) { clearTimeout(this._presTimer); this.layoutDoc.presStatus = PresStatus.Manual; } }}>
+
{ this.next(); if (this._presTimer) { clearTimeout(this._presTimer); this.layoutDoc.presStatus = PresStatus.Manual; } }}>
+
{"Click to return to 1st slide"}
}> this.gotoDocument(0)}>1
this.gotoDocument(0)}
@@ -2069,16 +2114,19 @@ export class PresBox extends ViewBoxBaseComponent
this.childDocs.slice();
const mode = StrCast(this.rootDoc._viewType) as CollectionViewType;
const presKeyEvents: boolean = (this.isPres && this._presKeyEventsActive && this.rootDoc === Doc.UserDoc().activePresentation);
+ const presEnd: boolean = !this.layoutDoc.presLoop && (this.itemIndex === this.childDocs.length - 1);
+ const presStart: boolean = !this.layoutDoc.presLoop && (this.itemIndex === 0);
return CurrentUserUtils.OverlayDocs.includes(this.rootDoc) ?
-
-
{"Loop"}
}> this.layoutDoc.presLoop = !this.layoutDoc.presLoop}>
+
+
{"Loop"}
}> this.layoutDoc.presLoop = !this.layoutDoc.presLoop}>
-
{ this.back(); if (this._presTimer) { clearTimeout(this._presTimer); this.layoutDoc.presStatus = PresStatus.Manual; } }}>
+
{ this.back(); if (this._presTimer) { clearTimeout(this._presTimer); this.layoutDoc.presStatus = PresStatus.Manual; } }}>
{this.layoutDoc.presStatus === PresStatus.Autoplay ? "Pause" : "Autoplay"}
}>
-
{ this.next(); if (this._presTimer) { clearTimeout(this._presTimer); this.layoutDoc.presStatus = PresStatus.Manual; } }}>
+
{ this.next(); if (this._presTimer) { clearTimeout(this._presTimer); this.layoutDoc.presStatus = PresStatus.Manual; } }}>
-
this.gotoDocument(0)}>
+
{"Click to return to 1st slide"}
}> this.gotoDocument(0)}>1
+
Slide {this.itemIndex + 1} / {this.childDocs.length}
{this.playButtonFrames}
--
cgit v1.2.3-70-g09d2