diff options
| author | tschicke-brown <tyler_schicke@brown.edu> | 2019-01-26 17:23:42 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-26 17:23:42 -0500 |
| commit | f8ce9c45eeba1eccb4244a08e2c752fe4cf39105 (patch) | |
| tree | be39c0c927ae4649c8505ef33c7f1c8272974ca2 /src/fields | |
| parent | 122076af3edfd432e6abe3b2571f21034d5c16e5 (diff) | |
| parent | ba3c6773a04ea83facab1f67db0025d6185c2c65 (diff) | |
Merge pull request #3 from browngraphicslab/move_doc_get_out_the_way
Move doc get out the way
Diffstat (limited to 'src/fields')
| -rw-r--r-- | src/fields/Document.ts | 3 | ||||
| -rw-r--r-- | src/fields/Key.ts | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/fields/Document.ts b/src/fields/Document.ts index 0bba9c21e..6b1cccaf9 100644 --- a/src/fields/Document.ts +++ b/src/fields/Document.ts @@ -31,7 +31,8 @@ export class Document extends Field { GetFieldValue<T, U extends { Data: T }>(key: Key, ctor: { new(): U }, defaultVal: T): T { let val = this.GetField(key); - return (val && val instanceof ctor) ? val.Data : defaultVal; + let vval = (val && val instanceof ctor) ? val.Data : defaultVal; + return vval; } SetField(key: Key, field: Opt<Field>): void { diff --git a/src/fields/Key.ts b/src/fields/Key.ts index db30f545d..1f8ba0be5 100644 --- a/src/fields/Key.ts +++ b/src/fields/Key.ts @@ -36,6 +36,7 @@ export namespace KeyStore { export let Y = new Key("Y"); export let PanX = new Key("PanX"); export let PanY = new Key("PanY"); + export let Scale = new Key("Scale"); export let Width = new Key("Width"); export let Height = new Key("Height"); export let Data = new Key("Data"); |
