Commit ebe0262a authored by Sergey Luzyanin's avatar Sergey Luzyanin

Неправильно зарезолвился конфликт

parent 5f7370a3
......@@ -5394,24 +5394,24 @@
return;
}
if ( !this.depDrawCells ) {
this.depDrawCells = {};
}
if ( se == AscCommonExcel.c_oAscDrawDepOptions.Master ) {
c = c.getCells()[0];
var id = getVertexId( this.model.getId(), c.getName() );
var id = getVertexId(this.model.getId(), c.getName());
this.depDrawCells[id] = {from: c, to: nodes};
} else {
var to = {}, to1, id = getVertexId(this.model.getId(), c.getName());
to[getVertexId(this.model.getId(), c.getName())] =
this.model.workbook.dependencyFormulas.getNode(this.model.getId(), c.getName());
to1 = this.model.workbook.dependencyFormulas.getNode(this.model.getId(), c.getName());
for (var id2 in nodes) {
if (this.depDrawCells[id2]) {
//$.extend(this.depDrawCells[id2].to, to);
//ToDo убрал $.extend. Это место вообще не работает.
} else {
}
else {
var to = {}, to1, id = getVertexId( this.model.getId(), c.getName() );
to[getVertexId( this.model.getId(), c.getName() )] = this.model.workbook.dependencyFormulas.getNode( this.model.getId(), c.getName() );
to1 = this.model.workbook.dependencyFormulas.getNode( this.model.getId(), c.getName() );
for ( var id2 in nodes ) {
if ( this.depDrawCells[id2] ) {
$.extend( this.depDrawCells[id2].to, to )
}
else {
this.depDrawCells[id2] = {}
this.depDrawCells[id2].from = nodes[id2].returnCell()
this.depDrawCells[id2].to = {}
......@@ -5420,6 +5420,7 @@
}
}
this.drawDepCells();
};
WorksheetView.prototype.cleanDepCells = 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