[Libreoffice-commits] online.git: Branch 'libreoffice-6-1' - 6 commits - configure.ac loleaflet/admin loleaflet/html loleaflet/l10n loleaflet/src

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Tue Jul 31 11:57:42 UTC 2018


 configure.ac                                |    2 
 loleaflet/admin/src/AdminSocketAnalytics.js |    4 -
 loleaflet/html/loading.html                 |   14 +---
 loleaflet/l10n/uno/de.json                  |    2 
 loleaflet/src/layer/tile/GridLayer.js       |   79 ++++++++++++++--------------
 loleaflet/src/layer/tile/TileLayer.js       |   17 +++++-
 6 files changed, 65 insertions(+), 53 deletions(-)

New commits:
commit 65f51c8af2a66776aaa4518697407c16741674b4
Author:     Andras Timar <andras.timar at collabora.com>
AuthorDate: Tue Jul 31 13:57:17 2018 +0200
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Tue Jul 31 13:57:17 2018 +0200

    Bump version to 6.1.0.3
    
    Change-Id: Ibe226307f1d2d79ddc7da5106416a8907a70d369

diff --git a/configure.ac b/configure.ac
index 6afe45ef8..3a56bc3b7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@
 
 AC_PREREQ([2.63])
 
-AC_INIT([libreoffice-online], [6.1.0.0.beta1], [libreoffice at lists.freedesktop.org])
+AC_INIT([libreoffice-online], [6.1.0.3], [libreoffice at lists.freedesktop.org])
 LT_INIT([shared, disable-static, dlopen])
 
 AM_INIT_AUTOMAKE([1.10 subdir-objects tar-pax -Wno-portability])
commit b5d25adea500903cdb397fff8f06eca61a1e8872
Author:     Tamás Zolnai <tamas.zolnai at collabora.com>
AuthorDate: Fri Jun 15 17:24:39 2018 +0200
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Tue Jul 31 13:43:13 2018 +0200

    Hide text cursor while performing the zoom
    
    Change-Id: Ic358b2f345ba4e1e1d826b6e2cc96b3cc53269d6
    Reviewed-on: https://gerrit.libreoffice.org/55881
    Reviewed-by: Tamás Zolnai <tamas.zolnai at collabora.com>
    Tested-by: Tamás Zolnai <tamas.zolnai at collabora.com>
    (cherry picked from commit 30e4f586ecf8001daeed018c19ad693709bceb43)
    Reviewed-on: https://gerrit.libreoffice.org/55882
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Tested-by: Jan Holesovsky <kendy at collabora.com>
    (cherry picked from commit 232f50cf9c3c4a3995304d38566956d7f3f321b5)
    Signed-off-by: Andras Timar <andras.timar at collabora.com>

