diff options
| -rw-r--r-- | src/client/views/MetadataEntryMenu.tsx | 17 | ||||
| -rw-r--r-- | src/server/index.ts | 2 |
2 files changed, 15 insertions, 4 deletions
diff --git a/src/client/views/MetadataEntryMenu.tsx b/src/client/views/MetadataEntryMenu.tsx index 437de741f..aed84768e 100644 --- a/src/client/views/MetadataEntryMenu.tsx +++ b/src/client/views/MetadataEntryMenu.tsx @@ -22,6 +22,7 @@ export class MetadataEntryMenu extends React.Component<MetadataEntryProps>{ @observable private suggestions: string[] = []; private _addChildren: boolean = false; private userModified = false; + private _addChildren = false; private autosuggestRef = React.createRef<Autosuggest>(); @@ -84,6 +85,11 @@ export class MetadataEntryMenu extends React.Component<MetadataEntryProps>{ e.stopPropagation(); const script = KeyValueBox.CompileKVPScript(this._currentValue); if (!script) return; +<<<<<<< HEAD +======= + // add optional adding here + let docs = Array<Doc>(); +>>>>>>> e7883760751d053133c8bb9b867509fa23f40b68 let doc = this.props.docs; if (typeof doc === "function") { @@ -187,9 +193,14 @@ export class MetadataEntryMenu extends React.Component<MetadataEntryProps>{ ref={this.autosuggestRef} /> Value: <input className="metadataEntry-input" value={this._currentValue} onChange={this.onValueChange} onKeyDown={this.onValueKeyDown} /> - Children: - <input type="checkbox" onChange={this.onClick} ></input> - </div> +<<<<<<< HEAD + Children: + <input type="checkbox" onChange={this.onClick} ></input> +======= + Spread to children: + <input type="checkbox" onChange={this.onClick} checked={this._addChildren}></input> +>>>>>>> e7883760751d053133c8bb9b867509fa23f40b68 + </div > ); } }
\ No newline at end of file diff --git a/src/server/index.ts b/src/server/index.ts index eae018f13..7a425b60a 100644 --- a/src/server/index.ts +++ b/src/server/index.ts @@ -436,7 +436,7 @@ function LoadPage(file: string, pageNumber: number, res: Response) { console.log(pageNumber); pdf.getPage(pageNumber).then((page: Pdfjs.PDFPageProxy) => { console.log("reading " + page); - let viewport = page.getViewport(1); + let viewport = page.getViewport({ scale: 1 }); let canvasAndContext = factory.create(viewport.width, viewport.height); let renderContext = { canvasContext: canvasAndContext.context, |