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

Excel/model/DrawingObjects/States.js

@@ -1797,9 +1797,13 @@ function ResizeState(drawingObjectsController, drawingObjects, majorObject, card
     this.onMouseUp = function(e, x, y)
     {
 
+        var isViewMode = this.drawingObjectsController.drawingObjects.isViewerMode();
         var worksheet = this.drawingObjects.getWorksheet();
 		this.drawingObjects.objectLocker.reset();
         var track_objects = this.drawingObjectsController.arrTrackObjects;
+
+        if(!isViewMode)
+        {
             for(var i =0; i < track_objects.length; ++i)
             {
                 this.drawingObjects.objectLocker.addObjectId(track_objects[i].originalObject.Get_Id());
@@ -1824,6 +1828,7 @@ function ResizeState(drawingObjectsController, drawingObjects, majorObject, card
                 }
             };
             this.drawingObjects.objectLocker.checkObjects(callback);
+        }
 
         //History.Create_NewPoint();
         //this.drawingObjectsController.trackEnd();
@@ -2297,9 +2302,12 @@ function MoveState(drawingObjectsController, drawingObjects, startX, startY, rec
 
     this.onMouseUp = function(e, x, y)
     {
+        var isViewMode = this.drawingObjectsController.drawingObjects.isViewerMode();
         var worksheet = this.drawingObjects.getWorksheet();
 		this.drawingObjects.objectLocker.reset();
         var track_objects = this.drawingObjectsController.arrTrackObjects;
+        if(!isViewMode)
+        {
             for(var i =0; i < track_objects.length; ++i)
             {
                 this.drawingObjects.objectLocker.addObjectId(track_objects[i].originalObject.Get_Id());
@@ -2324,6 +2332,7 @@ function MoveState(drawingObjectsController, drawingObjects, startX, startY, rec
             };
             this.drawingObjects.objectLocker.checkObjects(callback);
 
+        }
         //History.Create_NewPoint();
         //this.drawingObjectsController.trackEnd();
         this.drawingObjectsController.clearTrackObjects();
@@ -2420,6 +2429,10 @@ function ChangeAdjState(drawingObjectsController, drawingObjects)
     this.onMouseUp = function(e, x, y)
     {
         var worksheet = this.drawingObjects.getWorksheet();
+        var isViewMode = this.drawingObjectsController.drawingObjects.isViewerMode();
+
+        if(!isViewMode)
+        {
             this.drawingObjects.objectLocker.reset();
             var track_objects = this.drawingObjectsController.arrTrackObjects;
             for(var i =0; i < track_objects.length; ++i)
@@ -2444,6 +2457,7 @@ function ChangeAdjState(drawingObjectsController, drawingObjects)
                 }
             };
             this.drawingObjects.objectLocker.checkObjects(callback);
+        }
 		
         //History.Create_NewPoint();
         //this.drawingObjectsController.trackEnd();
@@ -2907,6 +2921,10 @@ function TextAddInGroup(drawingObjectsController, drawingObjects, group, textObj
     };
 
     this.onKeyPress = function(e)
+    {
+        var isViewMode = this.drawingObjectsController.drawingObjects.isViewerMode();
+
+        if(!isViewMode)
         {
             this.drawingObjects.objectLocker.reset();
             this.drawingObjects.objectLocker.addObjectId(this.group.Get_Id());
@@ -2926,6 +2944,7 @@ function TextAddInGroup(drawingObjectsController, drawingObjects, group, textObj
 
             //worksheet.collaborativeEditing.onEndCheckLock(callback);
             this.drawingObjects.objectLocker.checkObjects(callback);
+        }
         // this.textObject.paragraphAdd(new ParaText(String.fromCharCode(e.charCode)));
         // this.drawingObjects.showDrawingObjects(true);
         // this.textObject.updateSelectionState(this.drawingObjects.drawingDocument);
@@ -3205,6 +3224,10 @@ function MoveInGroupState(drawingObjectsController, drawingObjects, group, start
     {
 
         var worksheet = this.drawingObjects.getWorksheet();
+        var isViewMode = this.drawingObjectsController.drawingObjects.isViewerMode();
+
+        if(!isViewMode)
+        {
             this.drawingObjects.objectLocker.reset();
             this.drawingObjects.objectLocker.addObjectId(this.group.Get_Id());
             var track_objects2 = [];
@@ -3234,7 +3257,7 @@ function MoveInGroupState(drawingObjectsController, drawingObjects, group, start
                 }
             };
             this.drawingObjects.objectLocker.checkObjects(callback);
-		
+        }
         //this.drawingObjectsController.trackEnd();
        // this.group.normalize();
        // this.group.updateCoordinatesAfterInternalResize();
@@ -3330,6 +3353,10 @@ function ChangeAdjInGroupState(drawingObjectsController, drawingObjects, group)
 
 
         var worksheet = this.drawingObjects.getWorksheet();
+        var isViewMode = this.drawingObjectsController.drawingObjects.isViewerMode();
+
+        if(!isViewMode)
+        {
             this.drawingObjects.objectLocker.reset();
             this.drawingObjects.objectLocker.addObjectId(this.group.Get_Id());
             var track_objects2 = [];
@@ -3352,7 +3379,7 @@ function ChangeAdjInGroupState(drawingObjectsController, drawingObjects, group)
                 }
             };
             this.drawingObjects.objectLocker.checkObjects(callback);
-
+        }
         this.drawingObjectsController.clearTrackObjects();
         this.drawingObjects.OnUpdateOverlay();
         this.drawingObjectsController.changeCurrentState(new GroupState(this.drawingObjectsController, this.drawingObjects, this.group));
@@ -3441,6 +3468,10 @@ function RotateInGroupState(drawingObjectsController, drawingObjects, group, maj
 
         var worksheet = this.drawingObjects.getWorksheet();
 		this.drawingObjects.objectLocker.reset();
+        var isViewMode = this.drawingObjectsController.drawingObjects.isViewerMode();
+
+        if(!isViewMode)
+        {
             this.drawingObjects.objectLocker.addObjectId(this.group.Get_Id());
             var track_objects2 = [];
             for(var i = 0; i < this.drawingObjectsController.arrTrackObjects.length; ++i)
@@ -3469,7 +3500,7 @@ function RotateInGroupState(drawingObjectsController, drawingObjects, group, maj
                 }
             };
             this.drawingObjects.objectLocker.checkObjects(callback);
-		
+        }
         //this.drawingObjectsController.trackEnd();
         // this.group.normalize();
         // this.group.updateCoordinatesAfterInternalResize();