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

[Jan Holesovsky]

 loleaflet/src/layer/tile/TileLayer.js |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 0e33e3cf5ce7bc517ccc3402ec77027717217a02
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Tue Mar 15 14:00:53 2016 +0100

    loleaflet bccu#1524: Ignore fit-width-zoom in spereadsheet.
    
    It has no use there, nobody wants to see a huge spreadsheet zoomed out to fit
    the screen.

diff --git a/loleaflet/src/layer/tile/TileLayer.js b/loleaflet/src/layer/tile/TileLayer.js
index 09f4bea..202fb0d 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -1173,8 +1173,9 @@ L.TileLayer = L.GridLayer.extend({
 		var size = e ? e.newSize : this._map.getSize();
 		var widthTwips = size.x * this._map.options.tileWidthTwips / this._tileSize;
 		maxZoom = maxZoom ? maxZoom : this._map.options.zoom;
-		if (this._docType !== 'spreadsheet' || !e) {
-			// If it's not a spreadsheet or the method has been invoked manually
+
+		// 'fit width zoom' has no use in spreadsheets, ignore it there
+		if (this._docType !== 'spreadsheet') {
 			var crsScale = this._map.options.crs.scale(1);
 			if (this._docWidthTwips > 0)
 			{