corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 309848 - Three minor bugs in help viewer's parsing of help content packs. r=mano

Browse Source
This commit is contained in:
jwalden@mit.edu
2005-10-11 13:46:11 +00:00
parent c9a3682aad
commit 7c4169fee3
1 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
toolkit/components/help/content/help.js
View File

@@ -239,23 +239,24 @@ function loadHelpRDF() {
var iterator = RDFContainer.GetElements();
while (iterator.hasMoreElements()) {
var panelDef = iterator.getNext();
var panelID = getAttribute(helpFileDS, panelDef, NC_PANELID, null);
var datasources = getAttribute(helpFileDS, panelDef, NC_DATASOURCES, "");
// if datasources is "", there's nothing to load
var panelID = getAttribute(helpFileDS, panelDef, NC_PANELID, null);
var datasources = getAttribute(helpFileDS, panelDef, NC_DATASOURCES, "");
var panelPlatforms = getAttribute(helpFileDS, panelDef, NC_PLATFORM, platform);
if (panelPlatforms.split(/\s+/).indexOf(platform) == -1)
continue; // ignore datasources for other platforms
// empty datasources are valid on search panel definitions
// convert them to "rdf:null" which can be filtered and ignored
if (!datasources)
continue;
datasources = "rdf:null";
datasources = normalizeLinks(helpBaseURI, datasources);
var panelPlatforms = getAttribute(helpFileDS, panelDef, NC_PLATFORM, platform);
panelPlatforms = panelPlatforms.split(/\s+/);
if (panelPlatforms.indexOf(platform) == -1)
continue; // ignore datasources for other platforms
var datasourceArray = datasources.split(/\s+/)
.map(RDF.GetDataSourceBlocking);
.filter(function(x) { return x != "rdf:null"; })
.map(RDF.GetDataSourceBlocking);
// Cache Additional Datasources to Augment Search Datasources.
if (panelID == "search") {
@@ -333,7 +334,7 @@ function filterSeqByPlatform(aDatasource, aNode, aCurrentLevel) {
NC_PLATFORM,
platform);
if (nodePlatforms.indexOf(platform) == -1) { // node is for another platform
if (nodePlatforms.split(/\s+/).indexOf(platform) == -1) { // node is for another platform
var currentNode = currentTarget.QueryInterface(Components.interfaces.nsIRDFNode);
// "false" because we don't want to renumber elements in the container
RDFC.RemoveElement(currentNode, false);
@@ -378,7 +379,8 @@ function getLink(ID) {
// URIs include both the ID part and the base file name,
// so we need to check for a matching ID in each datasource
var tocDSArray = gTocDSList.split(/\s+/);
var tocDSArray = gTocDSList.split(/\s+/)
.filter(function(x) { return x != "rdf:null"; });
for (var i = 0; i < tocDSArray.length; i++) {
var resource = RDF.GetResource(tocDSArray[i] + "#" + ID);