Commit b7c43ecf authored by Oleg.Korshul's avatar Oleg.Korshul Committed by Alexander.Trofimov

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@55620 954022d7-b5bf-4e40-9824-e11837661b57
parent b63d0737
......@@ -2183,7 +2183,13 @@ function CEditorPage(api)
oWordControl.EndUpdateOverlay();
if (false == oWordControl.TextboxUsedForSpecials)
if (false === oWordControl.bIsUseKeyPress || (true === global_keyboardEvent.AltKey && !AscBrowser.isMacOs))
{
e.preventDefault();
}
/*
if (false === oWordControl.TextboxUsedForSpecials)
{
if (false === oWordControl.bIsUseKeyPress || true === global_keyboardEvent.AltKey)
{
......@@ -2198,6 +2204,7 @@ function CEditorPage(api)
e.preventDefault();
}
}
*/
}
this.onKeyDownNoActiveControl = function(e)
......
......@@ -9615,7 +9615,7 @@ CDocument.prototype =
//Ctrl и Atl только для команд, word не водит текста с зажатыми Ctrl или Atl
//команды полностью обрабатываются в keypress
if(e.CtrlKey || e.AltKey)
if ((e.CtrlKey || e.AltKey) && !AscBrowser.isMacOs)
return false;
var Code;
......
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