Commit 37289cb5 authored by Alexander.Trofimov's avatar Alexander.Trofimov Committed by Alexander.Trofimov

delete asc_ from comments functions

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@66123 954022d7-b5bf-4e40-9824-e11837661b57
parent 7c15b58a
...@@ -17,10 +17,10 @@ ...@@ -17,10 +17,10 @@
asc['spreadsheet_api'].prototype.asc_addComment = function(oComment) { asc['spreadsheet_api'].prototype.asc_addComment = function(oComment) {
if (oComment.bDocument) { if (oComment.bDocument) {
this.wb.cellCommentator.asc_addComment(oComment); this.wb.cellCommentator.addComment(oComment);
} else { } else {
var ws = this.wb.getWorksheet(); var ws = this.wb.getWorksheet();
ws.cellCommentator.asc_addComment(oComment); ws.cellCommentator.addComment(oComment);
} }
}; };
......
...@@ -2661,51 +2661,51 @@ var ASC_DOCS_API_USE_EMBEDDED_FONTS = "@@ASC_DOCS_API_USE_EMBEDDED_FONTS"; ...@@ -2661,51 +2661,51 @@ var ASC_DOCS_API_USE_EMBEDDED_FONTS = "@@ASC_DOCS_API_USE_EMBEDDED_FONTS";
spreadsheet_api.prototype.asc_changeComment = function(id, oComment) { spreadsheet_api.prototype.asc_changeComment = function(id, oComment) {
if (oComment.bDocument) { if (oComment.bDocument) {
this.wb.cellCommentator.asc_changeComment(id, oComment); this.wb.cellCommentator.changeComment(id, oComment);
} else { } else {
var ws = this.wb.getWorksheet(); var ws = this.wb.getWorksheet();
ws.cellCommentator.asc_changeComment(id, oComment); ws.cellCommentator.changeComment(id, oComment);
} }
}; };
spreadsheet_api.prototype.asc_selectComment = function(id) { spreadsheet_api.prototype.asc_selectComment = function(id) {
var ws = this.wb.getWorksheet(); var ws = this.wb.getWorksheet();
ws.cellCommentator.asc_selectComment(id, /*bMove*/true); ws.cellCommentator.selectComment(id, /*bMove*/true);
}; };
spreadsheet_api.prototype.asc_showComment = function(id, bNew) { spreadsheet_api.prototype.asc_showComment = function(id, bNew) {
var ws = this.wb.getWorksheet(); var ws = this.wb.getWorksheet();
ws.cellCommentator.asc_showComment(id, bNew); ws.cellCommentator.showComment(id, bNew);
}; };
spreadsheet_api.prototype.asc_findComment = function(id) { spreadsheet_api.prototype.asc_findComment = function(id) {
var ws = this.wb.getWorksheet(); var ws = this.wb.getWorksheet();
return ws.cellCommentator.asc_findComment(id); return ws.cellCommentator.findComment(id);
}; };
spreadsheet_api.prototype.asc_removeComment = function(id) { spreadsheet_api.prototype.asc_removeComment = function(id) {
var ws = this.wb.getWorksheet(); var ws = this.wb.getWorksheet();
ws.cellCommentator.asc_removeComment(id); ws.cellCommentator.removeComment(id);
this.wb.cellCommentator.asc_removeComment(id); this.wb.cellCommentator.removeComment(id);
}; };
spreadsheet_api.prototype.asc_getComments = function(col, row) { spreadsheet_api.prototype.asc_getComments = function(col, row) {
var ws = this.wb.getWorksheet(); var ws = this.wb.getWorksheet();
return ws.cellCommentator.asc_getComments(col, row); return ws.cellCommentator.getComments(col, row);
}; };
spreadsheet_api.prototype.asc_getDocumentComments = function() { spreadsheet_api.prototype.asc_getDocumentComments = function() {
return this.wb.cellCommentator.asc_getDocumentComments(); return this.wb.cellCommentator.getDocumentComments();
}; };
spreadsheet_api.prototype.asc_showComments = function() { spreadsheet_api.prototype.asc_showComments = function() {
var ws = this.wb.getWorksheet(); var ws = this.wb.getWorksheet();
return ws.cellCommentator.asc_showComments(); return ws.cellCommentator.showComments();
}; };
spreadsheet_api.prototype.asc_hideComments = function() { spreadsheet_api.prototype.asc_hideComments = function() {
var ws = this.wb.getWorksheet(); var ws = this.wb.getWorksheet();
return ws.cellCommentator.asc_hideComments(); return ws.cellCommentator.hideComments();
}; };
spreadsheet_api.prototype.asc_getWorkbookComments = function() { spreadsheet_api.prototype.asc_getWorkbookComments = function() {
......
This diff is collapsed.
...@@ -937,7 +937,7 @@ ...@@ -937,7 +937,7 @@
var ws = this.getWorksheet(); var ws = this.getWorksheet();
var comments = ws.cellCommentator.getCommentsXY(x, y); var comments = ws.cellCommentator.getCommentsXY(x, y);
if (comments.length) if (comments.length)
ws.cellCommentator.asc_showComment(comments[0].asc_getId()); ws.cellCommentator.showComment(comments[0].asc_getId());
}; };
WorkbookView.prototype._onUpdateSelectionName = function () { WorkbookView.prototype._onUpdateSelectionName = function () {
......
...@@ -5966,7 +5966,7 @@ ...@@ -5966,7 +5966,7 @@
return {cursor: kCurAutoFilter, target: c_oTargetType.FilterObject, col: -1, row: -1, idFilter: autoFilterInfo.id}; return {cursor: kCurAutoFilter, target: c_oTargetType.FilterObject, col: -1, row: -1, idFilter: autoFilterInfo.id};
// Проверим есть ли комменты // Проверим есть ли комменты
var comments = this.cellCommentator.asc_getComments(c.col, r.row); var comments = this.cellCommentator.getComments(c.col, r.row);
var coords = undefined; var coords = undefined;
var indexes = undefined; var indexes = undefined;
...@@ -6625,7 +6625,7 @@ ...@@ -6625,7 +6625,7 @@
} else } else
cell_info.hyperlink = null; cell_info.hyperlink = null;
cell_info.comments = this.cellCommentator.asc_getComments(ar.c1, ar.r1); cell_info.comments = this.cellCommentator.getComments(ar.c1, ar.r1);
cell_info.flags.merge = null !== range.hasMerged(); cell_info.flags.merge = null !== range.hasMerged();
if (bExt) { if (bExt) {
...@@ -8831,7 +8831,7 @@ ...@@ -8831,7 +8831,7 @@
//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);
t.cellCommentator.asc_addComment(commentData, true); t.cellCommentator.addComment(commentData, true);
} }
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment