Commit 3d107845 authored by Oleg.Korshul's avatar Oleg.Korshul

важный баг с работой в режиме иероглифов. нажатие Enter

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@65409 954022d7-b5bf-4e40-9824-e11837661b57
parent f68527b9
...@@ -1997,11 +1997,14 @@ function CEditorPage(api) ...@@ -1997,11 +1997,14 @@ function CEditorPage(api)
oWordControl.StartUpdateOverlay(); oWordControl.StartUpdateOverlay();
oWordControl.bIsUseKeyPress = (oWordControl.m_oLogicDocument.OnKeyDown(global_keyboardEvent) === true) ? false : true; var _ret_mouseDown = oWordControl.m_oLogicDocument.OnKeyDown(global_keyboardEvent);
oWordControl.bIsUseKeyPress = ((_ret_mouseDown & keydownresult_PreventKeyPress) != 0) ? false : true;
oWordControl.EndUpdateOverlay(); oWordControl.EndUpdateOverlay();
if (false === oWordControl.bIsUseKeyPress || true === global_keyboardEvent.AltKey)
if ((_ret_mouseDown & keydownresult_PreventDefault) != 0)
{ {
// убираем превент с альтом. Уж больно итальянцы недовольны.
e.preventDefault(); e.preventDefault();
return false; return false;
} }
......
...@@ -2511,9 +2511,10 @@ function CEditorPage(api) ...@@ -2511,9 +2511,10 @@ function CEditorPage(api)
} }
oWordControl.StartUpdateOverlay(); oWordControl.StartUpdateOverlay();
oWordControl.bIsUseKeyPress = (oWordControl.m_oLogicDocument.OnKeyDown(global_keyboardEvent) === true) ? false : true; var _ret_mouseDown = oWordControl.m_oLogicDocument.OnKeyDown(global_keyboardEvent);
oWordControl.bIsUseKeyPress = ((_ret_mouseDown & keydownresult_PreventKeyPress) != 0) ? false : true;
oWordControl.EndUpdateOverlay(); oWordControl.EndUpdateOverlay();
if (false === oWordControl.bIsUseKeyPress || true === global_keyboardEvent.AltKey) if ((_ret_mouseDown & keydownresult_PreventDefault) != 0)
{ {
e.preventDefault(); e.preventDefault();
return false; return false;
......
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