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
2f175982
Commit
2f175982
authored
Mar 07, 2017
by
GoshaZotov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
asc_SpecialPasteData: delete arguments(preSpecialPasteData, specialPasteData)
parent
23dee39e
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
13 additions
and
9 deletions
+13
-9
cell/api.js
cell/api.js
+2
-2
cell/view/WorkbookView.js
cell/view/WorkbookView.js
+2
-2
cell/view/WorksheetView.js
cell/view/WorksheetView.js
+8
-4
common/clipboard_base.js
common/clipboard_base.js
+1
-1
No files found.
cell/api.js
View file @
2f175982
...
...
@@ -376,9 +376,9 @@ var editor;
return
AscCommon
.
g_clipboardBase
.
Special_Paste
(
props
);
};
spreadsheet_api
.
prototype
.
asc_SpecialPasteData
=
function
(
pr
eSpecialPasteData
,
specialPasteData
,
pr
ops
)
{
spreadsheet_api
.
prototype
.
asc_SpecialPasteData
=
function
(
props
)
{
if
(
!
this
.
getViewMode
())
{
this
.
wb
.
specialPasteData
(
pr
eSpecialPasteData
,
specialPasteData
,
pr
ops
);
this
.
wb
.
specialPasteData
(
props
);
}
};
...
...
cell/view/WorkbookView.js
View file @
2f175982
...
...
@@ -2078,9 +2078,9 @@
t
.
clipboard
.
pasteData
(
ws
,
_format
,
data1
,
data2
,
text_data
);
};
WorkbookView
.
prototype
.
specialPasteData
=
function
(
pr
eSpecialPasteData
,
specialPasteData
,
pr
ops
)
{
WorkbookView
.
prototype
.
specialPasteData
=
function
(
props
)
{
if
(
!
this
.
getCellEditMode
())
{
this
.
getWorksheet
().
specialPaste
(
pr
eSpecialPasteData
,
specialPasteData
,
pr
ops
);
this
.
getWorksheet
().
specialPaste
(
props
);
}
};
...
...
cell/view/WorksheetView.js
View file @
2f175982
...
...
@@ -8785,10 +8785,14 @@
}
};
WorksheetView
.
prototype
.
specialPaste
=
function
(
specialPasteUndoData
,
specialPasteData
,
props
)
{
WorksheetView
.
prototype
.
specialPaste
=
function
(
props
)
{
var
api
=
window
[
"
Asc
"
][
"
editor
"
];
var
t
=
this
;
var
clipboard_base
=
window
[
'
AscCommon
'
].
g_clipboardBase
;
var
specialPasteUndoData
=
clipboard_base
.
specialPasteUndoData
;
var
specialPasteData
=
clipboard_base
.
specialPasteData
;
if
(
!
specialPasteData
)
{
return
;
...
...
@@ -8843,7 +8847,7 @@
//откатываемся до того, что было до вставки
//курсор и специальная вставка не в шейпе + курсор в шейпе, специальная вставка на листе
if
(
specialPasteUndoData
&&
specialPasteUndoData
.
data
&&
!
window
[
'
AscCommon
'
].
g_clipboardB
ase
.
specialPasteButtonProps
.
shapeId
)
if
(
specialPasteUndoData
&&
specialPasteUndoData
.
data
&&
!
clipboard_b
ase
.
specialPasteButtonProps
.
shapeId
)
{
var
tempProps
=
new
Asc
.
SpecialPasteProps
();
tempProps
.
width
=
true
;
...
...
@@ -8852,7 +8856,7 @@
tempProps
.
transpose
=
true
;
specialPasteUndoData
.
transpose
=
null
;
}
window
[
'
AscCommon
'
].
g_clipboardB
ase
.
specialPasteProps
=
tempProps
;
clipboard_b
ase
.
specialPasteProps
=
tempProps
;
//переводим фокус из шейпа на лист
if
(
isIntoShape
)
...
...
@@ -8880,7 +8884,7 @@
}
//далее специальная вставка
window
[
'
AscCommon
'
].
g_clipboardB
ase
.
specialPasteProps
=
props
;
clipboard_b
ase
.
specialPasteProps
=
props
;
//TODO пока для закрытия транзации выставляю флаг. пересмотреть!
window
[
"
Asc
"
][
"
editor
"
].
wb
.
clipboard
.
bIsEndTransaction
=
true
;
api
.
wb
.
clipboard
.
pasteData
(
t
,
specialPasteData
.
_format
,
specialPasteData
.
data1
,
specialPasteData
.
data2
,
specialPasteData
.
text_data
,
true
);
...
...
common/clipboard_base.js
View file @
2f175982
...
...
@@ -935,7 +935,7 @@
Special_Paste
:
function
(
props
)
{
this
.
Api
.
asc_SpecialPasteData
(
this
.
specialPasteUndoData
,
this
.
specialPasteData
,
props
);
this
.
Api
.
asc_SpecialPasteData
(
props
);
return
true
;
},
...
...
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