summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCaolán McNamara <caolan.mcnamara@collabora.com>2023-08-16 21:33:53 +0100
committerCaolán McNamara <caolan.mcnamara@collabora.com>2023-08-16 21:40:58 +0100
commitcb3fc483e7bb00c66faffc91d58cc0090452809f (patch)
treea8b28d1b8de9c351f7afc91d1b44ccb5473b86a2
parentcid#318843 COPY_INSTEAD_OF_MOVE (diff)
downloadonline-fix_chrome_slideshow.tar.gz
online-fix_chrome_slideshow.zip
cool#7102 fix 2nd presentation under chrome not appearing fix_chrome_slideshow
On entering full screen the normal browser window goes "idle" on losing focus. When the full screen presentation exits no "focus" events gets sent to the normal window so clicking "presentation" again doesn't do anything as idle inhibits anything getting actually sent to the server. in: commit 5f655a7555cd836933dc14395495561f5f8cd04e Date: Tue Oct 13 19:26:16 2015 +0300 loleaflet: print handler tdf#94607 a similar _map.focus() is done after a similar L.DomUtil.remove() and doing there same here gets this case to work. https://github.com/CollaboraOnline/online/issues/7102 Signed-off-by: Caolán McNamara <caolan.mcnamara@collabora.com> Change-Id: Iae44ba949af2a64bf669b9d5f1113c647a354af1
-rw-r--r--browser/src/map/handler/Map.SlideShow.js4
1 files changed, 4 insertions, 0 deletions
diff --git a/browser/src/map/handler/Map.SlideShow.js b/browser/src/map/handler/Map.SlideShow.js
index a40676cc42..44b1bbf710 100644
--- a/browser/src/map/handler/Map.SlideShow.js
+++ b/browser/src/map/handler/Map.SlideShow.js
@@ -85,6 +85,10 @@ L.Map.SlideShow = L.Handler.extend({
document.msFullscreenElement;
if (!this.fullscreen) {
L.DomUtil.remove(this._slideShow);
+ // #7102 on exit from fullscreen we don't get a 'focus' event
+ // in chome so a later second attempt at launching a presentation
+ // fails
+ this._map.focus();
}
},