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

Word/Drawing/Overlay.js

@@ -75,7 +75,7 @@ COverlay.prototype =
     VertLine : function(position)
     {
         this.Clear();
-        if (this.m_bIsAlwaysUpdateOverlay || editor.WordControl.m_oDrawingDocument.m_bIsSelection)
+        if (this.m_bIsAlwaysUpdateOverlay || true/*мало ли что есть на оверлее*/)
         {
             if (!editor.WordControl.OnUpdateOverlay())
             {
@@ -138,7 +138,7 @@ COverlay.prototype =
     HorLine : function(position)
     {
         this.Clear();
-        if (this.m_bIsAlwaysUpdateOverlay || editor.WordControl.m_oDrawingDocument.m_bIsSelection)
+        if (this.m_bIsAlwaysUpdateOverlay || true/*мало ли что есть на оверлее*/)
         {
             if (!editor.WordControl.OnUpdateOverlay())
             {

Word/Drawing/Rulers.js

@@ -1223,7 +1223,7 @@ function CHorRuler()
         if (7 != this.DragType)
         {
             word_control.UpdateHorRuler();
-            word_control.m_oOverlayApi.UnShow();
+            //word_control.m_oOverlayApi.UnShow();
         }
 
         var _margin_left = this.m_dMarginLeft;
@@ -1279,7 +1279,7 @@ function CHorRuler()
         if (7 == this.DragType)
         {
             word_control.UpdateHorRuler();
-            word_control.m_oOverlayApi.UnShow();
+            //word_control.m_oOverlayApi.UnShow();
         }
 
         this.IsDrawingCurTab = true;
@@ -1298,7 +1298,7 @@ function CHorRuler()
         if (7 != this.DragType)
         {
             word_control.UpdateHorRuler();
-            word_control.m_oOverlayApi.UnShow();
+            //word_control.m_oOverlayApi.UnShow();
         }
 
         var _margin_left = this.m_dMarginLeft;
@@ -1354,7 +1354,7 @@ function CHorRuler()
         if (7 == this.DragType)
         {
             word_control.UpdateHorRuler();
-            word_control.m_oOverlayApi.UnShow();
+            //word_control.m_oOverlayApi.UnShow();
         }
 
         this.IsDrawingCurTab = true;
@@ -2474,7 +2474,7 @@ function CVerRuler()
     {
         var lockedElement = check_MouseUpEvent(e);
 
-        this.m_oWordControl.m_oOverlayApi.UnShow();
+        //this.m_oWordControl.m_oOverlayApi.UnShow();
         this.m_oWordControl.m_oOverlayApi.Clear();
 
         switch (this.DragType)
@@ -2504,7 +2504,7 @@ function CVerRuler()
 
     this.OnMouseUpExternal = function()
     {
-        this.m_oWordControl.m_oOverlayApi.UnShow();
+        //this.m_oWordControl.m_oOverlayApi.UnShow();
         this.m_oWordControl.m_oOverlayApi.Clear();
 
         switch (this.DragType)

Word/Drawing/WorkEvents.js

@@ -1755,7 +1755,7 @@ function CMobileTouchManager()
         if (_bIsRet)
             return;
 
-        if (null != this.RectSelect1 && null != this.RectSelect2)
+        if (null != this.RectSelect1 && null != this.RectSelect2 && !this.HtmlPage.m_oApi.isViewMode)
         {
             var _matrix = this.DrawingDocument.TextMatrix;
 
@@ -1843,6 +1843,9 @@ function CMobileTouchManager()
 
     this.OnScrollAnimationEnd = function()
     {
+        if (this.HtmlPage.m_oApi.isViewMode)
+            return;
+
         if (null != this.RectSelect1 && null != this.RectSelect2)
         {
             var pos1 = null;
@@ -2685,7 +2688,10 @@ function CReaderTouchManager()
         this.HtmlPage.ReaderModeDivWrapper.style.height = this.HtmlPage.m_oMainView.HtmlElement.style.height;
 
         if (this.iScroll != null)
+        {
             this.iScroll.refresh();
+            this.iScroll._pos(this.iScroll.x, this.iScroll.y, false);
+        }
     }
 
     this.Destroy = function()

Word/Drawing/scrolls/iscroll.js

@@ -1009,6 +1009,12 @@ CTouchScroll.prototype = {
 		that.minScrollY = 0;
 		that.scrollerW = that.api.m_dDocumentWidth;
 		that.scrollerH = that.api.m_dDocumentHeight;
+
+        var _oldMaxX = that.maxScrollX;
+        var _oldMaxY = that.maxScrollY;
+        var _oldX = that.x;
+        var _oldY = that.y;
+
 		that.maxScrollX = -that.api.m_dScrollX_max;
 		that.maxScrollY = -that.api.m_dScrollY_max;
 
@@ -1023,11 +1029,32 @@ CTouchScroll.prototype = {
 			that.maxScrollX = that.wrapperW - that.scrollerW;
 			that.maxScrollY = that.wrapperH - that.scrollerH + that.minScrollY;
 
-			that.y = 0;
+            // теперь посмотрим
+			/*
+            that.y = 0;
 			if (0 < that.api.m_dScrollY_max)
 			{
 				that.y = (that.api.m_dScrollY * that.maxScrollY / that.api.m_dScrollY_max) >> 0;
 			}
+			*/
+            that.x = 0;
+            that.y = 0;
+            if (that.maxScrollX < 0)
+            {
+                that.x = (_oldX * _oldMaxX / that.maxScrollX) >> 0;
+                if (that.x > 0)
+                    that.x = 0;
+                if (that.x < that.maxScrollX)
+                    that.x = that.maxScrollX;
+            }
+            if (that.maxScrollY < 0)
+            {
+                that.y = (_oldY * _oldMaxY / that.maxScrollY) >> 0;
+                if (that.y > 0)
+                    that.y = 0;
+                if (that.y < that.maxScrollY)
+                    that.y = that.maxScrollY;
+            }
 		}
 		that.dirX = 0;
 		that.dirY = 0;