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
8ddb8401
Commit
8ddb8401
authored
Jul 25, 2016
by
Alexander.Trofimov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix bug 32850
parent
33332d26
Changes
4
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
73 additions
and
83 deletions
+73
-83
cell/model/CellComment.js
cell/model/CellComment.js
+57
-73
cell/model/Serialize.js
cell/model/Serialize.js
+8
-2
cell/model/Workbook.js
cell/model/Workbook.js
+1
-0
cell/view/WorkbookView.js
cell/view/WorkbookView.js
+7
-8
No files found.
cell/model/CellComment.js
View file @
8ddb8401
This diff is collapsed.
Click to expand it.
cell/model/Serialize.js
View file @
8ddb8401
...
...
@@ -2460,8 +2460,14 @@
if
(
oThis
.
isCopyPaste
)
window
[
"
Asc
"
][
"
editor
"
].
wb
.
_initCommentsToSave
();
if
(
ws
.
aComments
.
length
>
0
&&
ws
.
aCommentsCoords
.
length
>
0
)
this
.
bs
.
WriteItem
(
c_oSerWorksheetsTypes
.
Comments
,
function
(){
oThis
.
WriteComments
(
ws
.
aComments
,
ws
.
aCommentsCoords
);});
var
aComments
=
(
0
===
index
)
?
this
.
wb
.
aComments
.
concat
(
ws
.
aComments
)
:
ws
.
aComments
;
var
aCommentsCoords
=
(
0
===
index
)
?
this
.
wb
.
aCommentsCoords
.
concat
(
ws
.
aCommentsCoords
)
:
ws
.
aCommentsCoords
;
if
(
aComments
.
length
>
0
&&
aCommentsCoords
.
length
>
0
)
{
this
.
bs
.
WriteItem
(
c_oSerWorksheetsTypes
.
Comments
,
function
()
{
oThis
.
WriteComments
(
aComments
,
aCommentsCoords
);
});
}
var
oBinaryTableWriter
;
if
(
null
!=
ws
.
AutoFilter
&&
!
this
.
isCopyPaste
)
...
...
cell/model/Workbook.js
View file @
8ddb8401
...
...
@@ -1983,6 +1983,7 @@ function Workbook(eventsHandlers, oApi){
this
.
oStyleManager
=
new
AscCommonExcel
.
StyleManager
();
this
.
calcChain
=
[];
this
.
aComments
=
[];
// Комментарии к документу
this
.
aCommentsCoords
=
[];
this
.
aWorksheets
=
[];
this
.
aWorksheetsById
=
{};
this
.
cwf
=
{};
...
...
cell/view/WorkbookView.js
View file @
8ddb8401
...
...
@@ -2397,21 +2397,20 @@
};
WorkbookView
.
prototype
.
_initCommentsToSave
=
function
()
{
var
isFirst
=
true
;
var
isFirst
=
true
,
wsView
,
wsModel
,
tmpWs
;
for
(
var
wsKey
in
this
.
wsViews
)
{
var
wsView
=
this
.
wsViews
[
wsKey
];
var
wsModel
=
wsView
.
model
;
wsView
.
cellCommentator
.
prepareCommentsToSave
();
wsModel
.
aCommentsCoords
=
wsView
.
cellCommentator
.
aCommentCoords
;
wsView
=
this
.
wsViews
[
wsKey
];
wsModel
=
wsView
.
model
;
wsModel
.
aCommentsCoords
=
wsView
.
cellCommentator
.
getCoordsToSave
();
if
(
isFirst
)
{
isFirst
=
false
;
tmpWs
=
this
.
cellCommentator
.
worksheet
;
this
.
cellCommentator
.
worksheet
=
wsView
;
this
.
cellCommentator
.
overlayCtx
=
wsView
.
overlayCtx
;
this
.
cellCommentator
.
drawingCtx
=
wsView
.
drawingCtx
;
this
.
cellCommentator
.
prepareCommentsToSave
();
wsModel
.
aComments
=
wsModel
.
aComments
.
concat
(
this
.
model
.
aComments
);
wsModel
.
aCommentsCoords
=
wsModel
.
aCommentsCoords
.
concat
(
this
.
cellCommentator
.
aCommentCoords
);
this
.
model
.
aCommentsCoords
=
this
.
cellCommentator
.
getCoordsToSave
();
this
.
cellCommentator
.
worksheet
=
tmpWs
;
}
}
};
...
...
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