[Libreoffice-commits] online.git: 4 commits - loleaflet/css loleaflet/src

[Michael Meeks (via logerrit)]

 loleaflet/css/vex.css                    |   12 ++++++++++++
 loleaflet/src/control/Control.Toolbar.js |   14 ++------------
 loleaflet/src/map/Map.js                 |    2 --
 loleaflet/src/map/handler/Map.Scroll.js  |   20 ++------------------
 4 files changed, 16 insertions(+), 32 deletions(-)

New commits:
commit 1a28798850e5e3b98ca601a7cbe92a98e59dcd27
Author:     Michael Meeks <michael.meeks at collabora.com>
AuthorDate: Sat Nov 2 18:53:31 2019 +0000
Commit:     Michael Meeks <michael.meeks at collabora.com>
CommitDate: Sat Nov 2 18:53:31 2019 +0000

    Fix vex dialog close issues.
    
    Amazingly - due to a bug in vex, without an animation closing
    a dialog silently fails. cf. broken vex code determining hasAnimation
    which needs to handle empty states in missing css properties eg.
    -moz-animation-name.
    
    Change-Id: I9834b438d33c908f4f9e96274ce1c2603a22c1fa

diff --git a/loleaflet/css/vex.css b/loleaflet/css/vex.css
index 7609c9ff6..87387ff60 100644
--- a/loleaflet/css/vex.css
+++ b/loleaflet/css/vex.css
@@ -1,3 +1,9 @@
+ at keyframes vex-fadeout {
+  0% {
+    opacity: 1; }
+  100% {
+    opacity: 0; } }
+
 /* Infobar */
 .vex-theme-bottom-right-corner .vex-dialog-message {
 	font-size: 1em;
@@ -25,6 +31,7 @@
 .vex-open .loleaflet-user-idle .vex-dialog-buttons {
 	display: none!important;
 }
+
 .vex.vex-theme-plain{
 	position: relative;
 	z-index: 2001 !important;
@@ -39,6 +46,11 @@
 	padding: 0 !important
 }
 
+.vex-closing {
+    -webkit-animation: vex-fadeout .25s forwards;
+    animation: vex-fadeout .25s forwards;
+}
+
 /*mobile*/
 @media (max-width: 767px), (max-device-height: 767px) {
 	.vex-dialog-input > textarea.loleaflet-annotation-textarea {
commit 9390b07d71899058d22e6a91c6d5ae165cff2315
Author:     Michael Meeks <michael.meeks at collabora.com>
AuthorDate: Thu Oct 31 14:39:20 2019 +0000
Commit:     Michael Meeks <michael.meeks at collabora.com>
CommitDate: Fri Nov 1 15:29:20 2019 +0000

    Enable spreadsheet zoom.
    
    Change-Id: I019fab6b91b170562e2a5be0729de9f52a0af1e0

diff --git a/loleaflet/src/control/Control.Toolbar.js b/loleaflet/src/control/Control.Toolbar.js
index 7eb1d3ea4..f49b3841e 100644
--- a/loleaflet/src/control/Control.Toolbar.js
+++ b/loleaflet/src/control/Control.Toolbar.js
@@ -167,20 +167,10 @@ function onClick(e, id, item, subItem) {
 		map._socket.sendMessage('commandvalues command=.uno:DocumentRepair');
 	}
 	else if (id === 'zoomin' && map.getZoom() < map.getMaxZoom()) {
-		if (map.getDocType() === 'spreadsheet') {
-			map.setZoom(14); // 200%
-		}
-		else {
-			map.zoomIn(1);
-		}
+		map.zoomIn(1);
 	}
 	else if (id === 'zoomout' && map.getZoom() > map.getMinZoom()) {
-		if (map.getDocType() === 'spreadsheet') {
-			map.setZoom(10); // 100%
-		}
-		else {
-			map.zoomOut(1);
-		}
+		map.zoomOut(1);
 	}
 	else if (item.scale) {
 		map.setZoom(item.scale);
commit 823e2b2a929f213bb0b112c6f2394548804e9ea1
Author:     Michael Meeks <michael.meeks at collabora.com>
AuthorDate: Thu Oct 31 14:36:17 2019 +0000
Commit:     Michael Meeks <michael.meeks at collabora.com>
CommitDate: Fri Nov 1 15:29:20 2019 +0000

    Revert "Disable intermediate zoom levels on calc"
    
    This reverts commit 12fa2aafa0735779beb260206f1c00b48cbdd2c8.
    
    Change-Id: Ib558243eb0583e0f96833caa5195022ebcc81c7d

diff --git a/loleaflet/src/map/handler/Map.Scroll.js b/loleaflet/src/map/handler/Map.Scroll.js
index 9090fb042..9377f2d75 100644
--- a/loleaflet/src/map/handler/Map.Scroll.js
+++ b/loleaflet/src/map/handler/Map.Scroll.js
@@ -84,25 +84,9 @@ L.Map.Scroll = L.Handler.extend({
 		if (!delta) { return; }
 
 		if (map.options.scrollWheelZoom === 'center') {
-			if (map.getDocType() === 'spreadsheet') {
-				if (delta > 0) {
-					map.setZoom(14); // 200%
-				} else {
-					map.setZoom(10); // 100%
-				}
-			} else {
-				map.setZoom(zoom + delta);
-			}
+			map.setZoom(zoom + delta);
 		} else { // eslint-disable-next-line no-lonely-if
-			if (map.getDocType() === 'spreadsheet') {
-				if (delta > 0) {
-					map.setZoomAround(this._lastMousePos, 14); // 200%
-				} else {
-					map.setZoomAround(this._lastMousePos, 10); // 100%
-				}
-			} else {
-				map.setZoomAround(this._lastMousePos, zoom + delta);
-			}
+			map.setZoomAround(this._lastMousePos, zoom + delta);
 		}
 	}
 });
commit ce6afa85bed99e6a976647430b460b7136762e51
Author:     Michael Meeks <michael.meeks at collabora.com>
AuthorDate: Thu Oct 31 14:35:23 2019 +0000
Commit:     Michael Meeks <michael.meeks at collabora.com>
CommitDate: Fri Nov 1 15:29:20 2019 +0000

    Revert "calc: forbid keyboard zoom to anything but 100% and 200%"
    
    This reverts commit 03f5aab033b9b5e9de6eb2b990968b60c736a244.

diff --git a/loleaflet/src/map/Map.js b/loleaflet/src/map/Map.js
index 9e4163cea..cdd29af08 100644
--- a/loleaflet/src/map/Map.js
+++ b/loleaflet/src/map/Map.js
@@ -460,8 +460,6 @@ L.Map = L.Evented.extend({
 			return this;
 		}
 		if (this._docLayer && this._docLayer._docType === 'spreadsheet') {
-			if (zoom != 10 && zoom != 14) // 100% or 200%
-				return this;
 			// for spreadsheets, when the document is smaller than the viewing area
 			// we want it to be glued to the row/column headers instead of being centered
 			this._docLayer._checkSpreadSheetBounds(zoom);