diff options
| author | usodhi <61431818+usodhi@users.noreply.github.com> | 2020-06-29 17:00:41 +0530 |
|---|---|---|
| committer | usodhi <61431818+usodhi@users.noreply.github.com> | 2020-06-29 17:00:41 +0530 |
| commit | 9c0a250fd412c46861f72d8bb7cc5535b101c0fa (patch) | |
| tree | ff24809b94f06b3fb12ce47dbd94e14cdc615baa /src/fields/Doc.ts | |
| parent | 6ad7fac6342204bc489ef49cb3ba8f450bfa3824 (diff) | |
| parent | 29f9cedd937697c56ce3b400931b26c82a23721d (diff) | |
merge conflicts resolved
Diffstat (limited to 'src/fields/Doc.ts')
| -rw-r--r-- | src/fields/Doc.ts | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/fields/Doc.ts b/src/fields/Doc.ts index 8ca85cae9..bef8acb06 100644 --- a/src/fields/Doc.ts +++ b/src/fields/Doc.ts @@ -976,7 +976,7 @@ export namespace Doc { export function toggleNativeDimensions(layoutDoc: Doc, contentScale: number, panelWidth: number, panelHeight: number) { runInAction(() => { if (layoutDoc._nativeWidth || layoutDoc._nativeHeight) { - layoutDoc.scale = NumCast(layoutDoc.scale, 1) * contentScale; + layoutDoc._viewScale = NumCast(layoutDoc._viewScale, 1) * contentScale; layoutDoc._nativeWidth = undefined; layoutDoc._nativeHeight = undefined; } @@ -1162,7 +1162,6 @@ Scripting.addGlobal(function activePresentationItem() { const curPres = Doc.UserDoc().activePresentation as Doc; return curPres && DocListCast(curPres[Doc.LayoutFieldKey(curPres)])[NumCast(curPres._itemIndex)]; }); -Scripting.addGlobal(function selectDoc(doc: any) { Doc.UserDoc().activeSelection = new List([doc]); }); Scripting.addGlobal(function selectedDocs(container: Doc, excludeCollections: boolean, prevValue: any) { const docs = DocListCast(Doc.UserDoc().activeSelection). filter(d => !Doc.AreProtosEqual(d, container) && !d.annotationOn && d.type !== DocumentType.DOCHOLDER && d.type !== DocumentType.KVP && |