Commit caa41e80 authored by Alexander.Trofimov's avatar Alexander.Trofimov Committed by Alexander.Trofimov

Merged revision(s) r62982 from...

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

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@63430 954022d7-b5bf-4e40-9824-e11837661b57
parent 74cf207c
......@@ -10,6 +10,7 @@
"concat_api": {
"../../PowerPoint/api-all.js": [
"../../PowerPoint/api.js",
"../../PowerPoint/Private/api.js",
"../../PowerPoint/apiCommon.js",
"../../Word/apiCommon.js"
]
......@@ -200,6 +201,7 @@
"cwd": "../../PowerPoint/",
"src": [
"api.js",
"Private/api.js",
"apiCommon.js",
"apiDefines.js"
],
......
......@@ -113,6 +113,7 @@
<script type="text/javascript" src="../PowerPoint/apiDefines.js"></script>
<script type="text/javascript" src="../PowerPoint/apiCommon.js"></script>
<script type="text/javascript" src="../PowerPoint/api.js"></script>
<script type="text/javascript" src="../PowerPoint/Private/api.js"></script>
<script type="text/javascript" src="../Common/Drawings/Format/Constants.js"></script>
<script type="text/javascript" src="../PowerPoint/themes/Themes.js"></script>
......
......@@ -3578,18 +3578,6 @@ asc_docs_api.prototype.asc_hideComments = function()
asc_docs_api.prototype.asc_addComment = function(AscCommentData)
{
//if ( true === CollaborativeEditing.Get_GlobalLock() )
// return;
if (null == this.WordControl.m_oLogicDocument)
return;
var CommentData = new CCommentData();
CommentData.Read_FromAscCommentData(AscCommentData);
var Comment = this.WordControl.m_oLogicDocument.Add_Comment( CommentData );
if (Comment )
return Comment.Get_Id();
};
asc_docs_api.prototype.asc_getMasterCommentId = function()
......
......@@ -321,6 +321,7 @@
<script type="text/javascript" src="../../../../OfficeWeb/PowerPoint/apiDefines.js"></script>
<script type="text/javascript" src="../../../../OfficeWeb/PowerPoint/apiCommon.js"></script>
<script type="text/javascript" src="../../../../OfficeWeb/PowerPoint/api.js"></script>
<script type="text/javascript" src="../../../../OfficeWeb/PowerPoint/Private/api.js"></script>
<script type="text/javascript" src="../../../../OfficeWeb/Common/Drawings/Format/Constants.js"></script>
<script type="text/javascript" src="../../../../OfficeWeb/PowerPoint/themes/Themes.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