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

картинки в истории версий. Убран превент клавиатуре при нажатом Alt

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@64448 954022d7-b5bf-4e40-9824-e11837661b57
parent a5ec498e
......@@ -2595,6 +2595,11 @@ CBlipFill.prototype =
Read_FromBinary: function(r)
{
this.RasterImageId = readString(r);
var _correct_id = g_fGetImageFromChanges(this.RasterImageId);
if (null != _correct_id)
this.RasterImageId = _correct_id;
var srcUrl = readString(r);
if(srcUrl) {
g_oDocumentUrls.addImageUrl(this.RasterImageId, srcUrl);
......
......@@ -1885,8 +1885,9 @@ function CEditorPage(api)
oWordControl.IsKeyDownButNoPress = true;
oWordControl.bIsUseKeyPress = (oWordControl.m_oLogicDocument.OnKeyDown(global_keyboardEvent) === true) ? false : true;
if (false === oWordControl.bIsUseKeyPress || true === global_keyboardEvent.AltKey)
if (false === oWordControl.bIsUseKeyPress)// || true === global_keyboardEvent.AltKey)
{
// убираем превент с альтом. Уж больно итальянцы недовольны.
e.preventDefault();
}
......
......@@ -2385,8 +2385,9 @@ function CEditorPage(api)
oWordControl.EndUpdateOverlay();
if (false === oWordControl.bIsUseKeyPress || (true === global_keyboardEvent.AltKey && !AscBrowser.isMacOs))
if (false === oWordControl.bIsUseKeyPress)// || (true === global_keyboardEvent.AltKey && !AscBrowser.isMacOs))
{
// убираем превент с альтом. Уж больно итальянцы недовольны.
e.preventDefault();
}
......
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