diff options
| -rw-r--r-- | src/client/documents/Documents.ts | 6 | ||||
| -rw-r--r-- | src/client/util/CaptureManager.tsx | 1 | ||||
| -rw-r--r-- | src/client/views/PropertiesView.tsx | 25 |
3 files changed, 13 insertions, 19 deletions
diff --git a/src/client/documents/Documents.ts b/src/client/documents/Documents.ts index e5168c882..8f62a484f 100644 --- a/src/client/documents/Documents.ts +++ b/src/client/documents/Documents.ts @@ -575,7 +575,7 @@ export namespace Docs { DocumentType.EQUATION, { layout: { view: EquationBox, dataField: 'text' }, - options: { nativeDimModifiable: true, fontSize: '14px', layout_hideResizeHandles: true, layout_hideDecorationTitle: true }, + options: { nativeDimModifiable: true, fontSize: '14px', layout_hideResizeHandles: true, layout_hideDecorationTitle: true}, }, ], [ @@ -639,7 +639,7 @@ export namespace Docs { { // NOTE: this is unused!! ink fields are filled in directly within the InkDocument() method layout: { view: InkingStroke, dataField: 'stroke' }, - options: {}, + options: { systemIcon: 'BsFillPencilFill'}, }, ], [ @@ -691,7 +691,7 @@ export namespace Docs { { data: '', layout: { view: PhysicsSimulationBox, dataField: defaultDataKey, _width: 1000, _height: 800 }, - options: { _height: 100, layout_forceReflow: true, nativeHeightUnfrozen: true, mass1: '', mass2: '', nativeDimModifiable: true, position: '', acceleration: '', pendulum: '', spring: '', wedge: '', simulation: '', review: '' }, + options: { _height: 100, layout_forceReflow: true, nativeHeightUnfrozen: true, mass1: '', mass2: '', nativeDimModifiable: true, position: '', acceleration: '', pendulum: '', spring: '', wedge: '', simulation: '', review: ''}, }, ], ]); diff --git a/src/client/util/CaptureManager.tsx b/src/client/util/CaptureManager.tsx index d68761ba7..f42336ee7 100644 --- a/src/client/util/CaptureManager.tsx +++ b/src/client/util/CaptureManager.tsx @@ -58,7 +58,6 @@ export class CaptureManager extends React.Component<{}> { ) ); } - return ( <div className="capture-block"> <div className="capture-block-title">Links</div> diff --git a/src/client/views/PropertiesView.tsx b/src/client/views/PropertiesView.tsx index a6c94d0d9..d956c874c 100644 --- a/src/client/views/PropertiesView.tsx +++ b/src/client/views/PropertiesView.tsx @@ -270,20 +270,13 @@ export class PropertiesView extends React.Component<PropertiesViewProps> { @computed get linkCount(){ const selAnchor = this.selectedDocumentView?.anchorViewDoc ?? LinkManager.currentLinkAnchor ?? this.selectedDoc; - - if (this.links === null){ - console.log("this is where i want to be") - } - console.log("this is based on links() " + this.links?.key) + var counter = 0; - if (selAnchor != undefined){ - console.log("thsi si selAnchr " + selAnchor.links) - const links = DocListCast(selAnchor.links) - console.log("we linkin yo " + links) - return links.length - } else{ - return 0 - } + LinkManager.Links(selAnchor).forEach((l, i) => + counter ++ + ); + + return counter; } @computed get layoutPreview() { @@ -1208,6 +1201,8 @@ export class PropertiesView extends React.Component<PropertiesViewProps> { } @computed get linksSubMenu() { + // this.linkCount + // this.links return ( <div className="propertiesView-contexts"> @@ -1218,8 +1213,8 @@ export class PropertiesView extends React.Component<PropertiesViewProps> { <FontAwesomeIcon icon={this.openLinks ? 'caret-down' : 'caret-right'} size="lg" color="white" /> </div> </div> - {/* {!this.openLinks ? null : this.linkCount > 0 ? <div className="propertiesView-contexts-content">{this.links}</div> : <div className="propertiesView-contexts-content">There are no current links.</div>} */} - {!this.openLinks ? null : <div className="propertiesView-contexts-content">{this.links}</div>} + {!this.openLinks ? null : this.linkCount > 0 ? <div className="propertiesView-contexts-content">{this.links}</div> : <div className="propertiesView-contexts-content">There are no current links.</div>} + {/* {!this.openLinks ? null : <div className="propertiesView-contexts-content">{this.links}</div>} */} </div> ); } |