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
4f921ab6
Commit
4f921ab6
authored
Apr 15, 2016
by
Alexander.Trofimov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix #32234
parent
87f62a76
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
5 additions
and
4 deletions
+5
-4
cell/model/CellComment.js
cell/model/CellComment.js
+1
-0
cell/model/UndoRedo.js
cell/model/UndoRedo.js
+2
-2
cell/model/Workbook.js
cell/model/Workbook.js
+1
-1
cell/view/WorksheetView.js
cell/view/WorksheetView.js
+1
-1
No files found.
cell/model/CellComment.js
View file @
4f921ab6
...
@@ -1474,6 +1474,7 @@ CCellCommentator.prototype.Redo = function(type, data) {
...
@@ -1474,6 +1474,7 @@ CCellCommentator.prototype.Redo = function(type, data) {
//----------------------------------------------------------export----------------------------------------------------
//----------------------------------------------------------export----------------------------------------------------
window
[
'
AscCommonExcel
'
]
=
window
[
'
AscCommonExcel
'
]
||
{};
window
[
'
AscCommonExcel
'
]
=
window
[
'
AscCommonExcel
'
]
||
{};
window
[
"
AscCommonExcel
"
].
asc_CCommentCoords
=
asc_CCommentCoords
;
window
[
"
AscCommonExcel
"
].
asc_CCommentCoords
=
asc_CCommentCoords
;
window
[
"
AscCommonExcel
"
].
CompositeCommentData
=
CompositeCommentData
;
window
[
"
AscCommonExcel
"
].
CCellCommentator
=
CCellCommentator
;
window
[
"
AscCommonExcel
"
].
CCellCommentator
=
CCellCommentator
;
window
[
'
Asc
'
]
=
window
[
'
Asc
'
]
||
{};
window
[
'
Asc
'
]
=
window
[
'
Asc
'
]
||
{};
...
...
cell/model/UndoRedo.js
View file @
4f921ab6
...
@@ -460,8 +460,8 @@ var UndoRedoDataTypes = new function() {
...
@@ -460,8 +460,8 @@ var UndoRedoDataTypes = new function() {
case
this
.
StyleBorderProp
:
return
new
BorderProp
();
break
;
case
this
.
StyleBorderProp
:
return
new
BorderProp
();
break
;
case
this
.
StyleXfs
:
return
new
CellXfs
();
break
;
case
this
.
StyleXfs
:
return
new
CellXfs
();
break
;
case
this
.
StyleAlign
:
return
new
Align
();
break
;
case
this
.
StyleAlign
:
return
new
Align
();
break
;
case
this
.
CommentData
:
return
new
asc_CCommentData
();
break
;
case
this
.
CommentData
:
return
new
Asc
.
asc_CCommentData
();
break
;
case
this
.
CompositeCommentData
:
return
new
CompositeCommentData
();
break
;
case
this
.
CompositeCommentData
:
return
new
AscCommonExcel
.
CompositeCommentData
();
break
;
case
this
.
ChartSeriesData
:
return
new
asc_CChartSeria
();
break
;
case
this
.
ChartSeriesData
:
return
new
asc_CChartSeria
();
break
;
case
this
.
SheetAdd
:
return
new
UndoRedoData_SheetAdd
();
break
;
case
this
.
SheetAdd
:
return
new
UndoRedoData_SheetAdd
();
break
;
case
this
.
SheetRemove
:
return
new
UndoRedoData_SheetRemove
();
break
;
case
this
.
SheetRemove
:
return
new
UndoRedoData_SheetRemove
();
break
;
...
...
cell/model/Workbook.js
View file @
4f921ab6
...
@@ -3289,7 +3289,7 @@ Woorksheet.prototype.clone=function(sNewId, sName){
...
@@ -3289,7 +3289,7 @@ Woorksheet.prototype.clone=function(sNewId, sName){
}
}
if
(
null
!=
this
.
aComments
)
{
if
(
null
!=
this
.
aComments
)
{
for
(
i
=
0
;
i
<
this
.
aComments
.
length
;
i
++
)
{
for
(
i
=
0
;
i
<
this
.
aComments
.
length
;
i
++
)
{
var
comment
=
new
asc_CCommentData
(
this
.
aComments
[
i
]);
var
comment
=
new
Asc
.
asc_CCommentData
(
this
.
aComments
[
i
]);
comment
.
wsId
=
oNewWs
.
getId
();
comment
.
wsId
=
oNewWs
.
getId
();
comment
.
nId
=
"
sheet
"
+
comment
.
wsId
+
"
_
"
+
(
i
+
1
);
comment
.
nId
=
"
sheet
"
+
comment
.
wsId
+
"
_
"
+
(
i
+
1
);
oNewWs
.
aComments
.
push
(
comment
);
oNewWs
.
aComments
.
push
(
comment
);
...
...
cell/view/WorksheetView.js
View file @
4f921ab6
...
@@ -9743,7 +9743,7 @@
...
@@ -9743,7 +9743,7 @@
for
(
var
i
=
0
;
i
<
val
.
aComments
.
length
;
i
++
)
{
for
(
var
i
=
0
;
i
<
val
.
aComments
.
length
;
i
++
)
{
comment
=
val
.
aComments
[
i
];
comment
=
val
.
aComments
[
i
];
if
(
comment
.
nCol
==
pasteCol
&&
comment
.
nRow
==
pasteRow
)
{
if
(
comment
.
nCol
==
pasteCol
&&
comment
.
nRow
==
pasteRow
)
{
var
commentData
=
new
asc_CCommentData
(
comment
);
var
commentData
=
new
Asc
.
asc_CCommentData
(
comment
);
//change nRow, nCol
//change nRow, nCol
commentData
.
asc_putCol
(
c
+
autoC
*
plCol
);
commentData
.
asc_putCol
(
c
+
autoC
*
plCol
);
commentData
.
asc_putRow
(
r
+
autoR
*
plRow
);
commentData
.
asc_putRow
(
r
+
autoR
*
plRow
);
...
...
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