diff options
| author | bob <bcz@cs.brown.edu> | 2019-07-17 15:15:49 -0400 |
|---|---|---|
| committer | bob <bcz@cs.brown.edu> | 2019-07-17 15:15:49 -0400 |
| commit | 516c0b35bbb7a184931ab0fe1d54086d8052bda4 (patch) | |
| tree | 2ca97f3802185e4aece0684f24969e761c388d94 /src | |
| parent | 40e0e70d9cae801a7742747a756c49f9bb7cf54a (diff) | |
changed image proxying stuff
Diffstat (limited to 'src')
| -rw-r--r-- | src/client/documents/Documents.ts | 5 | ||||
| -rw-r--r-- | src/client/views/nodes/ImageBox.tsx | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/client/documents/Documents.ts b/src/client/documents/Documents.ts index af2b95659..3c248760b 100644 --- a/src/client/documents/Documents.ts +++ b/src/client/documents/Documents.ts @@ -311,8 +311,9 @@ export namespace Docs { } export function ImageDocument(url: string, options: DocumentOptions = {}) { - let inst = InstanceFromProto(Prototypes.get(DocumentType.IMG), new ImageField(new URL(url)), { title: path.basename(url), ...options }); - requestImageSize(window.origin + RouteStore.corsProxy + "/" + url) + let imgField = new ImageField(new URL(url)); + let inst = InstanceFromProto(Prototypes.get(DocumentType.IMG), imgField, { title: path.basename(url), ...options }); + requestImageSize(imgField.url.href) .then((size: any) => { let aspect = size.height / size.width; if (!inst.proto!.nativeWidth) { diff --git a/src/client/views/nodes/ImageBox.tsx b/src/client/views/nodes/ImageBox.tsx index a3e098fd8..ebe3732e6 100644 --- a/src/client/views/nodes/ImageBox.tsx +++ b/src/client/views/nodes/ImageBox.tsx @@ -259,7 +259,7 @@ export class ImageBox extends DocComponent<FieldViewProps, ImageDocument>(ImageD _curSuffix = "_m"; resize(srcpath: string, layoutdoc: Doc) { - requestImageSize(window.origin + RouteStore.corsProxy + "/" + srcpath) + requestImageSize(srcpath) .then((size: any) => { let aspect = size.height / size.width; let rotation = NumCast(this.dataDoc.rotation) % 180; |