Merge branch 'master' into task_nodes_aarav

2 files changed, 2 insertions, 1 deletions

diff --git a/src/client/documents/DocUtils.ts b/src/client/documents/DocUtils.ts
index 5aae50ee8..dee929c89 100644
--- a/src/client/documents/DocUtils.ts
+++ b/src/client/documents/DocUtils.ts
@@ -842,7 +842,7 @@ export namespace DocUtils {
             const {
                 source: { newFilename, mimetype },
                 result,
-            } = upfiles.lastElement() ?? { source: { newFilename: '', mimetype: '' }, result: new Error('upload failed') };
+            } = upfiles.lastElement() ?? { source: { newFilename: '', mimetype: '' }, result: upfiles[0]?.result ?? new Error('unknown error') };
             if (result instanceof Error) {
                 if (overwriteDoc) {
                     overwriteDoc.loadingError = result.message;
diff --git a/src/client/documents/Documents.ts b/src/client/documents/Documents.ts
index b8a6453a6..0b6385466 100644
--- a/src/client/documents/Documents.ts
+++ b/src/client/documents/Documents.ts
@@ -289,6 +289,7 @@ export class DocumentOptions {
     _layout_showSidebar?: BOOLt = new BoolInfo('whether an annotationsidebar should be displayed for text docuemnts');
     _layout_showCaption?: string; // which field to display in the caption area.  leave empty to have no caption
     _layout_showTags?: BOOLt = new BoolInfo('whether to show the list of document tags at the bottom of a DocView');
+    _layout_hideScroll?: BOOLt = new BoolInfo('whether to hide scroll bars on the document');
 
     _chromeHidden?: BOOLt = new BoolInfo('whether the editing chrome for a document is hidden');
     hideClickBehaviors?: BOOLt = new BoolInfo('whether to hide click behaviors in context menu');