Commit 4c2c5ea5 authored by Sergey.Luzyanin's avatar Sergey.Luzyanin Committed by Alexander.Trofimov

Bug 28083 - [CoEdit][Copy&Paste] Происходит вставка данных в залоченную...

Bug 28083 - [CoEdit][Copy&Paste] Происходит вставка данных в залоченную область с помощью контекстного меню

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@60326 954022d7-b5bf-4e40-9824-e11837661b57
parent 6aec71a9
...@@ -1408,21 +1408,24 @@ asc_docs_api.prototype.Cut = function(){ ...@@ -1408,21 +1408,24 @@ asc_docs_api.prototype.Cut = function(){
return Editor_Copy_Button(this, true) return Editor_Copy_Button(this, true)
} }
asc_docs_api.prototype.Paste = function(){ asc_docs_api.prototype.Paste = function(){
if (!window.GlobalPasteFlag) if (false === this.WordControl.m_oLogicDocument.Document_Is_SelectionLocked(changestype_Drawing_Props))
{ {
if (!window.USER_AGENT_SAFARI_MACOS) if (!window.GlobalPasteFlag)
{ {
window.GlobalPasteFlag = true; if (!window.USER_AGENT_SAFARI_MACOS)
return Editor_Paste_Button(this);
}
else
{
if (0 === window.GlobalPasteFlagCounter)
{ {
SafariIntervalFocus();
window.GlobalPasteFlag = true; window.GlobalPasteFlag = true;
return Editor_Paste_Button(this); return Editor_Paste_Button(this);
} }
else
{
if (0 === window.GlobalPasteFlagCounter)
{
SafariIntervalFocus();
window.GlobalPasteFlag = true;
return Editor_Paste_Button(this);
}
}
} }
} }
}; };
......
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