Fix Bug 23185 - Не отображается выделение ячеек после удаления графического объекта

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

Common/Charts/DrawingArea.js

@@ -549,8 +549,10 @@ function FrozenPlace(ws, type) {
 function DrawingArea(ws) {
 
 	var _this = this;
-	_this.worksheet = ws;
+	var asc = window["Asc"];
+	var api = asc["editor"];
 	
+	_this.worksheet = ws;
 	_this.frozenPlaces = [];
 	
 	// Methods
@@ -618,6 +620,9 @@ function DrawingArea(ws) {
 		_this.worksheet.overlayGraphicCtx.clear();
 		_this.worksheet._drawCollaborativeElements(false);
 		
+		if ( !_this.worksheet.objectRender.controller.selectedObjects.length && !api.isStartAddShape )
+			_this.worksheet._drawSelection();
+		
 		/*for ( var i = 0; i < _this.worksheet.objectRender.controller.selectedObjects.length; i++ ) {
 			if ( _this.worksheet.objectRender.controller.selectedObjects[i].isChart() ) {
 				_this.selectDrawingObjectRange(_this.controller.selectedObjects[i].Id);

Common/Charts/DrawingObjects.js

@@ -3470,8 +3470,6 @@ function DrawingObjects() {
 				if ( _this.controller.selectedObjects.length )
 					_this.OnUpdateOverlay();
 			}
-			else
-				worksheet._drawSelection();
 		}
 	}
 

Excel/view/WorksheetView.js

@@ -6143,12 +6143,11 @@
 			}
 
 			if (isCoord) {
-				isChangeSelectionShape = this._checkSelectionShape();
-
 				// move active range to coordinates x,y
 				this._moveActiveCellToXY(x, y);
-
-			} else {
+				isChangeSelectionShape = this._checkSelectionShape();
+			}
+			else {
 				// move active range to offset x,y
 				this._moveActiveCellToOffset(x, y);
 				ret = this._calcActiveRangeOffset();
@@ -6168,7 +6167,9 @@
 				}
 			}
 
-			this._drawSelection();
+			if ( !isChangeSelectionShape )
+				this._drawSelection();
+			
 			//ToDo this.drawDepCells();
 
 			return ret;