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

Henry Castro hcastro at collabora.com
Sun Jun 14 16:17:56 PDT 2015


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

New commits:
commit cceb663a640a345721680a1f80de9f9065d4addb
Author: Henry Castro <hcastro at collabora.com>
Date:   Sun Jun 14 19:06:30 2015 -0400

    loleaflet: keyup != keypress different keycodes
    
    keypress and keyup are different keycodes values
    and they differ some browser, keypress is the right
    charcode and keycode values.

diff --git a/loleaflet/src/layer/tile/TileLayer.js b/loleaflet/src/layer/tile/TileLayer.js
index 253e9b0..31e3bbd 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -150,6 +150,7 @@ L.TileLayer = L.GridLayer.extend({
 		if (textMsg.startsWith('cursorvisible:')) {
 			var command = textMsg.match('cursorvisible: true');
 			this._bCursorVisible = command == undefined ? false : true;
+			this._bCursorOverlayVisible = true;
 			this._onUpdateCursor();
 		}
 		else if (textMsg.startsWith('invalidatecursor:')) {
@@ -725,10 +726,13 @@ L.TileLayer = L.GridLayer.extend({
 		if ( !this._bEdit )
 			return;
 
-		if ( e.type === 'keyup' )
-			this._postKeyboardEvent('up', e.originalEvent.charCode, this._toUNOKeyCode(e.originalEvent.keyCode));
-		else
-			this._postKeyboardEvent('input', e.originalEvent.charCode, this._toUNOKeyCode(e.originalEvent.keyCode));
+		if ( e.type === 'keypress' ) {
+			this._keyEvent = e.originalEvent;
+			this._postKeyboardEvent('input', this._keyEvent.charCode, this._toUNOKeyCode(this._keyEvent.keyCode));
+		}
+		else if ( e.type === 'keyup' ) {
+			this._postKeyboardEvent('up', this._keyEvent.charCode, this._toUNOKeyCode(this._keyEvent.keyCode));
+		}
 	},
 
 	// Is rRectangle empty?


More information about the Libreoffice-commits mailing list