From 15b6ccc8ec6b5393c35c68da9dc67af1fda4b50b Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Fri, 22 Feb 2019 20:32:45 +0200 Subject: tdf#122582: Add ways to exit the slideshow in the iOS app Either going past the end, or pressing the 'q' key on a hardware keyboard will exit the slideshow by posting an 'EXITSLIDESHOW' message to the app. (The app will have to handle that, of course, will commit in a moment.) Change-Id: I075e5e3fa86cc632cb3071d6546721b010ff77a2 (cherry picked from commit 47ecfa0d8bd64ad946b5ec1238f43df5632b1960) Reviewed-on: https://gerrit.libreoffice.org/79167 Reviewed-by: Tor Lillqvist Tested-by: Tor Lillqvist --- filter/source/svg/presentation_engine.js | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) (limited to 'filter') diff --git a/filter/source/svg/presentation_engine.js b/filter/source/svg/presentation_engine.js index 081537954bf1..04891e947eee 100644 --- a/filter/source/svg/presentation_engine.js +++ b/filter/source/svg/presentation_engine.js @@ -190,6 +190,11 @@ function getDefaultKeyCodeDictionary() = function() { return aSlideShow.displaySlide( theMetaDoc.nNumberOfSlides - 1, true ); }; keyCodeDict[SLIDE_MODE][SPACE_KEY] = function() { return dispatchEffects(1); }; + // The ESC key can't actually be handled on iOS, it seems to be hardcoded to work like the home button? But try anyway. + keyCodeDict[SLIDE_MODE][ESCAPE_KEY] + = function() { return aSlideShow.exitSlideShowInApp(); }; + keyCodeDict[SLIDE_MODE][Q_KEY] + = function() { return aSlideShow.exitSlideShowInApp(); }; // index mode keyCodeDict[INDEX_MODE][LEFT_KEY] @@ -1833,6 +1838,7 @@ var END_KEY = 35; // end keycode var ENTER_KEY = 13; var SPACE_KEY = 32; var ESCAPE_KEY = 27; +var Q_KEY = 81; // Visibility Values var HIDDEN = 0; @@ -15671,14 +15677,28 @@ SlideShow.prototype.rewindAllEffects = function() } }; +SlideShow.prototype.exitSlideShowInApp = function() +{ + var ua = navigator.userAgent; + if (ua.indexOf(' AppleWebKit/') !== -1 && + ua.indexOf(' Mobile/') !== -1 && + window.webkit !== undefined && + window.webkit.messageHandlers !== undefined && + window.webkit.messageHandlers.lool !== undefined) + window.webkit.messageHandlers.lool.postMessage('EXITSLIDESHOW', '*'); +} + SlideShow.prototype.displaySlide = function( nNewSlide, bSkipSlideTransition ) { var aMetaDoc = theMetaDoc; var nSlides = aMetaDoc.nNumberOfSlides; if( nNewSlide < 0 && nSlides > 0 ) nNewSlide = nSlides - 1; - else if( nNewSlide >= nSlides ) + else if( nNewSlide >= nSlides ) { nNewSlide = 0; + // In the iOS app, exit the slideshow when going past the end. + this.exitSlideShowInApp(); + } if( ( currentMode === INDEX_MODE ) && ( nNewSlide === nCurSlide ) ) { -- cgit