Commit fc4de78f 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@64421 954022d7-b5bf-4e40-9824-e11837661b57
parent e283be1b
...@@ -205,6 +205,7 @@ function Editor_Copy(api, bCut) ...@@ -205,6 +205,7 @@ function Editor_Copy(api, bCut)
//document.body.style["color"] = "transparent"; //document.body.style["color"] = "transparent";
ElemToSelect.style.MozUserSelect = "all"; ElemToSelect.style.MozUserSelect = "all";
ElemToSelect.focus();
if (null != api.WordControl.m_oLogicDocument) if (null != api.WordControl.m_oLogicDocument)
{ {
......
...@@ -1990,6 +1990,9 @@ function CEditorPage(api) ...@@ -1990,6 +1990,9 @@ function CEditorPage(api)
this.onKeyPress = function(e) this.onKeyPress = function(e)
{ {
if (window.GlobalPasteFlag || window.GlobalCopyFlag)
return;
if (oThis.Thumbnails.FocusObjType == FOCUS_OBJECT_THUMBNAILS) if (oThis.Thumbnails.FocusObjType == FOCUS_OBJECT_THUMBNAILS)
{ {
return; return;
...@@ -3001,6 +3004,13 @@ function CEditorPage(api) ...@@ -3001,6 +3004,13 @@ function CEditorPage(api)
{ {
var oWordControl = oThis; var oWordControl = oThis;
oWordControl.m_nTimeDrawingLast = new Date().getTime(); oWordControl.m_nTimeDrawingLast = new Date().getTime();
if (oWordControl.IsFocus && oWordControl.TextBoxInputMode && oWordControl.TextBoxInput && !window.USER_AGENT_SAFARI_MACOS)
{
if (!oWordControl.m_oApi.asc_IsLongAction() && !window.GlobalCopyFlag)
oWordControl.TextBoxInput.focus();
}
if (oWordControl.m_bIsScroll) if (oWordControl.m_bIsScroll)
{ {
oWordControl.m_bIsScroll = false; oWordControl.m_bIsScroll = false;
......
...@@ -2536,11 +2536,12 @@ function CEditorPage(api) ...@@ -2536,11 +2536,12 @@ function CEditorPage(api)
global_keyboardEvent.ShiftKey = false; global_keyboardEvent.ShiftKey = false;
} }
this.onKeyPress = function(e) this.onKeyPress = function(e)
{ {
if (window.GlobalPasteFlag || window.GlobalCopyFlag)
return;
if (oThis.m_oApi.asc_IsLongAction()) if (oThis.m_oApi.asc_IsLongAction())
{ {
if (window.GlobalPasteFlag)
return;
e.preventDefault(); e.preventDefault();
return; return;
} }
......
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