- Исправлен баг с очисткой заселекченного комментария при скроле

- При селекте комментария из левой панели выставляются нужные скролы(если комментарий вне видимого диапазона)

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

Excel/api.js

@@ -2205,7 +2205,7 @@ var ASC_DOCS_API_USE_EMBEDDED_FONTS = "@@ASC_DOCS_API_USE_EMBEDDED_FONTS";
 			
 			asc_selectComment: function(id) {
 				var ws = this.wb.getWorksheet();
-				ws.cellCommentator.asc_selectComment(id);
+				ws.cellCommentator.asc_selectComment(id, /*bMove*/true);
 			},
 			
 			asc_showComment: function(id, bNew) {

Excel/model/CellComment.js

@@ -715,7 +715,7 @@ function asc_CCellCommentator(currentSheet) {
 			drawCells[cellId] = cellId;
 		}
 		if (_this.lastSelectedId)
-			_this.asc_selectComment(_this.lastSelectedId);
+			_this.asc_selectComment(_this.lastSelectedId, false);
 	}
 
 	_this.getTextMetrics = function(text, units) {
@@ -957,12 +957,11 @@ function asc_CCellCommentator(currentSheet) {
 		
 		function updateCommentsList(aComments) {
 			if ( aComments.length ) {
+			
 				History.StartTransaction();
-				
 				for (var i = 0; i < aComments.length; i++) {
 					_this.asc_changeComment(aComments[i].asc_getId(), aComments[i]);
 				}
-				
 				History.EndTransaction();
 				_this.drawCommentCells();
 			}
@@ -1198,11 +1197,19 @@ function asc_CCellCommentator(currentSheet) {
 		_this.calcCommentsCoords(true);
 	}
 
-	_this.restoreRange = function(range) {
-		if ( range ) {
-			worksheet._drawGrid( drawingCtx, range);
-			worksheet._drawCells(range);
-			worksheet._drawCellsBorders(undefined, range);
+	_this.cleanSelectedComment = function() {
+		if ( _this.lastSelectedId ) {
+			var comment = _this.asc_findComment(_this.lastSelectedId);
+			if ( comment && !comment.asc_getDocumentFlag() && !comment.asc_getSolved() ) {
+				var metrics = _this.getCellMetrics(comment.asc_getCol(), comment.asc_getRow());
+				if (metrics.result) {
+					var x = _this.pxToPt(metrics.left);
+					var y = _this.pxToPt(metrics.top);
+					var w = _this.pxToPt(metrics.width);
+					var h = _this.pxToPt(metrics.height);
+					_this.overlayCtx.clearRect(x, y, w, h);
+				}
+			}
 		}
 	}
 	
@@ -1294,7 +1301,7 @@ asc_CCellCommentator.prototype = {
 			_this.lastSelectedId = null;
 	},
 
-	asc_selectComment: function(id) {
+	asc_selectComment: function(id, bMove) {
 
 		var _this = this;
 		_this.lastSelectedId = null;
@@ -1302,7 +1309,25 @@ asc_CCellCommentator.prototype = {
 
 		if (comment && !comment.asc_getDocumentFlag() && !comment.asc_getSolved()) {
 			_this.lastSelectedId = id;
-			var metrics = _this.getCellMetrics(comment.asc_getCol(), comment.asc_getRow());
+			
+			var col = comment.asc_getCol();
+			var row = comment.asc_getRow();
+			var vr = _this.worksheet.visibleRange;
+			
+			if ( bMove ) {
+				if ( (row < vr.r1) || (row > vr.r2) ) {
+					var offset = row - vr.r1 - ( vr.r2 - vr.r1 ) / 2;
+					_this.worksheet.scrollVertical(offset);
+					_this.worksheet._trigger("reinitializeScrollY");
+				}
+				if ( (col < vr.c1) || (col > vr.c2) ) {
+					var offset = col - vr.c1 - ( vr.c2 - vr.c1 ) / 2;
+					_this.worksheet.scrollHorizontal(offset);
+					_this.worksheet._trigger("reinitializeScrollX");
+				}
+			}
+			
+			var metrics = _this.getCellMetrics(col, row);
 			if (metrics.result) {
 
 				var rangeOffset = 0;

Excel/view/WorksheetView.js

@@ -4736,6 +4736,7 @@
 				if (start === vr.r1) {return this;}
 
 				this.cleanSelection();
+				this.cellCommentator.cleanSelectedComment();
 
 				var ctx = this.drawingCtx;
 				var ctxW   = ctx.getWidth();
@@ -4818,7 +4819,7 @@
 				this.cellCommentator.updateCommentPosition();
 				//ToDo this.drawDepCells();
 				this._drawGraphic();
-				this.objectRender.showDrawingObjects(false);
+				this.objectRender.showDrawingObjects(true);
 				return this;
 			},
 
@@ -4838,6 +4839,7 @@
 				if (start === vr.c1) {return this;}
 
 				this.cleanSelection();
+				this.cellCommentator.cleanSelectedComment();
 
 				var ctx = this.drawingCtx;
 				var ctxW    = ctx.getWidth();
@@ -4883,7 +4885,7 @@
 				this.cellCommentator.updateCommentPosition();
 				//ToDo this.drawDepCells();
 				this._drawGraphic();
-				this.objectRender.showDrawingObjects(false);
+				this.objectRender.showDrawingObjects(true);
 				return this;
 			},