On presenter console window reload close the slideshow

- Slide show should be closed on window reload
- otherwise it opens up the edit window which is already there in main window

Signed-off-by: Darshan-upadhyay1110 <[email protected]>
Change-Id: I65bbdb19ecb9c41c0b80fcc488bc6e50acdea8f5

Author: Darshan-upadhyay1110

browser/src/slideshow/PresenterConsole.js

@@ -123,9 +123,11 @@ class PresenterConsole {
 		this._map.on('transitionend', this._onTransitionEnd, this);
 		this._map.on('tilepreview', this._onTilePreview, this);
 
-		this._computeCanvas(
-			this._proxyPresenter.document.querySelector('#current-presentation'),
-		);
+		// safe check for current-presentation element
+		const currentPresentationCanvas =
+			this._proxyPresenter.document.querySelector('#current-presentation');
+		if (!currentPresentationCanvas) return;
+		this._computeCanvas(currentPresentationCanvas);
 
 		this._timer = this._proxyPresenter.setInterval(
 			L.bind(this._onTimer, this),
@@ -1056,7 +1058,6 @@ class PresenterConsole {
 		);
 		this._proxyPresenter.clearInterval(this._timer);
 
-		delete this._proxyPresenter;
 		delete this._currentIndex;
 		delete this._lastIndex;
 		delete this._previews;

browser/src/slideshow/SlideShowPresenter.ts

@@ -557,7 +557,10 @@ class SlideShowPresenter {
 			'keydown',
 			this._onKeyDownHandler,
 		);
-
+		this._slideShowWindowProxy.addEventListener(
+			'unload',
+			L.bind(this._closeSlideShowWindow, this),
+		);
 		const slideShowWindow = this._slideShowWindowProxy;
 		this._map.uiManager.showSnackbar(
 			_('Presenting in window'),
@@ -677,6 +680,7 @@ class SlideShowPresenter {
 	}
 
 	_notifyBlockedPresenting() {
+		this._enablePresenterConsole(false);
 		this._map.uiManager.showInfoModal(
 			'popup-blocked-modal',
 			_('Windowed Presentation Blocked'),