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

Ashod Nakashian ashod.nakashian at collabora.co.uk
Tue Jun 7 14:29:26 UTC 2016


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

New commits:
commit d7cb903d41f901e71ffc3239bf7b2725751a8c1c
Author: Ashod Nakashian <ashod.nakashian at collabora.co.uk>
Date:   Sun Jun 5 19:44:09 2016 -0400

    bccu#1826 writer: jump to top when switch editor
    
    Change-Id: I9d6f64d1e17f9dd5fb4e7d1b3ac8416be4623822
    Reviewed-on: https://gerrit.libreoffice.org/25944
    Reviewed-by: Ashod Nakashian <ashnakash at gmail.com>
    Tested-by: Ashod Nakashian <ashnakash at gmail.com>
    (cherry picked from commit d73167b734cfaf0dd25c7a1a43ad9ba1ec1740ba)

diff --git a/loleaflet/src/layer/tile/TileLayer.js b/loleaflet/src/layer/tile/TileLayer.js
index 313a431..df233d6 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -504,6 +504,7 @@ L.TileLayer = L.GridLayer.extend({
 		this._visibleCursor = new L.LatLngBounds(
 						this._twipsToLatLng(topLeftTwips, this._map.getZoom()),
 						this._twipsToLatLng(bottomRightTwips, this._map.getZoom()));
+		this._visibleCursorOnLostFocus = this._visibleCursor;
 		this._isCursorOverlayVisible = true;
 		this._onUpdateCursor();
 	},
@@ -965,6 +966,7 @@ L.TileLayer = L.GridLayer.extend({
 			}
 
 			this._graphicMarker = L.rectangle(this._graphicSelection, {fill: false});
+			this._visibleCursor = this._visibleCursorOnLostFocus = this._graphicMarker;
 			if (!this._graphicMarker) {
 				this._map.fire('error', {msg: 'Graphic marker initialization', cmd: 'marker', kind: 'failed', id: 1});
 				return;


More information about the Libreoffice-commits mailing list