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

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Fri Aug 17 05:30:42 UTC 2018


 loleaflet/src/layer/tile/TileLayer.js |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c7908cb45636ddad5dfe12f37da7f4d433a4b619
Author:     Henry Castro <hcastro at collabora.com>
AuthorDate: Thu Aug 16 16:17:37 2018 -0400
Commit:     Jan Holesovsky <kendy at collabora.com>
CommitDate: Fri Aug 17 07:30:23 2018 +0200

    loleaflet: auto fit width limit 100%
    
    Change-Id: I6dfa345e9faa85a794d2a7f276f134f57511fe63
    Reviewed-on: https://gerrit.libreoffice.org/59239
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Tested-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/loleaflet/src/layer/tile/TileLayer.js b/loleaflet/src/layer/tile/TileLayer.js
index 09f3dc93d..a5fa6d400 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -2060,7 +2060,7 @@ L.TileLayer = L.GridLayer.extend({
 		var widthTwips = newSize.x * this._map.options.tileWidthTwips / this._tileSize;
 		var ratio = widthTwips / this._docWidthTwips;
 
-		maxZoom = maxZoom ? maxZoom : this.options.maxZoom;
+		maxZoom = maxZoom ? maxZoom : this._map.options.zoom;
 		// 'fit width zoom' has no use in spreadsheets, ignore it there
 		if (this._docType !== 'spreadsheet') {
 			var crsScale = this._map.options.crs.scale(1);


More information about the Libreoffice-commits mailing list