Commit 4d1b56bd authored by Dmitry.Shahtanov's avatar Dmitry.Shahtanov Committed by Alexander.Trofimov

fixed: Bug 25686 - При клике по границе диапазона данных после undo, он сбрасывается на отмененный

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@57588 954022d7-b5bf-4e40-9824-e11837661b57
parent 8e87f009
...@@ -436,7 +436,8 @@ ...@@ -436,7 +436,8 @@
this.startCellMoveResizeRange = null; this.startCellMoveResizeRange = null;
this.startCellMoveResizeRange2 = null; this.startCellMoveResizeRange2 = null;
this.moveRangeDrawingObjectTo = null;
// Координаты ячейки начала перемещения диапазона // Координаты ячейки начала перемещения диапазона
this.startCellMoveRange = null; this.startCellMoveRange = null;
// Дипазон перемещения // Дипазон перемещения
...@@ -7660,8 +7661,7 @@ ...@@ -7660,8 +7661,7 @@
if (null === this.startCellMoveResizeRange) { if (null === this.startCellMoveResizeRange) {
if ((targetInfo.cursor == kCurNEResize || targetInfo.cursor == kCurSEResize)) { if ((targetInfo.cursor == kCurNEResize || targetInfo.cursor == kCurSEResize)) {
this.startCellMoveResizeRange = ar.clone(true); this.startCellMoveResizeRange = ar.clone(true);
this.startCellMoveResizeRange2 = asc_Range(targetInfo.col, targetInfo.row, this.startCellMoveResizeRange2 = asc_Range(targetInfo.col, targetInfo.row, targetInfo.col, targetInfo.row, true);
targetInfo.col, targetInfo.row, true);
} else { } else {
this.startCellMoveResizeRange = ar.clone(true); this.startCellMoveResizeRange = ar.clone(true);
if (colByX < ar.c1) { colByX = ar.c1; } if (colByX < ar.c1) { colByX = ar.c1; }
...@@ -7804,11 +7804,13 @@ ...@@ -7804,11 +7804,13 @@
}; };
WorksheetView.prototype.applyMoveResizeRangeHandle = function (target){ WorksheetView.prototype.applyMoveResizeRangeHandle = function (target){
if( -1 == target.targetArr ) if( -1 == target.targetArr && !this.startCellMoveResizeRange.isEqual(this.moveRangeDrawingObjectTo) ) {
this.objectRender.moveRangeDrawingObject(this.startCellMoveResizeRange, this.moveRangeDrawingObjectTo, true); this.objectRender.moveRangeDrawingObject( this.startCellMoveResizeRange, this.moveRangeDrawingObjectTo, true );
}
this.startCellMoveResizeRange = null; this.startCellMoveResizeRange = null;
this.startCellMoveResizeRange2 = null; this.startCellMoveResizeRange2 = null;
this.moveRangeDrawingObjectTo = null;
}; };
WorksheetView.prototype.moveRangeHandle = function (arnFrom, arnTo, copyRange){ WorksheetView.prototype.moveRangeHandle = function (arnFrom, arnTo, copyRange){
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment