merging 9966 to the trunk

This commit is contained in:
tworrall 2012-07-11 16:40:14 +00:00
parent 732617f62f
commit 46d5b47e92
5 changed files with 29 additions and 3 deletions

View file

@ -81,9 +81,11 @@
});
var descendants = "";
var headerSpan = "";
var closingTable = "</table>";
if ( this.children.length ) {
descendants = classHierarchyUtils.getTheChildren(this);
closingTable = "";
headerSpan = "<span class='headerSpanPlus' id='headerSpan" + classHierarchyUtils.classCounter
+ "' view='less'>&nbsp;</span>";
}
@ -102,10 +104,14 @@
classHierarchyUtils.classHtml += "<tr><td class='classDetail'>Ontology:</td><td>" + this.data.ontology + "</td></tr>";
if ( descendants.length > 1 ) {
descendants = descendants.substring(0, descendants.length - 10);
}
classHierarchyUtils.classHtml += descendants;
classHierarchyUtils.classHtml += "</table>";
// alert(classHierarchyUtils.classHtml);
classHierarchyUtils.classHtml += closingTable;
// alert(classHierarchyUtils.classHtml);
$newClassSection.html(classHierarchyUtils.classHtml);
$newClassSection.appendTo($('section#container'));
classHierarchyUtils.makeHeaderSpansClickable(classHierarchyUtils.classCounter);

View file

@ -126,9 +126,11 @@
});
var descendants = "";
var headerSpan = "";
var closingTable = "</table>";
if ( this.children.length ) {
descendants = objectPropHierarchyUtils.getTheChildren(this);
closingTable = "";
headerSpan = "<span class='headerSpanPlus' id='headerSpan" + objectPropHierarchyUtils.classCounter
+ "' view='less'>&nbsp;</span>";
}
@ -148,10 +150,13 @@
objectPropHierarchyUtils.classHtml += "<span class='rangeClass'>Range Class:</span>"
+ (this.data.rangeVClass.length > 0 ? this.data.rangeVClass : "none" ) + "</td></tr>";
if ( descendants.length > 1 ) {
descendants = descendants.substring(0, descendants.length - 10);
}
objectPropHierarchyUtils.classHtml += descendants;
objectPropHierarchyUtils.classHtml += "</table>";
objectPropHierarchyUtils.classHtml += closingTable;
// alert(objectPropHierarchyUtils.classHtml);
$newClassSection.html(objectPropHierarchyUtils.classHtml);
$newClassSection.appendTo($('section#container'));