Commit 5fa7f3b7 authored by Alexander.Trofimov's avatar Alexander.Trofimov Committed by Alexander.Trofimov

Merged revision(s) r63012 from...

Merged revision(s) r63012 from AVS/Sources/TeamlabOffice/branches/TeamlabOffice_v3.0_Postgresql/OfficeWeb* Добавил Private/api.js Перенес туда Excel asc_addComment

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@63431 954022d7-b5bf-4e40-9824-e11837661b57
parent caa41e80
...@@ -157,7 +157,8 @@ ...@@ -157,7 +157,8 @@
"../../Excel/model/DrawingObjects/GlobalCounters.js", "../../Excel/model/DrawingObjects/GlobalCounters.js",
"../../Word/apiCommon.js", "../../Word/apiCommon.js",
"../../Excel/Build/Log/apiCommonExport.js", "../../Excel/Build/Log/apiCommonExport.js",
"../../Excel/api.js" "../../Excel/api.js",
"../../Excel/Private/api.js"
], ],
"dst": "../../Excel/sdk-all.js", "dst": "../../Excel/sdk-all.js",
"externs": [ "externs": [
...@@ -199,6 +200,7 @@ ...@@ -199,6 +200,7 @@
"cwd": "../../Excel/", "cwd": "../../Excel/",
"src": [ "src": [
"api.js", "api.js",
"Private/api.js",
"apiDefines.js", "apiDefines.js",
"view/EventsController.js", "view/EventsController.js",
"view/HandlerList.js", "view/HandlerList.js",
......
...@@ -111,6 +111,7 @@ ...@@ -111,6 +111,7 @@
<script type="text/javascript" src="view/WorkbookView.js"></script> <script type="text/javascript" src="view/WorkbookView.js"></script>
<script type="text/javascript" src="api.js"></script> <script type="text/javascript" src="api.js"></script>
<script type="text/javascript" src="Private/api.js"></script>
<script type="text/javascript" src="menu/menu.js"></script> <script type="text/javascript" src="menu/menu.js"></script>
<!--for theme--> <!--for theme-->
......
...@@ -2641,12 +2641,6 @@ var ASC_DOCS_API_USE_EMBEDDED_FONTS = "@@ASC_DOCS_API_USE_EMBEDDED_FONTS"; ...@@ -2641,12 +2641,6 @@ var ASC_DOCS_API_USE_EMBEDDED_FONTS = "@@ASC_DOCS_API_USE_EMBEDDED_FONTS";
// Cell comment interface // Cell comment interface
spreadsheet_api.prototype.asc_addComment = function(oComment) { spreadsheet_api.prototype.asc_addComment = function(oComment) {
if (oComment.bDocument)
this.wb.cellCommentator.asc_addComment(oComment);
else {
var ws = this.wb.getWorksheet();
ws.cellCommentator.asc_addComment(oComment);
}
}; };
spreadsheet_api.prototype.asc_changeComment = function(id, oComment) { spreadsheet_api.prototype.asc_changeComment = function(id, oComment) {
......
...@@ -314,6 +314,7 @@ ...@@ -314,6 +314,7 @@
<script type="text/javascript" src="../../../../OfficeWeb/Excel/view/WorkbookView.js"></script> <script type="text/javascript" src="../../../../OfficeWeb/Excel/view/WorkbookView.js"></script>
<script type="text/javascript" src="../../../../OfficeWeb/Excel/api.js"></script> <script type="text/javascript" src="../../../../OfficeWeb/Excel/api.js"></script>
<script type="text/javascript" src="../../../../OfficeWeb/Excel/Private/api.js"></script>
<!--for theme--> <!--for theme-->
<script type="text/javascript" src="../../../../OfficeWeb/Common/Shapes/EditorSettings.js"></script> <script type="text/javascript" src="../../../../OfficeWeb/Common/Shapes/EditorSettings.js"></script>
......
...@@ -279,6 +279,7 @@ ...@@ -279,6 +279,7 @@
<script type="text/javascript" src="../../../../OfficeWeb/Excel/view/WorkbookView.js"></script> <script type="text/javascript" src="../../../../OfficeWeb/Excel/view/WorkbookView.js"></script>
<script type="text/javascript" src="../../../../OfficeWeb/Excel/api.js"></script> <script type="text/javascript" src="../../../../OfficeWeb/Excel/api.js"></script>
<script type="text/javascript" src="../../../../OfficeWeb/Excel/Private/api.js"></script>
<!--for theme--> <!--for theme-->
<script type="text/javascript" src="../../../../OfficeWeb/Common/Shapes/EditorSettings.js"></script> <script type="text/javascript" src="../../../../OfficeWeb/Common/Shapes/EditorSettings.js"></script>
......
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