Merged revision(s) r62980 from...

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

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@63429 954022d7-b5bf-4e40-9824-e11837661b57

Build/deploy/sdk_configs/webword.json

@@ -10,6 +10,7 @@
     "concat_api": {
         "../../Word/api-all.js": [
             "../../Word/api.js",
+			"../../Word/Private/api.js",
             "../../Word/apiCommon.js"
         ]
     },
@@ -186,6 +187,7 @@
                 "cwd": "../../Word/",
                 "src": [
                     "api.js",
+					"Private/api.js",
                     "apiCommon.js",
                     "apiDefines.js"
                 ],

Word/MergeTest.html

@@ -100,6 +100,7 @@
 		<script type="text/javascript" src="apiDefines.js"></script>
         <script type="text/javascript" src="apiCommon.js"></script>
 		<script type="text/javascript" src="api.js"></script>
+		<script type="text/javascript" src="Private/api.js"></script>
 		<script type="text/javascript" src="document/empty.js"></script>
         <script type="text/javascript" src="merge/api_merge.js"></script>
         <script type="text/javascript" src="../Common/scroll.js"></script>

Word/Private/api.js

+"use strict";
+
+asc_docs_api.prototype.asc_addComment = function(AscCommentData)
+{
+	if (true === CollaborativeEditing.Get_GlobalLock())
+		return;
+
+	if (null == this.WordControl.m_oLogicDocument)
+		return;
+
+	// Комментарий без цитаты позволяем добавить всегда
+	if (true !== this.can_AddQuotedComment() || false === this.WordControl.m_oLogicDocument.Document_Is_SelectionLocked(changestype_Paragraph_Content))
+	{
+		var CommentData = new CCommentData();
+		CommentData.Read_FromAscCommentData(AscCommentData);
+
+		this.WordControl.m_oLogicDocument.Create_NewHistoryPoint(historydescription_Document_AddComment);
+		var Comment = this.WordControl.m_oLogicDocument.Add_Comment(CommentData);
+		if (null != Comment)
+			this.sync_AddComment(Comment.Get_Id(), CommentData);
+
+		return Comment.Get_Id();
+	}
+};
\ No newline at end of file

Word/TextEditor.html

@@ -179,6 +179,7 @@
 		<script type="text/javascript" src="apiDefines.js"></script>
         <script type="text/javascript" src="apiCommon.js"></script>
 		<script type="text/javascript" src="api.js"></script>
+		<script type="text/javascript" src="Private/api.js"></script>
 		<script type="text/javascript" src="document/empty.js"></script>
         <script type="text/javascript" src="../Common/scroll.js"></script>
 

Word/api.js

@@ -5581,25 +5581,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;
-
-    // Комментарий без цитаты позволяем добавить всегда
-    if (true !== this.can_AddQuotedComment() || false === this.WordControl.m_oLogicDocument.Document_Is_SelectionLocked(changestype_Paragraph_Content))
-    {
-        var CommentData = new CCommentData();
-        CommentData.Read_FromAscCommentData(AscCommentData);
-
-        this.WordControl.m_oLogicDocument.Create_NewHistoryPoint(historydescription_Document_AddComment);
-        var Comment = this.WordControl.m_oLogicDocument.Add_Comment(CommentData);
-        if (null != Comment)
-            this.sync_AddComment(Comment.Get_Id(), CommentData);
-
-        return Comment.Get_Id();
-    }
 };
 
 asc_docs_api.prototype.asc_removeComment = function(Id)

Word/index.html

@@ -380,6 +380,7 @@
 	<script type="text/javascript" src="../../../../OfficeWeb/Word/apiDefines.js"></script>
     <script type="text/javascript" src="../../../../OfficeWeb/Word/apiCommon.js"></script>
 	<script type="text/javascript" src="../../../../OfficeWeb/Word/api.js"></script>
+	<script type="text/javascript" src="../../../../OfficeWeb/Word/Private/api.js"></script>
 	<script type="text/javascript" src="../../../../OfficeWeb/Word/document/empty.js"></script>
     <script type="text/javascript" src="../../../../OfficeWeb/Common/scroll.js"></script>
 	

Word/index_mobile.html

@@ -170,6 +170,7 @@
 	<script type="text/javascript" src="../../../../OfficeWeb/Word/apiDefines.js"></script>
     <script type="text/javascript" src="../../../../OfficeWeb/Word/apiCommon.js"></script>
 	<script type="text/javascript" src="../../../../OfficeWeb/Word/api.js"></script>
+	<script type="text/javascript" src="../../../../OfficeWeb/Word/Private/api.js"></script>
 	<script type="text/javascript" src="../../../../OfficeWeb/Word/document/empty.js"></script>
     <script type="text/javascript" src="../../../../OfficeWeb/Common/scroll.js"></script>
 	

Word/mobile_editor.html

@@ -106,6 +106,7 @@
 	<script type="text/javascript" src="../../OfficeWeb/Word/apiDefines.js"></script>
     <script type="text/javascript" src="../../OfficeWeb/Word/apiCommon.js"></script>
 	<script type="text/javascript" src="../../OfficeWeb/Word/api.js"></script>
+	<script type="text/javascript" src="../../OfficeWeb/Word/Private/api.js"></script>
 	<script type="text/javascript" src="../../OfficeWeb/Word/document/empty.js"></script>
     <script type="text/javascript" src="../../OfficeWeb/Common/scroll.js"></script>