[Libreoffice-commits] online.git: loleaflet/src
Andras Timar
andras.timar at collabora.com
Mon Jan 4 13:22:39 PST 2016
loleaflet/src/map/handler/Map.Keyboard.js | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
New commits:
commit 9ff69b3a6a5f10cbd19f3d01f4829e655520e46d
Author: Andras Timar <andras.timar at collabora.com>
Date: Mon Jan 4 22:22:18 2016 +0100
bccu#1395 ignore Cmd (Meta) keyboard modifier
diff --git a/loleaflet/src/map/handler/Map.Keyboard.js b/loleaflet/src/map/handler/Map.Keyboard.js
index 6ef3c23..4587641 100644
--- a/loleaflet/src/map/handler/Map.Keyboard.js
+++ b/loleaflet/src/map/handler/Map.Keyboard.js
@@ -231,7 +231,12 @@ L.Map.Keyboard = L.Handler.extend({
var shift = e.originalEvent.shiftKey ? this.keyModifier.shift : 0;
var ctrl = e.originalEvent.ctrlKey ? this.keyModifier.ctrl : 0;
var alt = e.originalEvent.altKey ? this.keyModifier.alt : 0;
- this.modifier = shift | ctrl | alt;
+ var cmd = e.originalEvent.metaKey ? this.keyModifier.ctrlMac : 0;
+ this.modifier = shift | ctrl | alt | cmd;
+
+ if (cmd) {
+ return;
+ }
if (ctrl) {
if (this._handleCtrlCommand(e)) {
More information about the Libreoffice-commits
mailing list