From 5db728e099e25a807f69b316d813f662daf3eb7b Mon Sep 17 00:00:00 2001 From: bobzel Date: Thu, 25 Mar 2021 13:29:58 -0400 Subject: fixed videos in lightbox to not auto-follow links. fixed audiotags to higlight more clearly when target of a link follow. --- src/client/views/collections/CollectionStackedTimeline.tsx | 6 +++--- src/client/views/nodes/formattedText/FormattedTextBox.tsx | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/client/views/collections/CollectionStackedTimeline.tsx b/src/client/views/collections/CollectionStackedTimeline.tsx index db02ab986..2dcdf58c2 100644 --- a/src/client/views/collections/CollectionStackedTimeline.tsx +++ b/src/client/views/collections/CollectionStackedTimeline.tsx @@ -273,7 +273,7 @@ export class CollectionStackedTimeline extends CollectionSubView ScriptField; rangePlayScript: () => ScriptField; @@ -297,7 +297,7 @@ interface StackedTinelineAnchorProps { stackedTimeline: CollectionStackedTimeline; } @observer -class StackedTimelineAnchor extends React.Component { +class StackedTimelineAnchor extends React.Component { _lastTimecode: number; _disposer: IReactionDisposer | undefined; constructor(props: any) { @@ -307,7 +307,7 @@ class StackedTimelineAnchor extends React.Component componentDidMount() { this._disposer = reaction(() => this.props.currentTimecode(), (time) => { - if (!LightboxView.LightboxDoc && DocListCast(this.props.mark.links).length && + if (!Doc.AreProtosEqual(LightboxView.LightboxDoc, this.props.layoutDoc) && DocListCast(this.props.mark.links).length && time > NumCast(this.props.mark[this.props.startTag]) && time < NumCast(this.props.mark[this.props.endTag]) && this._lastTimecode < NumCast(this.props.mark[this.props.startTag])) { diff --git a/src/client/views/nodes/formattedText/FormattedTextBox.tsx b/src/client/views/nodes/formattedText/FormattedTextBox.tsx index 2a1cc854c..369f5ab39 100644 --- a/src/client/views/nodes/formattedText/FormattedTextBox.tsx +++ b/src/client/views/nodes/formattedText/FormattedTextBox.tsx @@ -762,9 +762,9 @@ export class FormattedTextBox extends ViewBoxAnnotatableComponent<(FieldViewProp } editor.dispatch(editor.state.tr.setSelection(new TextSelection(selection.$from, selection.$from)).scrollIntoView()); const escAnchorId = textAnchorId[0] >= '0' && textAnchorId[0] <= '9' ? `\\3${textAnchorId[0]} ${textAnchorId.substr(1)}` : textAnchorId; - addStyleSheetRule(FormattedTextBox._highlightStyleSheet, `${escAnchorId}`, { background: "yellow" }); + addStyleSheetRule(FormattedTextBox._highlightStyleSheet, `${escAnchorId}`, { background: "yellow", transform: "scale(3)", "transform-origin": "left bottom" }); setTimeout(() => this._focusSpeed = undefined, this._focusSpeed); - setTimeout(() => clearStyleSheetRules(FormattedTextBox._highlightStyleSheet), Math.max(this._focusSpeed || 0, 1500)); + setTimeout(() => clearStyleSheetRules(FormattedTextBox._highlightStyleSheet), Math.max(this._focusSpeed || 0, 3000)); } } -- cgit v1.2.3-70-g09d2