Commit 0e48416e authored by Alexander.Trofimov's avatar Alexander.Trofimov Committed by Alexander.Trofimov

Поправил баг с выделением: http://bugzserver/show_bug.cgi?id=24522

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@56431 954022d7-b5bf-4e40-9824-e11837661b57
parent 3caedd4d
...@@ -6668,7 +6668,7 @@ ...@@ -6668,7 +6668,7 @@
}; };
WorksheetView.prototype.setSelectionUndoRedo = function (range, validRange) { WorksheetView.prototype.setSelectionUndoRedo = function (range, validRange) {
var ar = this.activeRange = (range instanceof asc_ActiveRange) ? range.clone() : new asc_ActiveRange(range); var ar = (range instanceof asc_ActiveRange) ? range.clone() : new asc_ActiveRange(range);
// Проверка на валидность range. // Проверка на валидность range.
if (validRange && (ar.c2 >= this.nColsCount || ar.r2 >= this.nRowsCount)) { if (validRange && (ar.c2 >= this.nColsCount || ar.r2 >= this.nRowsCount)) {
...@@ -6678,10 +6678,12 @@ ...@@ -6678,10 +6678,12 @@
this.expandRowsOnScroll(false, true, ar.r2 + 1); this.expandRowsOnScroll(false, true, ar.r2 + 1);
} }
var oRes = null; var oRes = null;
var type = this.activeRange.type; var type = ar.type;
if (type == c_oAscSelectionType.RangeCells || type == c_oAscSelectionType.RangeCol || if (type == c_oAscSelectionType.RangeCells || type == c_oAscSelectionType.RangeCol ||
type == c_oAscSelectionType.RangeRow || type == c_oAscSelectionType.RangeMax) { type == c_oAscSelectionType.RangeRow || type == c_oAscSelectionType.RangeMax) {
this.updateSelection(); this.cleanSelection();
this.activeRange = ar;
this._drawSelection();
this.handlers.trigger("selectionNameChanged", this.getSelectionName(/*bRangeText*/false)); this.handlers.trigger("selectionNameChanged", this.getSelectionName(/*bRangeText*/false));
this.handlers.trigger("selectionChanged", this.getSelectionInfo()); this.handlers.trigger("selectionChanged", this.getSelectionInfo());
......
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