Commit b034f2fd authored by Oleg Korshul's avatar Oleg Korshul

cell: copy/paste by button

viewer (not editable formats) copy error
parent 3b1f768f
...@@ -472,6 +472,7 @@ var editor; ...@@ -472,6 +472,7 @@ var editor;
return; return;
} }
return AscCommon.g_clipboardBase.Button_Copy();
}; };
spreadsheet_api.prototype.asc_Paste = function() { spreadsheet_api.prototype.asc_Paste = function() {
...@@ -493,6 +494,12 @@ var editor; ...@@ -493,6 +494,12 @@ var editor;
return; return;
} }
else if (true/*can paste?*/) {
if (AscCommon.g_clipboardBase.IsWorking())
return false;
return AscCommon.g_clipboardBase.Button_Paste();
}
}; };
spreadsheet_api.prototype.asc_Cut = function() { spreadsheet_api.prototype.asc_Cut = function() {
...@@ -514,6 +521,7 @@ var editor; ...@@ -514,6 +521,7 @@ var editor;
return; return;
} }
return AscCommon.g_clipboardBase.Button_Cut();
}; };
spreadsheet_api.prototype.asc_PasteData = function(_format, data1, data2) spreadsheet_api.prototype.asc_PasteData = function(_format, data1, data2)
......
...@@ -3191,11 +3191,6 @@ CDocMeta.prototype = ...@@ -3191,11 +3191,6 @@ CDocMeta.prototype =
{ {
this.selectAll(); this.selectAll();
} }
}
else if ( e.KeyCode == 67 && true === e.CtrlKey ) // Ctrl + C + ...
{
AscCommon.Editor_Copy(editor);
//íå âîçâðàùàåì true ÷òîáû íå áûëî preventDefault
} }
else if ( e.KeyCode == 80 && true === e.CtrlKey ) // Ctrl + P + ... else if ( e.KeyCode == 80 && true === e.CtrlKey ) // Ctrl + P + ...
{ {
......
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