Bug 24858 + не делаем автосейв, если на экране текстбокс для иероглифов

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

Word/Drawing/HtmlPage.js

@@ -3553,7 +3553,7 @@ function CEditorPage(api)
             oWordControl.m_oDrawingDocument.CheckTrackTable();
         }
 
-        if (oWordControl.m_oApi.autoSaveGap != 0)
+        if (oWordControl.m_oApi.autoSaveGap != 0 && !oWordControl.m_oApi.isViewMode && !oWordControl.TextBoxInputFocus)
         {
             var _curTime = new Date().getTime();
             if (-1 == oWordControl.m_nLastAutosaveTime)

Word/Editor/Document.js

@@ -612,6 +612,7 @@ CDocument.prototype =
     On_EndLoad : function()
     {
         this.Update_SectionsInfo();
+        this.DrawingObjects.addToZIndexManagerAfterOpen();
     },
 
     LoadEmptyDocument : function()

Word/api.js

@@ -6443,6 +6443,12 @@ asc_docs_api.prototype.asyncImagesDocumentEndLoaded = function()
             this.isSaveFonts_Images = false;
             this.saveImageMap = null;
             this.pre_SaveCallback();
+
+            if (this.bInit_word_control === false)
+            {
+                this.bInit_word_control = true;
+                this.asc_fireCallback("asc_onDocumentContentReady");
+            }
         }
         else if (this.isLoadImagesCustom)
         {
@@ -6493,10 +6499,11 @@ asc_docs_api.prototype.OpenDocumentEndCallback = function()
                 //Recalculate для Document
                 Document.CurPos.ContentPos = 0;
                 History.RecalcData_Add({Type: historyrecalctype_Drawing, All: true});
-                Document.DrawingObjects.addToZIndexManagerAfterOpen();
                 if (!this.isOnlyReaderMode)
                 {
-                    Document.Recalculate();
+                    if (false === this.isSaveFonts_Images)
+                        Document.Recalculate();
+
                     this.WordControl.m_oDrawingDocument.TargetStart();
                 }
                 else
@@ -6513,8 +6520,11 @@ asc_docs_api.prototype.OpenDocumentEndCallback = function()
     this.WordControl.m_oLogicDocument.Document_UpdateSelectionState();
     this.LoadedObject = null;
 
-    this.bInit_word_control = true;
-    this.asc_fireCallback("asc_onDocumentContentReady");
+    if (false === this.isSaveFonts_Images)
+    {
+        this.bInit_word_control = true;
+        this.asc_fireCallback("asc_onDocumentContentReady");
+    }
 
     this.WordControl.InitControl();
 
@@ -7008,11 +7018,14 @@ asc_docs_api.prototype.SetViewMode = function( isViewMode )
             return;
         }
 
+        // быстрого перехода больше нет
+        /*
         if ( this.bInit_word_control === true )
         {
             CollaborativeEditing.Apply_Changes();
             CollaborativeEditing.Release_Locks();
         }
+        */
 
         this.isUseEmbeddedCutFonts = false;