Commit 00ad06af authored by Sergey Luzyanin's avatar Sergey Luzyanin Committed by Alexander.Trofimov

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

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