Удалил параметр chartEditor. Не используется совсем.

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

Common/apiBase.js

@@ -32,7 +32,6 @@ function baseEditorsApi(name) {
   this.documentTitle = "null";
   this.documentFormatSave = c_oAscFileType.UNKNOWN;
 
-  this.chartEditor = undefined;
   this.documentOpenOptions = undefined;		// Опции при открытии (пока только опции для CSV)
 
   // Тип состояния на данный момент (сохранение, открытие или никакое)
@@ -143,7 +142,6 @@ baseEditorsApi.prototype.asc_setDocInfo = function(oDocInfo) {
     this.documentOrigin = ((sProtocol && '' !== sProtocol) ? sProtocol + '//' : '') + window.location.host;
 
     this.documentOpenOptions = this.DocInfo.asc_getOptions();
-    this.chartEditor = this.DocInfo.asc_getChartEditor();
 
     this.User = new Asc.asc_CUser();
     this.User.asc_setId(this.DocInfo.get_UserId());

Common/apiCommon.js

@@ -2640,9 +2640,6 @@
                 this.OfflineApp = true;
 
             this.TemplateReplacement = (null != obj.TemplateReplacement ? obj.TemplateReplacement : null);
-            if(typeof obj.ChartEditor != 'undefined'){
-                this.ChartEditor = obj.ChartEditor;
-            }
 
         }
         else
@@ -2656,7 +2653,6 @@
             this.Options             = null;
             this.CallbackUrl         = null;
             this.TemplateReplacement = null;
-            this.ChartEditor         = null;
         }
     }
      asc_CDocInfo.prototype.get_Id =  asc_CDocInfo.prototype.asc_getId = function(){return this.Id};
@@ -2681,8 +2677,6 @@
      asc_CDocInfo.prototype.put_CallbackUrl = asc_CDocInfo.prototype.asc_putCallbackUrl = function(v){this.CallbackUrl = v;};
      asc_CDocInfo.prototype.get_TemplateReplacement = asc_CDocInfo.prototype.asc_getTemplateReplacement = function(){return this.TemplateReplacement;};
      asc_CDocInfo.prototype.put_TemplateReplacement = asc_CDocInfo.prototype.asc_putTemplateReplacement = function(v){this.TemplateReplacement = v;};
-     asc_CDocInfo.prototype.get_ChartEditor =  asc_CDocInfo.prototype.asc_getChartEditor = function(){return this.ChartEditor;};
-     asc_CDocInfo.prototype.put_ChartEditor =  asc_CDocInfo.prototype.asc_putChartEditor = function(v){this.ChartEditor = v;};
      asc_CDocInfo.prototype.get_UserInfo =  asc_CDocInfo.prototype.asc_getUserInfo = function(){return this.UserInfo;};
      asc_CDocInfo.prototype.put_UserInfo =  asc_CDocInfo.prototype.asc_putUserInfo = function(v){this.UserInfo = v;};
 
@@ -2710,8 +2704,6 @@
     prot["put_CallbackUrl"]         = prot["asc_putCallbackUrl"]         =   prot.asc_putCallbackUrl;
     prot["get_TemplateReplacement"] = prot["asc_getTemplateReplacement"] =   prot.asc_getTemplateReplacement;
     prot["put_TemplateReplacement"] = prot["asc_putTemplateReplacement"] =   prot.asc_putTemplateReplacement;
-    prot["get_ChartEditor"]            = prot["asc_getChartEditor"]            =   prot.asc_getChartEditor;
-    prot["put_ChartEditor"]            = prot["asc_putChartEditor"]            =   prot.asc_putChartEditor;
 	prot["get_UserInfo"]            = prot["asc_getUserInfo"]            =   prot.asc_getUserInfo;
     prot["put_UserInfo"]            = prot["asc_putUserInfo"]            =   prot.asc_putUserInfo;
 

Excel/api.js

@@ -341,9 +341,7 @@ var editor;
     this.CoAuthoringApi.auth(this.getViewMode());
 
     this.sync_StartAction(c_oAscAsyncActionType.BlockInteraction, c_oAscAsyncAction.Open);
-    if (!this.chartEditor) {
-      this._asc_open();
-    }
+    this._asc_open();
   };
 
   spreadsheet_api.prototype.asc_LoadEmptyDocument = function() {
@@ -693,30 +691,28 @@ var editor;
   };
 
   spreadsheet_api.prototype._asc_open = function() {
-    if (!this.chartEditor) {
-      // Меняем тип состояния (на открытие)
-      this.advancedOptionsAction = c_oAscAdvancedOptionsAction.Open;
-
-      if (offlineMode === this.documentUrl) {
-        // ToDo убрать зависимость от this.FontLoader.fontFilesPath
-        this.documentUrl = this.FontLoader.fontFilesPath + "../Excel/document/";
-        this.DocInfo.asc_putOfflineApp(true);
-        this._OfflineAppDocumentStartLoad();
-      } else {
-        var v = {
-          "c": 'open',
-          "id": this.documentId,
-          "userid": this.documentUserId,
-          "format": this.documentFormat,
-          "vkey": this.documentVKey,
-          "editorid": this.editorId,
-          "url": this.documentUrl,
-          "title": this.documentTitle,
-          "embeddedfonts": this.isUseEmbeddedCutFonts,
-          "viewmode": this.getViewMode()
-        };
-        sendCommand2(this, null, v);
-      }
+    // Меняем тип состояния (на открытие)
+    this.advancedOptionsAction = c_oAscAdvancedOptionsAction.Open;
+
+    if (offlineMode === this.documentUrl) {
+      // ToDo убрать зависимость от this.FontLoader.fontFilesPath
+      this.documentUrl = this.FontLoader.fontFilesPath + "../Excel/document/";
+      this.DocInfo.asc_putOfflineApp(true);
+      this._OfflineAppDocumentStartLoad();
+    } else {
+      var v = {
+        "c": 'open',
+        "id": this.documentId,
+        "userid": this.documentUserId,
+        "format": this.documentFormat,
+        "vkey": this.documentVKey,
+        "editorid": this.editorId,
+        "url": this.documentUrl,
+        "title": this.documentTitle,
+        "embeddedfonts": this.isUseEmbeddedCutFonts,
+        "viewmode": this.getViewMode()
+      };
+      sendCommand2(this, null, v);
     }
   };
 

Excel/menu/menu.js

@@ -540,7 +540,6 @@
 	var sProtocol = window.location.protocol;
 	var sHost = window.location.host;
 	var key = !!getURLParameter("key");
-	var bChartEditor = !!getURLParameter("charteditor");
 	var sUserNameAndId = "user_" + Math.floor ((Math.random() * 100) + 1);
 
     var offLineApp = 0; //  1;  // NOTE: ONLY FOR TEST DESKTOP APPLICATION
@@ -554,8 +553,7 @@
             "VKey"   : getURLParameter("vkey") ? decodeURIComponent(getURLParameter("vkey")) : undefined,
             "Origin" : (sProtocol.search(/\w+/) >= 0 ? sProtocol + "//" : "") + sHost,
             "UserId" : sUserNameAndId,
-            "UserName" : sUserNameAndId,
-            "ChartEditor" : bChartEditor
+            "UserName" : sUserNameAndId
         };
     } else {
         c_DocInfo = {
@@ -567,7 +565,6 @@
             "Origin" : (sProtocol.search(/\w+/) >= 0 ? sProtocol + "//" : "") + sHost,
             "UserId" : sUserNameAndId,
             "UserName" : sUserNameAndId,
-            "ChartEditor" : bChartEditor,
             "OfflineApp" : true
         };
     }