loleaflet/src/map/Map.js |    9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

New commits:
commit 4b5c4a8f292cc2e6aee7bffd8848575daf2b3497
Author: Marco Cecchetti <[email protected]>
Date:   Wed Nov 30 16:40:01 2016 +0100

    tdf#106594 loleaflet - calc: bad handling of text cursor on lost/got focus
    
    This patch fixes the following bug:
    
    Create blank sheet:
    enter "." ie. just a period into A1
    enter a "." into A2
    now switch virtual desktop away and back again.
    hit enter in A2
    now switch virtual desktop away and back again.
    
    You should have a blinking edit cursor in A2 - but the focus in A3.
    
    Change-Id: Icda0123f35ecda04559fec859b6bbe6ff3ac33e8
    Reviewed-on: https://gerrit.libreoffice.org/35349
    Reviewed-by: Thorsten Behrens <[email protected]>
    Tested-by: Thorsten Behrens <[email protected]>

diff --git a/loleaflet/src/map/Map.js b/loleaflet/src/map/Map.js
index 7ef14af7..7e103244 100644
--- a/loleaflet/src/map/Map.js
+++ b/loleaflet/src/map/Map.js
@@ -824,9 +824,12 @@ L.Map = L.Evented.extend({
                if (!this._loaded) { return; }
 
                var doclayer = this._docLayer;
-               if (doclayer && doclayer._isCursorVisible && 
doclayer._isCursorOverlayVisible) {
-                       doclayer._visibleCursorOnLostFocus = 
doclayer._visibleCursor;
-                       doclayer._isCursorOverlayVisibleOnLostFocus = 
doclayer._isCursorVisibleOnLostFocus = true;
+               if (!doclayer) {
+                       return;
+               }
+               doclayer._isCursorVisibleOnLostFocus = 
doclayer._isCursorOverlayVisible;
+               doclayer._isCursorOverlayVisibleOnLostFocus = 
doclayer._isCursorOverlayVisible;
+               if (doclayer._isCursorVisible && 
doclayer._isCursorOverlayVisible) {
                        doclayer._isCursorOverlayVisible = false;
                        doclayer._onUpdateCursor();
                }
_______________________________________________
Libreoffice-commits mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Reply via email to