documentFormat to baseEditorsApi

delete asc_getDocumentFormat

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

Common/apiBase.js

@@ -24,6 +24,7 @@ function baseEditorsApi(name) {
   this.documentUrl = "null";
   this.documentUrlChanges = null;
   this.documentCallbackUrl = undefined;		// Ссылка для отправления информации о документе
+  this.documentFormat = "null";
   this.documentTitle = "null";
 
   // Тип состояния на данный момент (сохранение, открытие или никакое)

Excel/api.js

@@ -42,7 +42,6 @@ var editor;
     this.wb = null;
     this.wbModel = null;
 
-    this.documentFormat = "null";
     this.documentVKey = null;
     this.documentFormatSave = c_oAscFileType.XLSX;
     this.chartEditor = undefined;
@@ -330,18 +329,6 @@ var editor;
       this.chartEditor = this.DocInfo.asc_getChartEditor();
       this.documentOpenOptions = this.DocInfo.asc_getOptions();
       this.documentCallbackUrl = this.DocInfo.asc_getCallbackUrl();
-      // if(this.documentFormat)
-      // {
-      // switch(this.documentFormat)
-      // {
-      // case "xlsx" : this.documentFormatSave = c_oAscFileType.XLSX;break;
-      // case "xls"  : this.documentFormatSave = c_oAscFileType.XLS;break;
-      // case "ods"  : this.documentFormatSave = c_oAscFileType.ODS;break;
-      // case "csv"  : this.documentFormatSave = c_oAscFileType.CSV;break;
-      // case "htm"  :
-      // case "html" : this.documentFormatSave = c_oAscFileType.HTML;break;
-      // }
-      // }
 
       // Выставляем пользователя
       this.User = new asc.asc_CUser();
@@ -890,10 +877,6 @@ var editor;
     }, fCallback, null, oAdditionalData, dataContainer);
   };
 
-  spreadsheet_api.prototype.asc_getDocumentFormat = function() {
-    return this.documentFormat;
-  };
-
   spreadsheet_api.prototype.asc_isDocumentModified = function() {
     if (!this.canSave || this.asc_getCellEditMode()) {
       // Пока идет сохранение или редактирование ячейки, мы не закрываем документ
@@ -3427,7 +3410,6 @@ var editor;
   prot["asc_Redo"] = prot.asc_Redo;
 
   prot["asc_getDocumentName"] = prot.asc_getDocumentName;
-  prot["asc_getDocumentFormat"] = prot.asc_getDocumentFormat;
   prot["asc_isDocumentModified"] = prot.asc_isDocumentModified;
   prot["asc_isDocumentCanSave"] = prot.asc_isDocumentCanSave;
   prot["asc_getCanUndo"] = prot.asc_getCanUndo;

PowerPoint/api.js

 "use strict";
 
-var documentFormat = 'null';
 var documentVKey = null;
 var documentFormatSave = c_oAscFileType.PPTX;//пока не во что другое сохранять не можем.
 
@@ -643,7 +642,7 @@ asc_docs_api.prototype.asc_setDocInfo = function(c_DocInfo) {
     this.documentUserId = this.DocInfo.get_UserId();
     this.documentUrl = this.DocInfo.get_Url();
     this.documentTitle = this.DocInfo.get_Title();
-    documentFormat = this.DocInfo.get_Format();
+    this.documentFormat = this.DocInfo.get_Format();
     this.documentCallbackUrl = this.DocInfo.get_CallbackUrl();
     documentVKey = this.DocInfo.get_VKey();
     var sProtocol = window.location.protocol;
@@ -673,7 +672,7 @@ asc_docs_api.prototype.LoadDocument = function() {
     var rData = {
       "id": this.documentId,
       "userid": this.documentUserId,
-      "format": documentFormat,
+      "format": this.documentFormat,
       "vkey": documentVKey,
       "editorid": c_oEditorId.Presentation,
       "c": "open",

Word/api.js

 "use strict";
 
-var documentFormat = 'null';
 var documentVKey = null;
 var documentFormatSave = c_oAscFileType.DOCX;
 
@@ -574,7 +573,7 @@ asc_docs_api.prototype.asc_setDocInfo = function(c_DocInfo) {
     this.documentUserId = this.DocInfo.get_UserId();
     this.documentUrl = this.DocInfo.get_Url();
     this.documentTitle = this.DocInfo.get_Title();
-    documentFormat = this.DocInfo.get_Format();
+    this.documentFormat = this.DocInfo.get_Format();
     this.documentCallbackUrl = this.DocInfo.get_CallbackUrl();
     documentVKey = this.DocInfo.get_VKey();
     var sProtocol = window.location.protocol;
@@ -606,7 +605,7 @@ asc_docs_api.prototype.LoadDocument = function(isVersionHistory) {
       "c": 'open',
       "id": this.documentId,
       "userid": this.documentUserId,
-      "format": documentFormat,
+      "format": this.documentFormat,
       "vkey": documentVKey,
       "editorid": c_oEditorId.Word,
       "url": this.documentUrl,
@@ -2108,7 +2107,7 @@ asc_docs_api.prototype.asc_setAdvancedOptions = function(idOption, option) {
           var rData = {
             "id":this.documentId,
             "userid": this.documentUserId,
-            "format": documentFormat,
+            "format": this.documentFormat,
             "vkey": documentVKey,
             "editorid": c_oEditorId.Word,
             "c":"reopen",