Commit 3b094a29 authored by Alexander.Trofimov's avatar Alexander.Trofimov

fix bug 34472

parent 97f382b1
...@@ -873,10 +873,6 @@ ...@@ -873,10 +873,6 @@
return res; return res;
}; };
SelectionRange.prototype.isEqual = function (range) { SelectionRange.prototype.isEqual = function (range) {
return false;
// todo return this.activeCell.isEqual(range.cell);
};
SelectionRange.prototype.isEqual2 = function(range) {
if (this.activeCellId !== range.activeCellId || !this.activeCell.isEqual(range.activeCell) || if (this.activeCellId !== range.activeCellId || !this.activeCell.isEqual(range.activeCell) ||
this.ranges.length !== range.ranges.length) { this.ranges.length !== range.ranges.length) {
return false; return false;
......
...@@ -897,7 +897,7 @@ ...@@ -897,7 +897,7 @@
WorkbookView.prototype._updateSelectionInfo = function () { WorkbookView.prototype._updateSelectionInfo = function () {
var ws = this.cellFormulaEnterWSOpen ? this.cellFormulaEnterWSOpen : this.getWorksheet(); var ws = this.cellFormulaEnterWSOpen ? this.cellFormulaEnterWSOpen : this.getWorksheet();
this.oSelectionInfo = ws.getSelectionInfo(); this.oSelectionInfo = ws.getSelectionInfo();
this.lastSendInfoRange = ws.model.selectionRange.getLast().clone(true); this.lastSendInfoRange = ws.model.selectionRange.clone();
this.lastSendInfoRangeIsSelectOnShape = ws.getSelectionShape(); this.lastSendInfoRangeIsSelectOnShape = ws.getSelectionShape();
}; };
WorkbookView.prototype._onWSSelectionChanged = function() { WorkbookView.prototype._onWSSelectionChanged = function() {
...@@ -1006,7 +1006,7 @@ ...@@ -1006,7 +1006,7 @@
// Проверим, нужно ли отсылать информацию о ячейке // Проверим, нужно ли отсылать информацию о ячейке
var ar = ws.model.selectionRange.getLast(); var ar = ws.model.selectionRange.getLast();
var isSelectOnShape = ws.getSelectionShape(); var isSelectOnShape = ws.getSelectionShape();
if (!this._isEqualRange(ar, isSelectOnShape)) { if (!this._isEqualRange(ws.model.selectionRange, isSelectOnShape)) {
this._onWSSelectionChanged(); this._onWSSelectionChanged();
this._onSelectionMathInfoChanged(ws.getSelectionMathInfo()); this._onSelectionMathInfoChanged(ws.getSelectionMathInfo());
} }
......
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