Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
sdkjs
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boris Kocherov
sdkjs
Commits
b034f2fd
Commit
b034f2fd
authored
Jul 21, 2016
by
Oleg Korshul
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
cell: copy/paste by button
viewer (not editable formats) copy error
parent
3b1f768f
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
5 deletions
+8
-5
cell/api.js
cell/api.js
+8
-0
word/Drawing/documentrenderer.js
word/Drawing/documentrenderer.js
+0
-5
No files found.
cell/api.js
View file @
b034f2fd
...
@@ -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
)
...
...
word/Drawing/documentrenderer.js
View file @
b034f2fd
...
@@ -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 + ...
{
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment