Commit 5ca5939c authored by Ilya.Kirillov's avatar Ilya.Kirillov Committed by Alexander.Trofimov

Исправлен баг с использованием мыши, при нажатой кнопке "command", на MacOS.

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@48176 954022d7-b5bf-4e40-9824-e11837661b57
parent 60144f59
...@@ -150,7 +150,7 @@ function check_MouseMoveEvent(e) ...@@ -150,7 +150,7 @@ function check_MouseMoveEvent(e)
} }
global_mouseEvent.AltKey = e.altKey; global_mouseEvent.AltKey = e.altKey;
global_mouseEvent.ShiftKey = e.shiftKey; global_mouseEvent.ShiftKey = e.shiftKey;
global_mouseEvent.CtrlKey = e.ctrlKey; global_mouseEvent.CtrlKey = e.ctrlKey || e.metaKey;
global_mouseEvent.Type = g_mouse_event_type_move; global_mouseEvent.Type = g_mouse_event_type_move;
...@@ -196,7 +196,7 @@ function check_MouseUpEvent(e) ...@@ -196,7 +196,7 @@ function check_MouseUpEvent(e)
global_mouseEvent.AltKey = e.altKey; global_mouseEvent.AltKey = e.altKey;
global_mouseEvent.ShiftKey = e.shiftKey; global_mouseEvent.ShiftKey = e.shiftKey;
global_mouseEvent.CtrlKey = e.ctrlKey; global_mouseEvent.CtrlKey = e.ctrlKey || e.metaKey;
global_mouseEvent.Type = g_mouse_event_type_up; global_mouseEvent.Type = g_mouse_event_type_up;
global_mouseEvent.Button = e.button; global_mouseEvent.Button = e.button;
...@@ -242,7 +242,7 @@ function check_MouseDownEvent(e, isClicks) ...@@ -242,7 +242,7 @@ function check_MouseDownEvent(e, isClicks)
global_mouseEvent.AltKey = e.altKey; global_mouseEvent.AltKey = e.altKey;
global_mouseEvent.ShiftKey = e.shiftKey; global_mouseEvent.ShiftKey = e.shiftKey;
global_mouseEvent.CtrlKey = e.ctrlKey; global_mouseEvent.CtrlKey = e.ctrlKey || e.metaKey;
global_mouseEvent.Type = g_mouse_event_type_down; global_mouseEvent.Type = g_mouse_event_type_down;
global_mouseEvent.Button = e.button; global_mouseEvent.Button = e.button;
...@@ -302,7 +302,7 @@ function global_OnMouseWheel(e) ...@@ -302,7 +302,7 @@ function global_OnMouseWheel(e)
{ {
global_mouseEvent.AltKey = e.altKey; global_mouseEvent.AltKey = e.altKey;
global_mouseEvent.ShiftKey = e.shiftKey; global_mouseEvent.ShiftKey = e.shiftKey;
global_mouseEvent.CtrlKey = e.ctrlKey; global_mouseEvent.CtrlKey = e.ctrlKey || e.metaKey;
if (undefined != e.wheelDelta) if (undefined != e.wheelDelta)
global_mouseEvent.WheelDelta = (e.wheelDelta > 0) ? -45 : 45; global_mouseEvent.WheelDelta = (e.wheelDelta > 0) ? -45 : 45;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment