Commit 7e8ed194 authored by Sergey.Konovalov's avatar Sergey.Konovalov Committed by Alexander.Trofimov

getNodeDependence сначала одинарные ячейки, потом area.

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@53906 954022d7-b5bf-4e40-9824-e11837661b57
parent 625e6899
...@@ -516,7 +516,6 @@ DependencyGraph.prototype = { ...@@ -516,7 +516,6 @@ DependencyGraph.prototype = {
var node; var node;
var elem; var elem;
var oSheetRanges = {}; var oSheetRanges = {};
var bInArea = false;
while ( null != aElems ) { while ( null != aElems ) {
for ( var i in aElems ) { for ( var i in aElems ) {
elem = aElems[i]; elem = aElems[i];
...@@ -527,7 +526,7 @@ DependencyGraph.prototype = { ...@@ -527,7 +526,7 @@ DependencyGraph.prototype = {
node = this.getNode(sheetId, cellId); node = this.getNode(sheetId, cellId);
if ( node && null == oRes.oWeightMap[node.nodeId] ) { if ( node && null == oRes.oWeightMap[node.nodeId] ) {
//все node из aElems записываем в master //все node из aElems записываем в master
var oWeightMapElem = {cur:0, max:0, gray:false, bad:false, master:true, area:bInArea}; var oWeightMapElem = {cur:0, max:0, gray:false, bad:false, master:true, area:node.isArea};
aWeightMapMasters.push( oWeightMapElem ); aWeightMapMasters.push( oWeightMapElem );
aWeightMapMastersNodes.push( node ); aWeightMapMastersNodes.push( node );
oRes.oWeightMap[node.nodeId] = oWeightMapElem; oRes.oWeightMap[node.nodeId] = oWeightMapElem;
...@@ -535,7 +534,6 @@ DependencyGraph.prototype = { ...@@ -535,7 +534,6 @@ DependencyGraph.prototype = {
} }
} }
aElems = null; aElems = null;
bInArea = true;
//расширяем за счет area nodes //расширяем за счет area nodes
for ( var i in oSheetRanges ) { for ( var i in oSheetRanges ) {
var oSheetRange = oSheetRanges[i]; var oSheetRange = oSheetRanges[i];
......
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