From 92ea94585d350cc9560bb8fd787444d29a05043c Mon Sep 17 00:00:00 2001 From: Bob Zeleznik Date: Sun, 17 May 2020 22:49:15 -0400 Subject: fixed presbox bug for showing element numbers. fixed progressivize --- src/client/views/nodes/PresBox.tsx | 11 ++++++----- src/client/views/presentationview/PresElementBox.tsx | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/client/views/nodes/PresBox.tsx b/src/client/views/nodes/PresBox.tsx index e12ab3f9f..09c03fb30 100644 --- a/src/client/views/nodes/PresBox.tsx +++ b/src/client/views/nodes/PresBox.tsx @@ -296,11 +296,12 @@ export class PresBox extends ViewBoxBaseComponent (this.layoutDoc.forceActive || this.props.isSelected(outsideReaction) || this._isChildActive || this.props.renderDepth === 0) ? true : false) render() { - console.log("render = " + this.layoutDoc.title + " " + this.layoutDoc.presStatus); - const presOrderedDocs = DocListCast(this.rootDoc.presOrderedDocs); - if (presOrderedDocs.length != this.childDocs.length || presOrderedDocs.some((pd, i) => pd !== this.childDocs[i])) { - this.rootDoc.presOrderedDocs = new List(this.childDocs.slice()); - } + // console.log("render = " + this.layoutDoc.title + " " + this.layoutDoc.presStatus); + // const presOrderedDocs = DocListCast(this.rootDoc.presOrderedDocs); + // if (presOrderedDocs.length != this.childDocs.length || presOrderedDocs.some((pd, i) => pd !== this.childDocs[i])) { + // this.rootDoc.presOrderedDocs = new List(this.childDocs.slice()); + // } + this.childDocs.slice(); // needed to insure that the childDocs are loaded for looking up fields const mode = StrCast(this.rootDoc._viewType) as CollectionViewType; return
diff --git a/src/client/views/presentationview/PresElementBox.tsx b/src/client/views/presentationview/PresElementBox.tsx index 0ce40f116..a2a6882b9 100644 --- a/src/client/views/presentationview/PresElementBox.tsx +++ b/src/client/views/presentationview/PresElementBox.tsx @@ -105,7 +105,7 @@ export class PresElementBox extends ViewBoxBaseComponent numberRange(docs.length - i).forEach(f => Cast(d["opacity-indexed"], listSpec("number"), [])[f + i] = 1)); - rootTarget.lastTimecode = docs.length; + rootTarget.lastTimecode = docs.length - 1; } } -- cgit v1.2.3-70-g09d2