Commit 935a5375 authored by konovalovsergey's avatar konovalovsergey

operation transformation mine/theirs changes, remove renameWsToCollaborate

parent 4bbaddbf
...@@ -165,7 +165,6 @@ function CHistory() ...@@ -165,7 +165,6 @@ function CHistory()
// Параметры для специального сохранения для локальной версии редактора // Параметры для специального сохранения для локальной версии редактора
this.UserSaveMode = false; this.UserSaveMode = false;
this.UserSavedIndex = null; // Номер точки, на которой произошло последнее сохранение пользователем (не автосохранение) this.UserSavedIndex = null; // Номер точки, на которой произошло последнее сохранение пользователем (не автосохранение)
this.changesFormula = {};
} }
CHistory.prototype.init = function(workbook) { CHistory.prototype.init = function(workbook) {
this.workbook = workbook; this.workbook = workbook;
...@@ -901,37 +900,6 @@ CHistory.prototype._CheckCanNotAddChanges = function () { ...@@ -901,37 +900,6 @@ CHistory.prototype._CheckCanNotAddChanges = function () {
} catch (e) { } catch (e) {
} }
}; };
CHistory.prototype.changesFormulaAdd = function(formula) {
this.changesFormula[formula.getListenerId()] = formula;
};
CHistory.prototype.changesFormulaBuildDep = function() {
for (var listenerId in this.changesFormula) {
this.changesFormula[listenerId].buildDependencies();
}
};
CHistory.prototype.changesFormulaRemoveDep = function() {
for (var listenerId in this.changesFormula) {
this.changesFormula[listenerId].removeDependencies();
}
this.changesFormula = {};
};
CHistory.prototype.onFormulaEvent = function(type, eventData) {
if (AscCommon.c_oNotifyParentType.CanDo === type) {
return true;
} else if (AscCommon.c_oNotifyParentType.Change === type) {
eventData.formula.setIsDirty(false);
} else if (AscCommon.c_oNotifyParentType.ChangeFormula === type) {
if (eventData.isRebuild) {
delete this.changesFormula[eventData.formula.getListenerId()];
eventData.formula = new AscCommonExcel.parserFormula(eventData.assemble, this, eventData.formula.ws);
eventData.formula.parse();
this.addFormula(eventData.formula);
} else {
eventData.formula.Formula = eventData.assemble;
}
eventData.formula.buildDependencies();
}
};
//------------------------------------------------------------export-------------------------------------------------- //------------------------------------------------------------export--------------------------------------------------
window['AscCommon'] = window['AscCommon'] || {}; window['AscCommon'] = window['AscCommon'] || {};
......
This diff is collapsed.
This diff is collapsed.
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