Вынес license и comments в private

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

Build/deploy/sdk_configs/webpowerpoint.json

@@ -130,7 +130,8 @@
                 "../../PowerPoint/Editor/Format/ChartSpacePrototype.js",
                 "../../PowerPoint/Editor/Format/GraphicFrame.js",
                 "../../PowerPoint/api.js",
-                "../../PowerPoint/Private/api.js",
+                "../../PowerPoint/Private/license.js",
+				"../../PowerPoint/Private/comments.js",
                 "../../PowerPoint/apiCommon.js",
                 "../../Word/apiCommon.js",
                 "../../PowerPoint/apiExport.js",

Build/deploy/sdk_configs/webword.json

@@ -116,7 +116,8 @@
                 "../../Word/Editor/SerializeCommon.js",
                 "../../Word/apiDefines.js",
                 "../../Word/api.js",
-                "../../Word/Private/api.js",
+                "../../Word/Private/license.js",
+				"../../Word/Private/comments.js",
                 "../../Word/Private/StyleManager.js",
                 "../../Word/Private/MailMerge.js",
                 "../../Word/Private/TrackRevisions.js",

PowerPoint/PowerPoint.html

@@ -104,7 +104,8 @@
 	<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="../PowerPoint/Private/license.js"></script>
+    <script type="text/javascript" src="../PowerPoint/Private/comments.js"></script>
 
 	<script type="text/javascript" src="../Common/Drawings/Format/Constants.js"></script>
 	<script type="text/javascript" src="../PowerPoint/themes/Themes.js"></script>

PowerPoint/Private/comments.js

+"use strict";
+
+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();
+  }
+};
\ No newline at end of file

PowerPoint/Private/api.js → PowerPoint/Private/license.js

 "use strict";
 
-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_getEditorPermissions = function(licenseUrl, customerId) {
   var t = this;
   if (this.DocInfo && this.DocInfo.get_Id()) {
-
-        var sUserFirstName = null, sUserLastName = null;
-        var oUserInfo = this.DocInfo.get_UserInfo();
-        if(oUserInfo){
-          sUserFirstName = oUserInfo.get_FirstName();
-          sUserLastName = oUserInfo.get_LastName();
-        }
-        CheckLicense(licenseUrl, customerId, this.DocInfo.get_UserId(), sUserFirstName, sUserLastName, function(err, res) {
+    var sUserFirstName = null, sUserLastName = null;
+    var oUserInfo = this.DocInfo.get_UserInfo();
+    if (oUserInfo) {
+      sUserFirstName = oUserInfo.get_FirstName();
+      sUserLastName = oUserInfo.get_LastName();
+    }
+    CheckLicense(licenseUrl, customerId, this.DocInfo.get_UserId(), sUserFirstName, sUserLastName, function(err, res) {
       t._onCheckLicenseEnd(err, res);
     });
   } else {

PowerPoint/index.html

@@ -320,7 +320,8 @@
 <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/PowerPoint/Private/license.js"></script>
+<script type="text/javascript" src="../../../../OfficeWeb/PowerPoint/Private/comments.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>

Word/MergeTest.html

@@ -100,7 +100,8 @@
 		<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="Private/license.js"></script>
+        <script type="text/javascript" src="Private/comments.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/comments.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/Private/api.js → Word/Private/license.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();
-  }
-};
 asc_docs_api.prototype.asc_getEditorPermissions = function(licenseUrl, customerId) {
   var t = this;
   if (this.DocInfo && this.DocInfo.get_Id()) {
 
-      var sUserFirstName = null, sUserLastName = null;
-      var oUserInfo = this.DocInfo.get_UserInfo();
-      if(oUserInfo){
-          sUserFirstName = oUserInfo.get_FirstName();
-          sUserLastName = oUserInfo.get_LastName();
-      }
+    var sUserFirstName = null, sUserLastName = null;
+    var oUserInfo = this.DocInfo.get_UserInfo();
+    if (oUserInfo) {
+      sUserFirstName = oUserInfo.get_FirstName();
+      sUserLastName = oUserInfo.get_LastName();
+    }
     CheckLicense(licenseUrl, customerId, this.DocInfo.get_UserId(), sUserFirstName, sUserLastName, function(err, res) {
       t._onCheckLicenseEnd(err, res);
     });

Word/TextEditor.html

@@ -177,7 +177,8 @@
 		<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="Private/license.js"></script>
+        <script type="text/javascript" src="Private/comments.js"></script>
 		<script type="text/javascript" src="document/empty.js"></script>
         <script type="text/javascript" src="../Common/scroll.js"></script>
 

Word/index.html

@@ -419,7 +419,8 @@
 	<!-- apply changes -->
 	<script type="text/javascript" src="../../../../OfficeWeb/OfflineDocuments/ApplyDocumentChanges.js"></script>
 
-    <script type="text/javascript" src="../../../../OfficeWeb/Word/Private/api.js"></script>
+    <script type="text/javascript" src="../../../../OfficeWeb/Word/Private/license.js"></script>
+    <script type="text/javascript" src="../../../../OfficeWeb/Word/Private/comments.js"></script>
     <script type="text/javascript" src="../../../../OfficeWeb/Word/Private/StyleManager.js"></script>
 	<script type="text/javascript" src="../../../../OfficeWeb/Word/Private/MailMerge.js"></script>
 	<script type="text/javascript" src="../../../../OfficeWeb/Word/Private/TrackRevisions.js"></script>

Word/index_mobile.html

@@ -169,7 +169,8 @@
 	<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/Private/license.js"></script>
+    <script type="text/javascript" src="../../../../OfficeWeb/Word/Private/comments.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

@@ -107,7 +107,8 @@
 	<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/Private/license.js"></script>
+    <script type="text/javascript" src="../../OfficeWeb/Word/Private/comments.js"></script>
 	<script type="text/javascript" src="../../OfficeWeb/Word/document/empty.js"></script>
     <script type="text/javascript" src="../../OfficeWeb/Common/scroll.js"></script>