Merge remote-tracking branch 'origin/speedups2' into presentation_upgrade

1 files changed, 4 insertions, 4 deletions

diff --git a/src/client/util/DocumentManager.ts b/src/client/util/DocumentManager.ts
index 66b6a1e44..0a00ab6e0 100644
--- a/src/client/util/DocumentManager.ts
+++ b/src/client/util/DocumentManager.ts
@@ -9,7 +9,7 @@ import { CollectionView } from '../views/collections/CollectionView';
 import { LightboxView } from '../views/LightboxView';
 import { DocumentView, ViewAdjustment } from '../views/nodes/DocumentView';
 import { LinkAnchorBox } from '../views/nodes/LinkAnchorBox';
-import { Scripting } from './Scripting';
+import { ScriptingGlobals } from './ScriptingGlobals';
 import { SelectionManager } from './SelectionManager';
 
 export class DocumentManager {
@@ -198,7 +198,7 @@ export class DocumentManager {
                 originalTarget, willZoom, scale: presZoom, afterFocus: (didFocus: boolean) =>
                     new Promise<ViewAdjustment>(res => {
                         focusAndFinish(didFocus);
-                        res();
+                        res(ViewAdjustment.doNothing);
                     })
             });
         } else {
@@ -227,7 +227,7 @@ export class DocumentManager {
                                     willZoom, afterFocus: (didFocus: boolean) =>
                                         new Promise<ViewAdjustment>(res => {
                                             !noSelect && focusAndFinish(didFocus);
-                                            res();
+                                            res(ViewAdjustment.doNothing);
                                         })
                                 }); // focus on the target in the context
                             } else if (delay > 1500) {
@@ -252,7 +252,7 @@ export class DocumentManager {
     }
 
 }
-Scripting.addGlobal(function DocFocusOrOpen(doc: any) {
+ScriptingGlobals.add(function DocFocusOrOpen(doc: any) {
     const dv = DocumentManager.Instance.getDocumentView(doc);
     if (dv && dv.props.Document === doc) {
         dv.props.focus(doc, { willZoom: true });