From 6499ac4b30c8f6ada2b0c7d74cd5f2a73f9bf180 Mon Sep 17 00:00:00 2001 From: bobzel Date: Sun, 10 Sep 2023 15:58:09 -0400 Subject: fixes for file uploads: restored progress for youtube videos, fixed info display on loadingBoxes, stop client from asking for progress on failed uploads. attempt to catch stream errors on webpages. fixed dataFieldView in text to print out layout document's field, not field of document that contains the field definition. --- src/client/views/nodes/LoadingBox.scss | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/client/views/nodes/LoadingBox.scss') diff --git a/src/client/views/nodes/LoadingBox.scss b/src/client/views/nodes/LoadingBox.scss index d4a7e18f2..61a505420 100644 --- a/src/client/views/nodes/LoadingBox.scss +++ b/src/client/views/nodes/LoadingBox.scss @@ -21,6 +21,7 @@ .textContainer { margin: 5px; + display: block; } .textContainer { @@ -31,6 +32,8 @@ .headerText { text-align: center; font-weight: bold; + height: auto; + width: 100%; } .spinner { -- cgit v1.2.3-70-g09d2 From 85cb819707b50cc4f50b8114f4b7af13d63bc977 Mon Sep 17 00:00:00 2001 From: bobzel Date: Sun, 10 Sep 2023 16:02:21 -0400 Subject: from last --- src/client/views/nodes/LoadingBox.scss | 1 + 1 file changed, 1 insertion(+) (limited to 'src/client/views/nodes/LoadingBox.scss') diff --git a/src/client/views/nodes/LoadingBox.scss b/src/client/views/nodes/LoadingBox.scss index 61a505420..644a851c1 100644 --- a/src/client/views/nodes/LoadingBox.scss +++ b/src/client/views/nodes/LoadingBox.scss @@ -5,6 +5,7 @@ justify-content: center; background-color: #fdfdfd; height: 100%; + width: 100%; align-items: center; .textContainer, .text { -- cgit v1.2.3-70-g09d2 From 421d2c6392ad6ac43375752ef7dfe9ac1876aa33 Mon Sep 17 00:00:00 2001 From: bobzel Date: Sun, 10 Sep 2023 16:13:33 -0400 Subject: from last --- src/client/views/nodes/LoadingBox.scss | 4 +++- src/client/views/nodes/LoadingBox.tsx | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'src/client/views/nodes/LoadingBox.scss') diff --git a/src/client/views/nodes/LoadingBox.scss b/src/client/views/nodes/LoadingBox.scss index 644a851c1..d7b44f9e2 100644 --- a/src/client/views/nodes/LoadingBox.scss +++ b/src/client/views/nodes/LoadingBox.scss @@ -8,7 +8,7 @@ width: 100%; align-items: center; .textContainer, - .text { + .loadingBox-title { overflow: hidden; text-overflow: ellipsis; max-width: 80%; @@ -17,6 +17,8 @@ flex-direction: column; gap: 8px; align-items: center; + white-space: normal; + word-break: all; } } diff --git a/src/client/views/nodes/LoadingBox.tsx b/src/client/views/nodes/LoadingBox.tsx index 58c70bdd7..4a030ff66 100644 --- a/src/client/views/nodes/LoadingBox.tsx +++ b/src/client/views/nodes/LoadingBox.tsx @@ -59,9 +59,9 @@ export class LoadingBox extends ViewBoxAnnotatableComponent() { return (
- {StrCast(this.rootDoc.title)} + {StrCast(this.rootDoc.title)}

{StrCast(this.rootDoc.loadingError, 'Loading ' + (this.progress.replace('[download]', '') || '(can take several minutes)'))}

- {this.rootDoc.loadingError ? null : } + {this.rootDoc.loadingError ? null : }
); -- cgit v1.2.3-70-g09d2 From 86db8585a6c82129ec009e4ca5ef033ed0d6f886 Mon Sep 17 00:00:00 2001 From: bobzel Date: Sun, 10 Sep 2023 16:14:47 -0400 Subject: once more --- src/client/views/nodes/LoadingBox.scss | 1 - 1 file changed, 1 deletion(-) (limited to 'src/client/views/nodes/LoadingBox.scss') diff --git a/src/client/views/nodes/LoadingBox.scss b/src/client/views/nodes/LoadingBox.scss index d7b44f9e2..ff25a8133 100644 --- a/src/client/views/nodes/LoadingBox.scss +++ b/src/client/views/nodes/LoadingBox.scss @@ -9,7 +9,6 @@ align-items: center; .textContainer, .loadingBox-title { - overflow: hidden; text-overflow: ellipsis; max-width: 80%; text-align: center; -- cgit v1.2.3-70-g09d2 From 06b48b08425972d4c0ae57615173d70d12aeb5bd Mon Sep 17 00:00:00 2001 From: bobzel Date: Sun, 10 Sep 2023 16:32:41 -0400 Subject: once more --- src/client/views/nodes/LoadingBox.scss | 37 ++++++++++++---------------------- src/client/views/nodes/LoadingBox.tsx | 10 ++++++--- 2 files changed, 20 insertions(+), 27 deletions(-) (limited to 'src/client/views/nodes/LoadingBox.scss') diff --git a/src/client/views/nodes/LoadingBox.scss b/src/client/views/nodes/LoadingBox.scss index ff25a8133..cabd4de05 100644 --- a/src/client/views/nodes/LoadingBox.scss +++ b/src/client/views/nodes/LoadingBox.scss @@ -7,37 +7,26 @@ height: 100%; width: 100%; align-items: center; - .textContainer, + .loadingBox-textContainer, .loadingBox-title { text-overflow: ellipsis; max-width: 80%; text-align: center; - display: flex; - flex-direction: column; + display: block; gap: 8px; align-items: center; white-space: normal; word-break: all; + .loadingBox-headerText { + text-align: center; + font-weight: bold; + height: auto; + width: 100%; + } + } + .loadingBox-spinner { + position: absolute; + top: 0; + left: 0; } -} - -.textContainer { - margin: 5px; - display: block; -} - -.textContainer { - justify-content: center; - align-content: center; -} - -.headerText { - text-align: center; - font-weight: bold; - height: auto; - width: 100%; -} - -.spinner { - text-align: center; } diff --git a/src/client/views/nodes/LoadingBox.tsx b/src/client/views/nodes/LoadingBox.tsx index 4a030ff66..bdc074e0c 100644 --- a/src/client/views/nodes/LoadingBox.tsx +++ b/src/client/views/nodes/LoadingBox.tsx @@ -58,10 +58,14 @@ export class LoadingBox extends ViewBoxAnnotatableComponent() { render() { return (
-
+
{StrCast(this.rootDoc.title)} -

{StrCast(this.rootDoc.loadingError, 'Loading ' + (this.progress.replace('[download]', '') || '(can take several minutes)'))}

- {this.rootDoc.loadingError ? null : } +

{StrCast(this.rootDoc.loadingError, 'Loading ' + (this.progress.replace('[download]', '') || '(can take several minutes)'))}

+ {this.rootDoc.loadingError ? null : ( +
+ +
+ )}
); -- cgit v1.2.3-70-g09d2