Commit 992e5d00 authored by Alexander.Trofimov's avatar Alexander.Trofimov Committed by Alexander.Trofimov

Поправил зависание на select (баг с файлом...

Поправил зависание на select (баг с файлом \\192.168.5.2\source\DOCUMENTS\XLS\BASKETBALL STATISTICS WORKBOOK V3.xls)
На scrollHorizontal

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@50562 954022d7-b5bf-4e40-9824-e11837661b57
parent 906c83c5
...@@ -4613,13 +4613,12 @@ ...@@ -4613,13 +4613,12 @@
scrollVertical: function (delta, editor) { scrollVertical: function (delta, editor) {
var vr = this.visibleRange; var vr = this.visibleRange;
var reinitScrollY = false;
var start = this._calcCellPosition(vr.c1, vr.r1, 0, delta).row; var start = this._calcCellPosition(vr.c1, vr.r1, 0, delta).row;
var fixStartRow = asc_Range(vr.c1, start, vr.c2, start); var fixStartRow = asc_Range(vr.c1, start, vr.c2, start);
fixStartRow.startCol = vr.c1; fixStartRow.startCol = vr.c1;
fixStartRow.startRow = start; fixStartRow.startRow = start;
this._fixSelectionOfHiddenCells(0, delta >= 0 ? +1 : -1, fixStartRow); this._fixSelectionOfHiddenCells(0, delta >= 0 ? +1 : -1, fixStartRow);
reinitScrollY = start !== fixStartRow.r1; var reinitScrollY = start !== fixStartRow.r1;
if (reinitScrollY && 0 > delta) // Для скролла вверх обычный сдвиг + дорисовка if (reinitScrollY && 0 > delta) // Для скролла вверх обычный сдвиг + дорисовка
delta += fixStartRow.r1 - start; delta += fixStartRow.r1 - start;
start = fixStartRow.r1; start = fixStartRow.r1;
...@@ -4716,13 +4715,12 @@ ...@@ -4716,13 +4715,12 @@
scrollHorizontal: function (delta, editor) { scrollHorizontal: function (delta, editor) {
var vr = this.visibleRange; var vr = this.visibleRange;
var reinitScrollX = false;
var start = this._calcCellPosition(vr.c1, vr.r1, delta, 0).col; var start = this._calcCellPosition(vr.c1, vr.r1, delta, 0).col;
var fixStartCol = asc_Range(start, vr.r1, start, vr.r1); var fixStartCol = asc_Range(start, vr.r1, start, vr.r2);
fixStartCol.startCol = start; fixStartCol.startCol = start;
fixStartCol.startRow = vr.r1; fixStartCol.startRow = vr.r1;
this._fixSelectionOfHiddenCells(0, delta >= 0 ? +1 : -1, fixStartCol); this._fixSelectionOfHiddenCells(delta >= 0 ? +1 : -1, 0, fixStartCol);
reinitScrollX = start !== fixStartCol.c1; var reinitScrollX = start !== fixStartCol.c1;
if (reinitScrollX && 0 > delta) // Для скролла влево обычный сдвиг + дорисовка if (reinitScrollX && 0 > delta) // Для скролла влево обычный сдвиг + дорисовка
delta += fixStartCol.c1 - start; delta += fixStartCol.c1 - start;
start = fixStartCol.c1; start = fixStartCol.c1;
......
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