[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2' - loleaflet/src

[Pranam Lashkari (via logerrit)]

 loleaflet/src/layer/tile/ImpressTileLayer.js |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit a28ea4a561c9b9a4f0b58b5b311de60c766d6f47
Author:     Pranam Lashkari <lpranam at collabora.com>
AuthorDate: Sat Sep 26 18:30:53 2020 +0530
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Wed Sep 30 14:20:42 2020 +0200

    leaflet: prevent updating parts in impress when vex is open
    
    Change-Id: Ia4b5688e277fe3a663ffdf3cd387aa0320ed1257
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/103428
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Andras Timar <andras.timar at collabora.com>

diff --git a/loleaflet/src/layer/tile/ImpressTileLayer.js b/loleaflet/src/layer/tile/ImpressTileLayer.js
index aa2cdcd3c..9023a0326 100644
--- a/loleaflet/src/layer/tile/ImpressTileLayer.js
+++ b/loleaflet/src/layer/tile/ImpressTileLayer.js
@@ -3,7 +3,7 @@
  * Impress tile layer is used to display a presentation document
  */
 
-/* global $ L */
+/* global $ L isAnyVexDialogActive */
 
 L.ImpressTileLayer = L.TileLayer.extend({
 	extraSize: L.point(290, 0),
@@ -250,6 +250,8 @@ L.ImpressTileLayer = L.TileLayer.extend({
 	},
 
 	onUpdateParts: function () {
+		if (isAnyVexDialogActive()) // Need this check else vex loses focus
+			return;
 		if (typeof this._prevSelectedPart === 'number') {
 			this.hideAnnotations(this._prevSelectedPart);
 			if (this.hasAnnotations(this._selectedPart)) {