Commit b90efd53 authored by Alexander.Trofimov's avatar Alexander.Trofimov

fix bug 33608 🐛

parent c5828af2
......@@ -1881,6 +1881,7 @@
this.countFindAll = 0;
this.countReplaceAll = 0;
this.sheetIndex = -1;
this.error = false;
}
asc_CFindOptions.prototype.clone = function () {
var result = new asc_CFindOptions();
......@@ -1902,6 +1903,7 @@
result.countFindAll = this.countFindAll;
result.countReplaceAll = this.countReplaceAll;
result.sheetIndex = this.sheetIndex;
result.error = this.error;
return result;
};
asc_CFindOptions.prototype.isEqual = function (obj) {
......@@ -1913,6 +1915,7 @@
asc_CFindOptions.prototype.clearFindAll = function () {
this.countFindAll = 0;
this.countReplaceAll = 0;
this.error = false;
};
asc_CFindOptions.prototype.updateFindAll = function () {
this.countFindAll += this.countFind;
......
......@@ -2246,6 +2246,7 @@
ws.replaceCellText(options, false, this.fReplaceCallback);
};
WorkbookView.prototype._replaceCellTextCallback = function(options) {
if (!options.error) {
options.updateFindAll();
if (!options.scanOnOnlySheet && options.isReplaceAll) {
// Замена на всей книге
......@@ -2262,6 +2263,7 @@
}
this.handlers.trigger("asc_onRenameCellTextEnd", options.countFindAll, options.countReplaceAll);
}
History.EndTransaction();
if (options.isReplaceAll) {
......
......@@ -10599,8 +10599,12 @@
newValue = [];
newValue[0] = new AscCommonExcel.Fragment({text: cellValue, format: v[0].format.clone()});
t._saveCellValueAfterEdit(oCellEdit, c, newValue, /*flags*/undefined, /*skipNLCheck*/false,
/*isNotHistory*/true, /*lockDraw*/true);
if (!t._saveCellValueAfterEdit(oCellEdit, c, newValue, /*flags*/undefined, /*skipNLCheck*/false,
/*isNotHistory*/true, /*lockDraw*/true)) {
options.error = true;
t.draw(lockDraw);
return callback(options);
}
}
window.setTimeout(function () {
......
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