scroll bugs & rulers bugs

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

Common/scroll.js

@@ -1125,6 +1125,7 @@ ScrollObject.prototype = {
     /*events*/
     evt_mousemove:function ( e ) {
         var evt = e || window.event;
+
         if (evt.preventDefault)
             evt.preventDefault();
         else
@@ -1240,6 +1241,7 @@ ScrollObject.prototype = {
     },
     evt_mouseout:function ( e ) {
         var evt = e || window.event;
+
         if (evt.preventDefault)
             evt.preventDefault();
         else
@@ -1261,6 +1263,7 @@ ScrollObject.prototype = {
     },
     evt_mouseup:function ( e ) {
         var evt = e || window.event;
+
         if (evt.preventDefault)
             evt.preventDefault();
         else
@@ -1296,10 +1299,14 @@ ScrollObject.prototype = {
     },
     evt_mousedown:function ( e ) {
         var evt = e || window.event;
+
+        // если сделать превент дефолт - перестанет приходить mousemove от window
+        /*
         if (evt.preventDefault)
             evt.preventDefault();
         else
             evt.returnValue = false;
+        */
 
         var mousePos = this.that.getMousePosition( evt );
         var downHover = this.that._MouseHoverOnArrowDown( mousePos );

Word/Drawing/HtmlPage.js

@@ -1681,6 +1681,21 @@ function CEditorPage(api)
             oWordControl.m_oTimerScrollSelect = -1;
         }
 
+        if (oWordControl.m_oHorRuler.m_bIsMouseDown)
+            oWordControl.m_oHorRuler.OnMouseUpExternal();
+
+        if (oWordControl.m_oVerRuler.DragType != 0)
+            oWordControl.m_oVerRuler.OnMouseUpExternal();
+
+        if ( oWordControl.m_oScrollVerApi.getIsLockedMouse() )
+        {
+            oWordControl.m_oScrollVerApi.evt_mouseup(e);
+        }
+        if ( oWordControl.m_oScrollHorApi.getIsLockedMouse() )
+        {
+            oWordControl.m_oScrollHorApi.evt_mouseup(e);
+        }
+
         check_MouseUpEvent(e);
         var pos = null;
         if (oWordControl.m_oDrawingDocument.AutoShapesTrackLockPageNum == -1)

Word/Drawing/Rulers.js

@@ -1302,6 +1302,8 @@ function CHorRuler()
         this.IsDrawingCurTab = true;
         this.DragType = 0;
         this.m_bIsMouseDown = false;
+
+        this.m_oWordControl.m_oDrawingDocument.UnlockCursorType();
     }
 
     this.OnMouseUpExternal = function()
@@ -1377,6 +1379,8 @@ function CHorRuler()
         this.IsDrawingCurTab = true;
         this.DragType = 0;
         this.m_bIsMouseDown = false;
+
+        this.m_oWordControl.m_oDrawingDocument.UnlockCursorType();
     }
 
     this.SetTabsProperties = function()
@@ -2530,6 +2534,7 @@ function CVerRuler()
         }
 
         this.DragType = 0;
+        this.m_oWordControl.m_oDrawingDocument.UnlockCursorType();
     }
 
     this.OnMouseUpExternal = function()
@@ -2560,6 +2565,7 @@ function CVerRuler()
         }
 
         this.DragType = 0;
+        this.m_oWordControl.m_oDrawingDocument.UnlockCursorType();
     }
 
     this.BlitToMain = function(left, top, htmlElement)