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
39d98e27
Commit
39d98e27
authored
Feb 20, 2017
by
GoshaZotov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
changes for showing special paste button
parent
02b157db
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
2 deletions
+5
-2
cell/model/clipboard.js
cell/model/clipboard.js
+1
-0
cell/view/WorksheetView.js
cell/view/WorksheetView.js
+4
-2
No files found.
cell/model/clipboard.js
View file @
39d98e27
...
@@ -1404,6 +1404,7 @@
...
@@ -1404,6 +1404,7 @@
var
allowedSpecialPasteProps
=
[
sProps
.
sourceformatting
,
sProps
.
destinationFormatting
];
var
allowedSpecialPasteProps
=
[
sProps
.
sourceformatting
,
sProps
.
destinationFormatting
];
worksheet
.
showSpecialPasteOptions
(
allowedSpecialPasteProps
,
null
,
position
);
worksheet
.
showSpecialPasteOptions
(
allowedSpecialPasteProps
,
null
,
position
);
window
[
'
AscCommon
'
].
g_clipboardBase
.
specialPasteButtonProps
=
{};
window
[
'
AscCommon
'
].
g_clipboardBase
.
specialPasteButtonProps
.
range
=
cursorPos
;
window
[
'
AscCommon
'
].
g_clipboardBase
.
specialPasteButtonProps
.
range
=
cursorPos
;
window
[
'
AscCommon
'
].
g_clipboardBase
.
specialPasteButtonProps
.
shapeId
=
isIntoShape
.
Id
;
window
[
'
AscCommon
'
].
g_clipboardBase
.
specialPasteButtonProps
.
shapeId
=
isIntoShape
.
Id
;
}
}
...
...
cell/view/WorksheetView.js
View file @
39d98e27
...
@@ -9819,11 +9819,13 @@
...
@@ -9819,11 +9819,13 @@
{
{
var
_clipboard
=
window
[
"
Asc
"
][
"
editor
"
].
wb
.
clipboard
;
var
_clipboard
=
window
[
"
Asc
"
][
"
editor
"
].
wb
.
clipboard
;
var
specialPasteShowOptions
=
new
Asc
.
SpecialPasteShowOptions
();
var
specialPasteShowOptions
=
new
Asc
.
SpecialPasteShowOptions
();
window
[
'
AscCommon
'
].
g_clipboardBase
.
specialPasteButtonProps
.
range
=
range
;
var
cellCoord
;
var
cellCoord
;
if
(
!
positionShapeContent
)
if
(
!
positionShapeContent
)
{
{
window
[
'
AscCommon
'
].
g_clipboardBase
.
specialPasteButtonProps
=
{};
window
[
'
AscCommon
'
].
g_clipboardBase
.
specialPasteButtonProps
.
range
=
range
;
var
isVisible
=
null
!==
this
.
getCellVisibleRange
(
range
.
c2
,
range
.
r2
);
var
isVisible
=
null
!==
this
.
getCellVisibleRange
(
range
.
c2
,
range
.
r2
);
cellCoord
=
this
.
getCellCoord
(
range
.
c2
,
range
.
r2
);
cellCoord
=
this
.
getCellCoord
(
range
.
c2
,
range
.
r2
);
if
(
!
isVisible
)
if
(
!
isVisible
)
...
@@ -9890,7 +9892,7 @@
...
@@ -9890,7 +9892,7 @@
var
isVisible
=
null
!==
this
.
getCellVisibleRange
(
range
.
c2
,
range
.
r2
);
var
isVisible
=
null
!==
this
.
getCellVisibleRange
(
range
.
c2
,
range
.
r2
);
var
cellCoord
=
this
.
getCellCoord
(
range
.
c2
,
range
.
r2
);
var
cellCoord
=
this
.
getCellCoord
(
range
.
c2
,
range
.
r2
);
if
(
!
isVisible
)
if
(
!
isVisible
||
window
[
'
AscCommon
'
].
g_clipboardBase
.
specialPasteButtonProps
.
shapeId
)
{
{
cellCoord
.
_x
=
-
1
;
cellCoord
.
_x
=
-
1
;
cellCoord
.
_y
=
-
1
;
cellCoord
.
_y
=
-
1
;
...
...
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