Bug 24709 - После открытия контекстного меню для группы и отдельной...

Bug 24709 - После открытия контекстного меню для группы и отдельной автофигуры, выделение сбрасывается с объектов 

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

Common/Drawings/ColorArray.js

 "use strict";
 
-function CShapeColor(r, g, b)
-{
+function CShapeColor(r, g, b){
     this.r = r;
     this.g = g;
     this.b = b;
 
-    this.darken = function()
+    this.darken = function ()
     {
         var hslColor  = RGBToHSL(this);
-        hslColor.l*=0.9;
+        hslColor.l *= 0.9;
 
         return HSLToRGB(hslColor);
     };
 
-    this.darkenLess = function()
+    this.darkenLess = function ()
     {
         var hslColor  = RGBToHSL(this);
-        hslColor.l*=0.85;
+        hslColor.l *= 0.85;
 
         return HSLToRGB(hslColor);
     };
 
-    this.lighten  = function()
-    {
+        this.lighten  = function () {
         var hslColor  = RGBToHSL(this);
-        hslColor.l*= 1.1;
+        hslColor.l *= 1.1;
         if(hslColor.l > 1)
         {
             hslColor.l = 1;

Common/Drawings/DrawingObjectsHandlers.js

@@ -318,7 +318,7 @@ function handleMouseUpPreMoveState(drawingObjects, e, x, y, pageIndex, bWord)
     var state = drawingObjects.curState;
     state.drawingObjects.clearPreTrackObjects();
     state.drawingObjects.changeCurrentState(new NullState(state.drawingObjects));
-    if(!state.shift && !state.ctrl && state.bInside && state.majorObjectIsSelected)
+    if(!state.shift && !state.ctrl && state.bInside && state.majorObjectIsSelected && e.Button !== g_mouse_button_right)
     {
         switch (state.majorObject.getObjectType())
         {

Excel/view/DrawingObjectsController.js

@@ -278,6 +278,7 @@ DrawingObjectsController.prototype.onMouseDown = function(e, x, y)
 {
     e.ShiftKey = e.shiftKey;
     e.CtrlKey = e.metaKey || e.ctrlKey;
+    e.Button = e.button;
     var ret = this.curState.onMouseDown(e, x, y, 0);
     this.updateOverlay();
     this.updateSelectionState();
@@ -290,6 +291,7 @@ DrawingObjectsController.prototype.onMouseMove = function(e, x, y)
 {
     e.ShiftKey = e.shiftKey;
     e.CtrlKey = e.metaKey || e.ctrlKey;
+    e.Button = e.button;
     this.curState.onMouseMove(e, x, y, 0);
 };
 DrawingObjectsController.prototype.OnMouseMove = DrawingObjectsController.prototype.onMouseMove;
@@ -299,6 +301,7 @@ DrawingObjectsController.prototype.onMouseUp = function(e, x, y)
 {
     e.ShiftKey = e.shiftKey;
     e.CtrlKey = e.metaKey || e.ctrlKey;
+    e.Button = e.button;
     this.curState.onMouseUp(e, x, y, 0);
 };
 DrawingObjectsController.prototype.OnMouseUp = DrawingObjectsController.prototype.onMouseUp;