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

[Michael Meeks (via logerrit)]

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

New commits:
commit a7791ceb0f8bfb376b59ccdd0d50c7d5745b31fe
Author:     Michael Meeks <michael.meeks at collabora.com>
AuthorDate: Fri Dec 20 11:40:32 2019 +0000
Commit:     Michael Meeks <michael.meeks at collabora.com>
CommitDate: Fri Dec 20 13:15:34 2019 +0100

    focus: try to get focus to agree with the browser.
    
    Setting _isFocused on the wrong object - still plenty of
    unpleasant focus issues to solve however.
    
    Change-Id: I519c495cca6624f2cd6f63c38b23cf5be07db10e
    Reviewed-on: https://gerrit.libreoffice.org/85593
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>

diff --git a/loleaflet/src/layer/tile/TileLayer.js b/loleaflet/src/layer/tile/TileLayer.js
index 0a3d848b0..8d31a7647 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -1115,7 +1115,7 @@ L.TileLayer = L.GridLayer.extend({
 				.openOn(this._map);
 		}
 
-		if (!this._map._isFocused && (modifierViewId === this._viewId) && (this._map.getWinId === 0) && (this._map._permission === 'edit')) {
+		if (!this._isFocused && (modifierViewId === this._viewId) && (this._map.getWinId === 0) && (this._map._permission === 'edit')) {
 			// Regain cursor if we had been out of focus and now have input.
 			// (only if it is our own cursor and the input is actually not
 			// going into a dialog)
@@ -2090,7 +2090,7 @@ L.TileLayer = L.GridLayer.extend({
 		}
 
 		this._map._textInput.showCursor();
-		if (this._map._isFocused && !L.Browser.mobile) {
+		if (this._isFocused /* && !L.Browser.mobile */) {
 			// On mobile, this is causing some key input to get lost.
 			this._map.focus();
 		}