diff options
Diffstat (limited to 'src/client/views/nodes')
| -rw-r--r-- | src/client/views/nodes/FormattedTextBox.tsx | 3 | ||||
| -rw-r--r-- | src/client/views/nodes/LinkMenuItem.tsx | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/src/client/views/nodes/FormattedTextBox.tsx b/src/client/views/nodes/FormattedTextBox.tsx index e08c4c988..ec1ddbdb7 100644 --- a/src/client/views/nodes/FormattedTextBox.tsx +++ b/src/client/views/nodes/FormattedTextBox.tsx @@ -37,12 +37,9 @@ import { DocumentDecorations } from '../DocumentDecorations'; import { DictationManager } from '../../util/DictationManager'; import { ReplaceStep } from 'prosemirror-transform'; import { DocumentType } from '../../documents/DocumentTypes'; -<<<<<<< HEAD import { link } from 'fs'; -======= import { selectionSizePlugin, findStartOfMark, findUserMark, findEndOfMark, findOtherUserMark, SelectionSizeTooltip } from './FormattedTextBoxComment'; import { date } from 'serializr'; ->>>>>>> 22a5999626b11cf75cafbcd421601e668438f6ad library.add(faEdit); library.add(faSmile, faTextHeight, faUpload); diff --git a/src/client/views/nodes/LinkMenuItem.tsx b/src/client/views/nodes/LinkMenuItem.tsx index 259dbc04e..15f8c0786 100644 --- a/src/client/views/nodes/LinkMenuItem.tsx +++ b/src/client/views/nodes/LinkMenuItem.tsx @@ -59,7 +59,7 @@ export class LinkMenuItem extends React.Component<LinkMenuItemProps> { else if (this.props.destinationDoc === self.props.linkDoc.anchor1 && sourceContext) { DocumentManager.Instance.jumpToDocument(jumpToDoc, e.altKey, false, document => dockingFunc(sourceContext!)); if (guid) { - console.log('wegotthis', self.props.linkDoc.anchor2, jumpToDoc[Id]); + console.log('wegotthis', StrCast(self.props.linkDoc.anchor2), jumpToDoc[Id]); jumpToDoc.linkHref = Utils.prepend("/doc/" + StrCast(this.props.linkDoc.anchor2)); jumpToDoc.guid = guid; } else { // retroactively fixing old in-text links by adding guid |