diff options
author | geireann <60007097+geireann@users.noreply.github.com> | 2020-06-30 03:29:27 +0800 |
---|---|---|
committer | geireann <60007097+geireann@users.noreply.github.com> | 2020-06-30 03:29:27 +0800 |
commit | 73bbc602fb964c82999faccfdde8eeca6fbf08c4 (patch) | |
tree | 576b41e77fd3280ee282e3ece6effbca39f57901 /src/fields/Doc.ts | |
parent | 6b75f84565a5019175b16ee5ea69fc5330aa2c0d (diff) | |
parent | cb8b5b3d9e735c88b9efdd9b4a444cac40fdedb2 (diff) |
Merge branch 'master' into mobile_revision_direct
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 8c8720179..dd7117594 100644 --- a/src/fields/Doc.ts +++ b/src/fields/Doc.ts @@ -973,7 +973,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; } @@ -1159,7 +1159,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 && |