Commit 4132d89c authored by Dmitry.Shahtanov's avatar Dmitry.Shahtanov Committed by Alexander.Trofimov

Fixed issue #31820

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@68760 954022d7-b5bf-4e40-9824-e11837661b57
parent 7c5f77ec
...@@ -445,7 +445,7 @@ ...@@ -445,7 +445,7 @@
}; };
CellEditor.prototype.canEnterCellRange = function () { CellEditor.prototype.canEnterCellRange = function () {
var fR = this._findRangeUnderCursor() var fR = this._findRangeUnderCursor();
var isRange = (fR.range !== null && !fR.range.isName); var isRange = (fR.range !== null && !fR.range.isName);
var prevChar = this.textRender.getChars( this.cursorPos - 1, 1 ); var prevChar = this.textRender.getChars( this.cursorPos - 1, 1 );
return isRange || this.rangeChars.indexOf( prevChar ) >= 0; return isRange || this.rangeChars.indexOf( prevChar ) >= 0;
......
...@@ -2004,6 +2004,8 @@ ...@@ -2004,6 +2004,8 @@
}; };
WorkbookView.prototype.undo = function() { WorkbookView.prototype.undo = function() {
gFormulaLocaleParse = false;
gFormulaLocaleDigetSep = false;
if (!this.getCellEditMode()) { if (!this.getCellEditMode()) {
if (!History.Undo() && this.collaborativeEditing.getFast() && this.collaborativeEditing.getCollaborativeEditing()) { if (!History.Undo() && this.collaborativeEditing.getFast() && this.collaborativeEditing.getCollaborativeEditing()) {
this.Api.sync_TryUndoInFastCollaborative(); this.Api.sync_TryUndoInFastCollaborative();
...@@ -2011,6 +2013,8 @@ ...@@ -2011,6 +2013,8 @@
} else { } else {
this.cellEditor.undo(); this.cellEditor.undo();
} }
gFormulaLocaleParse = true;
gFormulaLocaleDigetSep = true;
}; };
WorkbookView.prototype.redo = function() { WorkbookView.prototype.redo = 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