From 793cc99ab134bc5aa4667c95def851ce08d35146 Mon Sep 17 00:00:00 2001
From: Bob Zeleznik <zzzman@gmail.com>
Date: Mon, 11 Feb 2019 21:17:24 -0500
Subject: added aspect resizing.  fixed pinch zoom for macs

---
 src/fields/Key.ts | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/fields/Key.ts')

diff --git a/src/fields/Key.ts b/src/fields/Key.ts
index 67a5f86fb..13bdd01d4 100644
--- a/src/fields/Key.ts
+++ b/src/fields/Key.ts
@@ -43,6 +43,7 @@ export namespace KeyStore {
     export const PanY = new Key("PanY");
     export const Scale = new Key("Scale");
     export const NativeWidth = new Key("NativeWidth");
+    export const NativeHeight = new Key("NativeHeight");
     export const Width = new Key("Width");
     export const Height = new Key("Height");
     export const ZIndex = new Key("ZIndex");
-- 
cgit v1.2.3-70-g09d2


From f3359bd32f8c4ecb612d3c95f198d5e248ab6450 Mon Sep 17 00:00:00 2001
From: Bob Zeleznik <zzzman@gmail.com>
Date: Mon, 11 Feb 2019 21:28:09 -0500
Subject: renamed AnnotatedLaout to BackgroundLayout

---
 src/client/documents/Documents.ts       | 2 +-
 src/client/views/nodes/DocumentView.tsx | 8 ++++----
 src/fields/Key.ts                       | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/fields/Key.ts')

diff --git a/src/client/documents/Documents.ts b/src/client/documents/Documents.ts
index 84aaaa78f..8fbf99da6 100644
--- a/src/client/documents/Documents.ts
+++ b/src/client/documents/Documents.ts
@@ -128,7 +128,7 @@ export namespace Documents {
             imageProto.Set(KeyStore.Width, new NumberField(300));
             imageProto.Set(KeyStore.Height, new NumberField(300));
             imageProto.Set(KeyStore.Layout, new TextField("<CollectionFreeFormView DocumentForCollection={Document} CollectionFieldKey={AnnotationsKey} BackgroundView={BackgroundView} ContainingDocumentView={DocumentView} />"));
-            imageProto.Set(KeyStore.AnnotatedLayout, new TextField(ImageBox.LayoutString()));
+            imageProto.Set(KeyStore.BackgroundLayout, new TextField(ImageBox.LayoutString()));
             // imageProto.SetField(KeyStore.Layout, new TextField('<div style={"background-image: " + {Data}} />'));
             imageProto.Set(KeyStore.LayoutKeys, new ListField([KeyStore.Data, KeyStore.Annotations]));
             Server.AddDocument(imageProto);
diff --git a/src/client/views/nodes/DocumentView.tsx b/src/client/views/nodes/DocumentView.tsx
index bba5becc3..a2f8ceebe 100644
--- a/src/client/views/nodes/DocumentView.tsx
+++ b/src/client/views/nodes/DocumentView.tsx
@@ -36,8 +36,8 @@ export class DocumentView extends React.Component<DocumentViewProps> {
     }
 
     @computed
-    get annotatedlayout(): string {
-        return this.props.Document.GetData(KeyStore.AnnotatedLayout, TextField, String("<p>Error loading layout data</p>"));
+    get backgroundLayout(): string {
+        return this.props.Document.GetData(KeyStore.BackgroundLayout, TextField, String("<p>Error loading layout data</p>"));
     }
 
     @computed
@@ -147,11 +147,11 @@ export class DocumentView extends React.Component<DocumentViewProps> {
         var annotated = <JsxParser
             components={{ FormattedTextBox: FormattedTextBox, ImageBox, CollectionFreeFormView, CollectionDockingView, CollectionSchemaView }}
             bindings={bindings}
-            jsx={this.annotatedlayout}
+            jsx={this.backgroundLayout}
             showWarnings={true}
             onError={(test: any) => { console.log(test) }}
         />;
-        bindings["BackgroundView"] = this.annotatedlayout ? annotated : null;
+        bindings["BackgroundView"] = this.backgroundLayout ? annotated : null;
         return (
             <div className="node" ref={this._mainCont} style={{ width: "100%", height: "100%", }}>
                 <JsxParser
diff --git a/src/fields/Key.ts b/src/fields/Key.ts
index 13bdd01d4..8d92b89b6 100644
--- a/src/fields/Key.ts
+++ b/src/fields/Key.ts
@@ -50,7 +50,7 @@ export namespace KeyStore {
     export const Data = new Key("Data");
     export const Annotations = new Key("Annotations");
     export const Layout = new Key("Layout");
-    export const AnnotatedLayout = new Key("AnnotatedLayout");
+    export const BackgroundLayout = new Key("BackgroundLayout");
     export const LayoutKeys = new Key("LayoutKeys");
     export const LayoutFields = new Key("LayoutFields");
     export const ColumnsKey = new Key("SchemaColumns");
-- 
cgit v1.2.3-70-g09d2