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

[Pranav Kant]

 loleaflet/src/control/Control.ContextMenu.js |    2 ++
 loleaflet/src/layer/tile/TileLayer.js        |    1 -
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 83e625e6e64d04c7610f6872929324a0d92a77c7
Author: Pranav Kant <pranavk at collabora.com>
Date:   Wed May 25 14:23:44 2016 +0530

    bccu#1811: Give the stolen focus back to map
    
    Fallback from d104e82d742047104a79b984bf5b5391b9c76f26
    
    Change-Id: I5885bd11cee9499a26165e6989bb652683c4645d

diff --git a/loleaflet/src/control/Control.ContextMenu.js b/loleaflet/src/control/Control.ContextMenu.js
index 1947fb1..4ae611a 100644
--- a/loleaflet/src/control/Control.ContextMenu.js
+++ b/loleaflet/src/control/Control.ContextMenu.js
@@ -66,6 +66,8 @@ L.Control.ContextMenu = L.Control.extend({
 				return {
 					callback: function(key) {
 						map.sendUnoCommand(key);
+						// Give the stolen focus back to map
+						map.focus();
 					},
 					items: contextMenu
 				};
diff --git a/loleaflet/src/layer/tile/TileLayer.js b/loleaflet/src/layer/tile/TileLayer.js
index 01800ab..8cbe56c 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -506,7 +506,6 @@ L.TileLayer = L.GridLayer.extend({
 						this._twipsToLatLng(bottomRightTwips, this._map.getZoom()));
 		this._isCursorOverlayVisible = true;
 		this._onUpdateCursor();
-		this._map.focus();
 	},
 
 	_onPartPageRectanglesMsg: function (textMsg) {