Merge branch 'master' into grouping

1 files changed, 5 insertions, 14 deletions

diff --git a/src/client/views/presentationview/PresentationView.tsx b/src/client/views/presentationview/PresentationView.tsx
index 4fe9d3a1b..bea70f00b 100644
--- a/src/client/views/presentationview/PresentationView.tsx
+++ b/src/client/views/presentationview/PresentationView.tsx
@@ -375,7 +375,7 @@ export class PresentationView extends React.Component<PresViewProps>  {
                     //awaiting jump so that new scale can be found, since jumping is async
                     await DocumentManager.Instance.jumpToDocument(curDoc, true);
                 } else {
-                    await DocumentManager.Instance.jumpToDocument(curDoc, false, undefined, doc => CollectionDockingView.Instance.AddTab(undefined, doc, undefined));
+                    await DocumentManager.Instance.jumpToDocument(curDoc, true, undefined, doc => CollectionDockingView.Instance.AddTab(undefined, doc, undefined));
                 }
 
                 let newScale = DocumentManager.Instance.getScaleOfDocView(curDoc);
@@ -881,24 +881,15 @@ export class PresentationView extends React.Component<PresViewProps>  {
             if (presWidth - presMinWidth !== 0) {
                 this.curPresentation.width = 0;
             }
+            if (presWidth === 0) {
+                this.curPresentation.width = presMinWidth;
+            }
         }
         document.removeEventListener("pointermove", this.onPointerMove);
         document.removeEventListener("pointerup", this.onPointerUp);
     }
 
     /**
-     * This function gets triggered on click of the dragger. It opens up the
-     * presentation view, if it was closed beforehand.
-     */
-    togglePresView = (e: React.MouseEvent) => {
-        e.stopPropagation();
-        e.preventDefault();
-        let width = NumCast(this.curPresentation.width);
-        if (width === 0) {
-            this.curPresentation.width = presMinWidth;
-        }
-    }
-    /**
      * This function is a setter that opens up the 
      * presentation mode, by setting it's render flag
      * to true. It also closes the presentation view.
@@ -992,7 +983,7 @@ export class PresentationView extends React.Component<PresViewProps>  {
                 </div>
                 <div className="mainView-libraryHandle"
                     style={{ cursor: "ew-resize", right: `${width - 10}px`, backgroundColor: "white", opacity: this.opacity, transition: "0.7s opacity ease" }}
-                    onPointerDown={this.onPointerDown} onClick={this.togglePresView}>
+                    onPointerDown={this.onPointerDown}>
                     <span title="library View Dragger" style={{ width: "100%", height: "100%", position: "absolute" }} />
                 </div>
                 {this.renderPresMode()}