sync_StartAction, sync_EndAction to baseEditorsApi

asc_stopSaving, asc_continueSaving to baseEditorsApi
Excel waitSave -> LongAction

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

Common/apiBase.js

@@ -163,8 +163,20 @@ baseEditorsApi.prototype.sync_InitEditorFonts = function(gui_fonts) {
   this.sendEvent("asc_onInitEditorFonts", gui_fonts);
 };
 baseEditorsApi.prototype.sync_StartAction = function() {
+  this.sendEvent('asc_onStartAction', type, id);
+  //console.log("asc_onStartAction: type = " + type + " id = " + id);
+
+  if (c_oAscAsyncActionType.BlockInteraction === type) {
+    this.incrementCounterLongAction();
+  }
 };
 baseEditorsApi.prototype.sync_EndAction = function() {
+  this.sendEvent('asc_onEndAction', type, id);
+  //console.log("asc_onEndAction: type = " + type + " id = " + id);
+
+  if (c_oAscAsyncActionType.BlockInteraction === type) {
+    this.decrementCounterLongAction();
+  }
 };
 baseEditorsApi.prototype.sync_TryUndoInFastCollaborative = function()
 {
@@ -355,6 +367,12 @@ baseEditorsApi.prototype.asc_coAuthoringDisconnect = function() {
   // Выставляем view-режим
   this.asc_setViewMode(true);
 };
+baseEditorsApi.prototype.asc_stopSaving = function() {
+  this.incrementCounterLongAction();
+};
+baseEditorsApi.prototype.asc_continueSaving = function() {
+  this.decrementCounterLongAction();
+};
 // SpellCheck
 baseEditorsApi.prototype._coSpellCheckInit = function() {
 };

Excel/api.js

@@ -69,8 +69,6 @@ var editor;
     this.autoSaveGapFast = 2000;			// Интервал быстрого автосохранения (когда человек один) - 2 сек.
     this.autoSaveGapSlow = 10 * 60 * 1000;	// Интервал медленного автосохранения (когда совместно) - 10 минут
 
-    this.waitSave = false;					// Отложенное сохранение, происходит во время долгих операций
-
     // Shapes
     this.isStartAddShape = false;
     this.shapeElementId = null;
@@ -398,7 +396,7 @@ var editor;
   };
 
   spreadsheet_api.prototype.asc_Save = function(isAutoSave) {
-    if (!this.canSave || this.isChartEditor || c_oAscAdvancedOptionsAction.None !== this.advancedOptionsAction || this.waitSave) {
+    if (!this.canSave || this.isChartEditor || c_oAscAdvancedOptionsAction.None !== this.advancedOptionsAction || this.isLongAction()) {
       return;
     }
 
@@ -905,16 +903,6 @@ var editor;
    * asc_onContextMenu			(event)												- эвент на контекстное меню
    */
 
-  spreadsheet_api.prototype.sync_StartAction = function(type, id) {
-    this.handlers.trigger("asc_onStartAction", type, id);
-    //console.log("asc_onStartAction: type = " + type + " id = " + id);
-  };
-
-  spreadsheet_api.prototype.sync_EndAction = function(type, id) {
-    this.handlers.trigger("asc_onEndAction", type, id);
-    //console.log("asc_onEndAction: type = " + type + " id = " + id);
-  };
-
   spreadsheet_api.prototype.asc_registerCallback = function(name, callback, replaceOldCallback) {
     this.handlers.add(name, callback, replaceOldCallback);
 
@@ -985,7 +973,6 @@ var editor;
     if (this.asyncMethodCallback !== undefined) {
       this.asyncMethodCallback();
       this.asyncMethodCallback = undefined;
-      this.waitSave = false;
     } else {
       // Шрифты загрузились, возможно стоит подождать совместное редактирование
       this.FontLoadWaitComplete = true;
@@ -1015,7 +1002,6 @@ var editor;
     if (window["NATIVE_EDITOR_ENJINE"]) {
       return callback();
     }
-    this.waitSave = true;
     this.asyncMethodCallback = callback;
     var arrLoadFonts = [];
     for (var i in fonts)
@@ -1501,7 +1487,7 @@ var editor;
     var t = this;
     var nState;
     if (false == e["saveLock"]) {
-      if (this.waitSave) {
+      if (this.isLongAction()) {
         // Мы не можем в этот момент сохранять, т.к. попали в ситуацию, когда мы залочили сохранение и успели нажать вставку до ответа
         // Нужно снять lock с сохранения
         this.CoAuthoringApi.onUnSaveLock = function() {
@@ -3001,15 +2987,6 @@ var editor;
     }
   };
 
-  // Other
-
-  spreadsheet_api.prototype.asc_stopSaving = function() {
-    this.waitSave = true;
-  };
-  spreadsheet_api.prototype.asc_continueSaving = function() {
-    this.waitSave = false;
-  };
-
   // Выставление локали
   spreadsheet_api.prototype.asc_setLocalization = function(oLocalizedData) {
     if (null == oLocalizedData) {

PowerPoint/api.js

@@ -1321,21 +1321,6 @@ asc_docs_api.prototype.sync_SaveCallBack = function(){
 asc_docs_api.prototype.sync_DownloadAsCallBack = function(){
 	this.asc_fireCallback("asc_onDownload");
 };
-asc_docs_api.prototype.sync_StartAction = function(type, id){
-	//this.AsyncAction
-	this.asc_fireCallback("asc_onStartAction", type, id);
-
-    if (c_oAscAsyncActionType.BlockInteraction == type)
-        this.incrementCounterLongAction();
-};
-asc_docs_api.prototype.sync_EndAction = function(type, id){
-    this.asc_fireCallback("asc_onEndAction", type, id);
-
-    if (c_oAscAsyncActionType.BlockInteraction == type)
-    {
-        this.decrementCounterLongAction();
-    }
-};
 
 asc_docs_api.prototype.sync_AddURLCallback = function(){
 	this.asc_fireCallback("asc_onAddURL");
@@ -4695,13 +4680,6 @@ asc_docs_api.prototype.sync_closeChartEditor = function()
     this.asc_fireCallback("asc_onCloseChartEditor");
 };
 
-asc_docs_api.prototype.asc_stopSaving = function () {
-    this.incrementCounterLongAction();
-};
-asc_docs_api.prototype.asc_continueSaving = function () {
-	this.decrementCounterLongAction();
-};
-
 //-----------------------------------------------------------------
 // События контекстного меню
 //-----------------------------------------------------------------

Word/api.js

@@ -2142,24 +2142,6 @@ asc_docs_api.prototype.sync_SaveCallBack = function(){
 asc_docs_api.prototype.sync_DownloadAsCallBack = function(){
 	this.asc_fireCallback("asc_onDownload");
 };
-asc_docs_api.prototype.sync_StartAction = function(type, id){
-	//this.AsyncAction
-	this.asc_fireCallback("asc_onStartAction", type, id);
-	//console.log("asc_onStartAction: type = " + type + " id = " + id);
-
-    if (c_oAscAsyncActionType.BlockInteraction == type)
-        this.incrementCounterLongAction();
-};
-asc_docs_api.prototype.sync_EndAction = function(type, id){
-	//this.AsyncAction
-	this.asc_fireCallback("asc_onEndAction", type, id);
-	//console.log("asc_onEndAction: type = " + type + " id = " + id);
-
-    if (c_oAscAsyncActionType.BlockInteraction == type)
-    {
-        this.decrementCounterLongAction();
-    }
-};
 
 asc_docs_api.prototype.sync_AddURLCallback = function(){
 	this.asc_fireCallback("asc_onAddURL");
@@ -6715,13 +6697,6 @@ CRevisionsChange.prototype.ComparePrevPosition = function()
     return true;
 };
 
-asc_docs_api.prototype.asc_stopSaving = function () {
-	this.incrementCounterLongAction();
-};
-asc_docs_api.prototype.asc_continueSaving = function () {
-	this.decrementCounterLongAction();
-};
-
 asc_docs_api.prototype.asc_undoAllChanges = function ()
 {
     this.WordControl.m_oLogicDocument.Document_Undo({All : true});