Presenter Console

browser/Makefile.am

@@ -424,6 +424,7 @@ COOL_JS_LST =\
 	src/slideshow/RenderContext.ts \
 	src/slideshow/SlideRenderer.ts \
 	src/slideshow/SlideShowPresenter.ts \
+	src/slideshow/PresenterConsole.js \
 	src/slideshow/SimpleTextureRenderer.ts \
 	src/slideshow/StaticTextRenderer.ts \
 	src/slideshow/PauseTimer.ts \

browser/src/control/Control.NotebookbarImpress.js

@@ -366,6 +366,14 @@ L.Control.NotebookbarImpress = L.Control.NotebookbarWriter.extend({
 					'command': 'presentinwindow',
 					'accessibility': { focusBack: true, combination: 'PW', de: null }
 				} : {},
+			!window.ThisIsAMobileApp ?
+			        {
+					'id': 'view-presentation-in-console',
+					'type': 'bigcustomtoolitem',
+					'text': _('Presenter Console'),
+					'command': 'presenterconsole',
+					'accessibility': { focusBack: true, combination: 'PW', de: null }
+				}: {},
 			{
 				'id': 'fullscreen',
 				'type': 'bigtoolitem',

browser/src/control/Control.UIManager.js

@@ -368,6 +368,7 @@ L.Control.UIManager = L.Control.extend({
 			$('#presentation-controls-wrapper').show();
 			this.initializeRuler();
 			this.map.slideShowPresenter = new SlideShow.SlideShowPresenter(this.map);
+			this.map.presenterConsole = new SlideShow.PresenterConsole(this.map);
 		}
 
 		if (docType === 'text') {

browser/src/docdispatcher.ts

@@ -415,6 +415,11 @@ class Dispatcher {
 				else app.map.fire('presentinwindow');
 			};
 
+		this.actionsMap['presenterconsole'] = () => {
+			if (app.map._debug.debugOn || app.isExperimentalMode())
+				app.map.fire('newpresentinconsole');
+		};
+
 		this.actionsMap['fullscreen-drawing'] = () => {
 			L.toggleFullScreen();
 		};

browser/src/layer/tile/CanvasTileLayer.js

@@ -1651,20 +1651,16 @@ L.CanvasTileLayer = L.Layer.extend({
 			this._map.fire('adminuser');
 		} else if (textMsg.startsWith('presentationinfo:')) {
 			var content = JSON.parse(textMsg.substring('presentationinfo:'.length + 1));
-			if (this._map.slideShowPresenter) {
-				this._map.slideShowPresenter.onSlideShowInfo(content);
-			}
+			this._map.fire('presentationinfo', content);
 		} else if (textMsg.startsWith('slidelayer:')) {
 			const content = JSON.parse(textMsg.substring('slidelayer:'.length + 1));
 			this._map.fire('slidelayer', {
 				message: content,
 				image: img
 			});
 		} else if (textMsg.startsWith('sliderenderingcomplete:')) {
-			const status = textMsg.substring('sliderenderingcomplete:'.length + 1);
-			this._map.fire('sliderenderingcomplete', {
-				success: status === 'success'
-			});
+			const data = JSON.parse(textMsg.substring('sliderenderingcomplete:'.length + 1));
+			this._map.fire('sliderenderingcomplete', data);
 		}
 	},
 

browser/src/slideshow/LayerDrawing.ts

@@ -285,15 +285,15 @@ class LayerDrawing {
 		}
 
 		if (this.slideCache.has(slideHash)) {
-			this.onSlideRenderingComplete({ success: true });
+			this.onSlideRenderingComplete({ success: true, slide: slideHash });
 			return;
 		}
 
 		const backgroundRendered = this.drawBackground(slideHash);
 		const masterPageRendered = this.drawMasterPage(slideHash);
 		if (backgroundRendered && masterPageRendered) {
 			if (this.drawDrawPage(slideHash)) {
-				this.onSlideRenderingComplete({ success: true });
+				this.onSlideRenderingComplete({ success: true, slide: slideHash });
 				return;
 			}
 		}
@@ -484,10 +484,10 @@ class LayerDrawing {
 		}
 
 		var hasField = false;
-		for (const layer of layers) {
-			this.drawMasterPageLayer(layer, slideHash);
-			if (layer.isField) {
-				this.cachedMasterPages.delete(slideInfo.masterPage);
+		for (const layer in layers) {
+			this.drawMasterPageLayer(layers[layer], slideHash);
+			if (layers[layer].isField) {
+				delete layers[layer];
 				hasField = true;
 			}
 		}
@@ -596,6 +596,21 @@ class LayerDrawing {
 			this.prefetchedSlideHash = null;
 			return;
 		}
+
+		if (!this.requestedSlideHash) {
+			app.console.warn('onSlideRenderingComplete: requestedSlideHash is null');
+			return;
+		}
+
+		const layers = this.cachedDrawPages.get(this.requestedSlideHash);
+		if (!layers || layers.length === 0) {
+			return;
+		}
+
+		if (e.slide !== this.requestedSlideHash) {
+			return;
+		}
+
 		const reqSlideInfo = this.getSlideInfo(this.requestedSlideHash);
 
 		this.cacheAndNotify();