Skip to content

Commit 8439f8c

Browse files
committed
Fix toc vis errors when no toc items exist
1 parent 0f75b1b commit 8439f8c

File tree

1 file changed

+22
-12
lines changed

1 file changed

+22
-12
lines changed

system/application/views/melons/cantaloupe/js/scalarvisualizations.jquery.js

Lines changed: 22 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -982,8 +982,10 @@
982982
node.connectionCount = subRels.length;
983983
base.maxConnections = Math.max( base.maxConnections, node.connectionCount );
984984
}
985-
node.connectionCount = base.relations.length;
986-
base.maxConnections = Math.max( base.maxConnections, node.connectionCount );
985+
if (n > 0) {
986+
node.connectionCount = base.relations.length;
987+
base.maxConnections = Math.max( base.maxConnections, node.connectionCount );
988+
}
987989
}
988990
break;
989991

@@ -1492,10 +1494,12 @@
14921494

14931495
base.parentIdForHierarchyNode = function(d) {
14941496
var parentId;
1495-
if (d.parent.node == null) {
1496-
parentId = d.parent.title;
1497-
} else {
1498-
parentId = d.parent.node.slug;
1497+
if (d.parent != null) {
1498+
if (d.parent.node == null) {
1499+
parentId = d.parent.title;
1500+
} else {
1501+
parentId = d.parent.node.slug;
1502+
}
14991503
}
15001504
return parentId;
15011505
}
@@ -2145,15 +2149,19 @@
21452149
if (base.isHierarchyNodeMaximized(d)) {
21462150
d._children = d.children;
21472151
d.children = null;
2148-
var index = d.node.parentsOfMaximizedInstances.indexOf(parentId);
2149-
if (index != -1) {
2150-
d.node.parentsOfMaximizedInstances.splice(index, 1);
2152+
if (d.node != null) {
2153+
var index = d.node.parentsOfMaximizedInstances.indexOf(parentId);
2154+
if (index != -1) {
2155+
d.node.parentsOfMaximizedInstances.splice(index, 1);
2156+
}
21512157
}
21522158
} else {
21532159
d.children = d._children;
21542160
d._children = null;
2155-
if (d.node.parentsOfMaximizedInstances.indexOf(parentId) == -1) {
2156-
d.node.parentsOfMaximizedInstances.push(parentId);
2161+
if (d.node != null) {
2162+
if (d.node.parentsOfMaximizedInstances.indexOf(parentId) == -1) {
2163+
d.node.parentsOfMaximizedInstances.push(parentId);
2164+
}
21572165
}
21582166
}
21592167
}
@@ -2184,7 +2192,9 @@
21842192
if ( base.options.content != "all" ) {
21852193
if ( base.hierarchy.children ) {
21862194
base.hierarchy.children.forEach( function( d ) {
2187-
d.children.forEach( branchConformAll );
2195+
if (d.children != null) {
2196+
d.children.forEach( branchConformAll );
2197+
}
21882198
});
21892199
}
21902200

0 commit comments

Comments
 (0)