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

test copy

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@64412 954022d7-b5bf-4e40-9824-e11837661b57
parent cf6dc44e
...@@ -30,6 +30,7 @@ window.USER_AGENT_WEBKIT = AscBrowser.isWebkit; ...@@ -30,6 +30,7 @@ window.USER_AGENT_WEBKIT = AscBrowser.isWebkit;
window.GlobalPasteFlagCounter = 0; window.GlobalPasteFlagCounter = 0;
window.GlobalPasteFlag = false; window.GlobalPasteFlag = false;
window.GlobalCopyFlag = false;
window.PasteEndTimerId = -1; window.PasteEndTimerId = -1;
...@@ -311,8 +312,10 @@ function Editor_Copy(api, bCut) ...@@ -311,8 +312,10 @@ function Editor_Copy(api, bCut)
if (window.USER_AGENT_SAFARI_MACOS) if (window.USER_AGENT_SAFARI_MACOS)
time_interval = 200; time_interval = 200;
window.GlobalCopyFlag = true;
window.setTimeout( function() window.setTimeout( function()
{ {
window.GlobalCopyFlag = false;
//�������� ����������� ��������� //�������� ����������� ���������
ElemToSelect.style.display = ELEMENT_DISPAY_STYLE; ElemToSelect.style.display = ELEMENT_DISPAY_STYLE;
document.body.style.MozUserSelect = "none"; document.body.style.MozUserSelect = "none";
......
...@@ -3702,7 +3702,10 @@ function CEditorPage(api) ...@@ -3702,7 +3702,10 @@ function CEditorPage(api)
return; return;
if (oWordControl.IsFocus && oWordControl.TextBoxInputMode && oWordControl.TextBoxInput && !window.USER_AGENT_SAFARI_MACOS) if (oWordControl.IsFocus && oWordControl.TextBoxInputMode && oWordControl.TextBoxInput && !window.USER_AGENT_SAFARI_MACOS)
oWordControl.TextBoxInput.focus(); {
if (!oWordControl.m_oApi.asc_IsLongAction() && !window.GlobalCopyFlag)
oWordControl.TextBoxInput.focus();
}
oWordControl.m_nTimeDrawingLast = new Date().getTime(); oWordControl.m_nTimeDrawingLast = new Date().getTime();
if (oWordControl.m_bIsScroll) if (oWordControl.m_bIsScroll)
......
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