diff --git a/loleaflet/src/layer/tile/TileLayer.js b/loleaflet/src/layer/tile/TileLayer.js
index 4b04d1ebf..c92ab591f 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -89,6 +89,8 @@ L.TileLayer = L.GridLayer.extend({
 		this._visibleCursor = new L.LatLngBounds(new L.LatLng(0, 0), new L.LatLng(0, 0));
 		// Cursor overlay is visible or hidden (for blinking).
 		this._isCursorOverlayVisible = false;
+		// Cursor overlay visibility flag to store last state during zooming
+		this._oldCursorOverlayVisibility = false;
 		// Cursor is visible or hidden (e.g. for graphic selection).
 		this._isCursorVisible = true;
 		// Original rectangle graphic selection in twips
@@ -255,7 +257,8 @@ L.TileLayer = L.GridLayer.extend({
 		map.on('dragover', this._onDragOver, this);
 		map.on('drop', this._onDrop, this);
 
-		map.on('zoomend', this._onUpdateCursor, this);
+		map.on('zoomstart', this._onZoomStart, this);
+		map.on('zoomend', this._onZoomEnd, this);
 		if (this._docType === 'spreadsheet') {
 			map.on('zoomend', this._onCellCursorShift, this);
 		}
@@ -1539,6 +1542,18 @@ L.TileLayer = L.GridLayer.extend({
 		return bounds.getSouthWest().equals(new L.LatLng(0, 0)) && bounds.getNorthEast().equals(new L.LatLng(0, 0));
 	},
 
+	_onZoomStart: function () {
+		this._oldCursorOverlayVisibility = this._isCursorOverlayVisible;
+		this._isCursorOverlayVisible = false;
+		this._onUpdateCursor();
+	},
+
+
+	_onZoomEnd: function () {
+		this._isCursorOverlayVisible = this._oldCursorOverlayVisibility;
+		this._onUpdateCursor();
+	},
+
 	// Update cursor layer (blinking cursor).
 	_onUpdateCursor: function (scroll) {
 		var cursorPos = this._visibleCursor.getNorthWest();
commit ea578d96a6907cf89829c169a6c9c0599522f839
Author:     Andras Timar <andras.timar at collabora.com>
AuthorDate: Fri Jun 15 11:54:13 2018 +0200
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Tue Jul 31 13:42:48 2018 +0200

    No need to load l10n framework for a page that appears for fragment of a second
    
    Change-Id: Ie9c7b05571b02f06b50a7f907de500213299e870
    Reviewed-on: https://gerrit.libreoffice.org/55849
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Tested-by: Jan Holesovsky <kendy at collabora.com>
    (cherry picked from commit 67ea3da4dbfdc9147eca128319f48b9edf51612c)
    Signed-off-by: Andras Timar <andras.timar at collabora.com>

diff --git a/loleaflet/html/loading.html b/loleaflet/html/loading.html
index 61a5edadd..a99cc7315 100644
--- a/loleaflet/html/loading.html
+++ b/loleaflet/html/loading.html
@@ -20,21 +20,13 @@
         height: 100px;
       }
     </style>
-    <link rel="localizations" href="/loleaflet/dist/l10n/localizations.json" type="application/vnd.oftn.l10n+json"/>
   </head>
   <body>
-    <script src="/loleaflet/dist/l10n/json2.min.js"></script>
-    <script src="/loleaflet/dist/l10n/l10n.min.js"></script>
     <div class="spinner">
       <canvas id="spinner" class="leaflet-progress-spinner-canvas"></canvas>
-      <h4>Loading...</h4>
     </div>
+    <script>
+      var spinnerInterval = window.parent.L.LOUtil.startSpinner(document.getElementById('spinner'), 1.5);
+    </script>
   </body>
-  <script>
-    var translatableContent = document.getElementsByTagName("h4");
-    for (var i=0, max=translatableContent.length; i < max; i++) {
-        translatableContent[i].firstChild.nodeValue = translatableContent[i].firstChild.nodeValue.toLocaleString();
-    }
-    var spinnerInterval = window.parent.L.LOUtil.startSpinner(document.getElementById('spinner'), 1.5);
-  </script>
 </html>
commit 3c2f1a6e4186cadde2c258ee9406c08891e184ff
Author:     Aron Budea <aron.budea at collabora.com>
AuthorDate: Tue Jun 12 16:41:50 2018 +0200
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Tue Jul 31 13:42:36 2018 +0200

    Admin console: correct network graph colors
    
    Change-Id: I24c700c29998a15c7b25d06ba228d191de26c26c
    Reviewed-on: https://gerrit.libreoffice.org/55701
    Reviewed-by: Aron Budea <aron.budea at collabora.com>
    Tested-by: Aron Budea <aron.budea at collabora.com>
    (cherry picked from commit 945930efdfde7e1c6975c8072e41f0de737505d7)
    Reviewed-on: https://gerrit.libreoffice.org/55703
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Tested-by: Jan Holesovsky <kendy at collabora.com>
    (cherry picked from commit 79eecf442e20692212a4a5dabac1452824246396)
    Signed-off-by: Andras Timar <andras.timar at collabora.com>

diff --git a/loleaflet/admin/src/AdminSocketAnalytics.js b/loleaflet/admin/src/AdminSocketAnalytics.js
index 8af70e029..ee6c33f94 100644
--- a/loleaflet/admin/src/AdminSocketAnalytics.js
+++ b/loleaflet/admin/src/AdminSocketAnalytics.js
@@ -216,11 +216,11 @@ var AdminSocketAnalytics = AdminSocketBase.extend({
 			var legendData = [
 				{
 					text: _('Received'),
-					color: 'red'
+					color: 'green'
 				},
 				{
 					text: _('Sent'),
-					color: 'green'
+					color: 'red'
 				}
 			];
 			var legendSpacing = 20;
commit 30aa7463ccbfd101755e6323adc287b2446f9205
Author:     Andras Timar <andras.timar at collabora.com>
AuthorDate: Fri Jun 15 11:20:32 2018 +0200
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Tue Jul 31 13:41:40 2018 +0200

    In Writer/Impress: Ansicht -> Größer should be "Vergrößern" instead
    
    Change-Id: I693ea2296a37b6d792af4c68f2c9b6db067bd0ed
    (cherry picked from commit 1b8c525095890a4998fc321e955069a63361ffbd)
    Signed-off-by: Andras Timar <andras.timar at collabora.com>

diff --git a/loleaflet/l10n/uno/de.json b/loleaflet/l10n/uno/de.json
index a50601923..4dfbc4432 100644
--- a/loleaflet/l10n/uno/de.json
+++ b/loleaflet/l10n/uno/de.json
@@ -184,7 +184,7 @@
 "Wrap Off":"Kein ~Umlauf",
 "Wrap Right":"Umlauf rechts",
 "Wrap Text":"Text umb~rechen",
-"Zoom In":"Größer",
+"Zoom In":"Vergrößern",
 "Zoom Out":"Ver~kleinern",
 "~Advanced Filter...":"S~pezialfilter...",
 "~Arrange":"Ano~rdnung",
commit 442604b769d9f2f237398132768f1e68582cb7b4
Author:     Tamás Zolnai <tamas.zolnai at collabora.com>
AuthorDate: Fri Jun 8 13:27:10 2018 +0200
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Tue Jul 31 13:41:07 2018 +0200

    Zooming in for the first time shows tiles appearing instead of interpolation
    
    Drop only those tiles which are not part of the new visible area.
    
    Change-Id: I4cf86266b4f51cd7e96b9db10da108f644ecdceb
    Reviewed-on: https://gerrit.libreoffice.org/55480
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Tested-by: Jan Holesovsky <kendy at collabora.com>
    (cherry picked from commit 0e1a70795b94e120ac3f70b48848e85bb572f00c)
    Signed-off-by: Andras Timar <andras.timar at collabora.com>

diff --git a/loleaflet/src/layer/tile/GridLayer.js b/loleaflet/src/layer/tile/GridLayer.js
index 8a37a04dd..11fbebed5 100644
--- a/loleaflet/src/layer/tile/GridLayer.js
+++ b/loleaflet/src/layer/tile/GridLayer.js
@@ -542,24 +542,7 @@ L.GridLayer = L.Layer.extend({
 			if (newView) {
 				// we know that a new set of tiles that cover the whole view has been requested
 				// so we're able to cancel the previous requests that are being processed
-				this._map._socket.sendMessage('canceltiles');
-				for (key in this._tiles) {
-					// When _invalidCount > 0 the tile has been invalidated, however the new tile content
-					// has not yet been fetched and because of `canceltiles` message it will never be
-					// so we need to remove the tile, or when the tile is back inside the visible area
-					// its content would be the old invalidated one;
-					// example: a tile is invalidated but a sudden scroll to the cell cursor position causes
-					// to move the tile out of the visible area before the new content is fetched
-					if (!this._tiles[key].loaded || this._tiles[key]._invalidCount > 0) {
-						L.DomUtil.remove(this._tiles[key].el);
-						delete this._tiles[key];
-						if (this._debug) {
-							this._debugCancelledTiles++;
-							this._debugShowTileData();
-						}
-					}
-				}
-				this._emptyTilesCount = 0;
+				this._cancelTiles();
 			}
 
 			// if its the first batch of tiles to load
@@ -620,25 +603,7 @@ L.GridLayer = L.Layer.extend({
 			if (newView) {
 				// we know that a new set of tiles that cover the whole view has been requested
 				// so we're able to cancel the previous requests that are being processed
-				this._map._socket.sendMessage('canceltiles');
-				for (key in this._tiles) {
-					tile = this._tiles[key];
-					// When _invalidCount > 0 the tile has been invalidated, however the new tile content
-					// has not yet been fetched and because of `canceltiles` message it will never be
-					// so we need to remove the tile, or when the tile is back inside the visible area
-					// its content would be the old invalidated one;
-					// example: a tile is invalidated but a sudden scroll to the cell cursor position causes
-					// to move the tile out of the visible area before the new content is fetched
-					if (!tile.loaded || tile._invalidCount > 0) {
-						L.DomUtil.remove(tile.el);
-						delete this._tiles[key];
-						if (this._debug && this._debugDataCancelledTiles) {
-							this._debugCancelledTiles++;
-							this._debugDataCancelledTiles.setPrefix('Cancelled tiles: ' + this._debugCancelledTiles);
-						}
-					}
-				}
-				this._emptyTilesCount = 0;
+				this._cancelTiles();
 			}
 
 			// if its the first batch of tiles to load
@@ -719,6 +684,46 @@ L.GridLayer = L.Layer.extend({
 		}
 	},
 
+	_cancelTiles: function() {
+		this._map._socket.sendMessage('canceltiles');
+		for (var key in this._tiles) {
+			var tile = this._tiles[key];
+			// When _invalidCount > 0 the tile has been invalidated, however the new tile content
+			// has not yet been fetched and because of `canceltiles` message it will never be
+			// so we need to remove the tile, or when the tile is back inside the visible area
+			// its content would be the old invalidated one. Drop only those tiles which are not in
+			// the new visible area.
+			// example: a tile is invalidated but a sudden scroll to the cell cursor position causes
+			// to move the tile out of the visible area before the new content is fetched
+
+			var dropTile = !tile.loaded;
+			var coords = tile.coords;
+			if (coords.part === this._selectedPart) {
+				var visibleTopLeft = this._latLngToTwips(this._map.getBounds().getNorthWest());
+				var visibleBottomRight = this._latLngToTwips(this._map.getBounds().getSouthEast());
+				var visibleArea = new L.Bounds(visibleTopLeft, visibleBottomRight);
+				var tileTopLeft = this._coordsToTwips(coords);
+				var tileBottomRight = new L.Point(this._tileWidthTwips, this._tileHeightTwips);
+				var tileBounds = new L.Bounds(tileTopLeft, tileTopLeft.add(tileBottomRight));
+				dropTile |= (tile._invalidCount > 0 && !visibleArea.intersects(tileBounds));
+			}
+			else {
+				dropTile |= tile._invalidCount > 0;
+			}
+
+
+			if (dropTile) {
+				L.DomUtil.remove(tile.el);
+				delete this._tiles[key];
+				if (this._debug && this._debugDataCancelledTiles) {
+					this._debugCancelledTiles++;
+					this._debugDataCancelledTiles.setPrefix('Cancelled tiles: ' + this._debugCancelledTiles);
+				}
+			}
+		}
+		this._emptyTilesCount = 0;
+	},
+
 	_isValidTile: function (coords) {
 		if (coords.x < 0 || coords.y < 0) {
 			return false;


More information about the Libreoffice-commits mailing list