Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

if the user has a sidebar.rdf file in there profile directory, use that.

Browse Source 
otherwise, use the global.  slamm is going to work on *writing* out $PROFILE/sidbar.rdf next.


git-svn-id: svn://10.0.0.236/trunk@47829 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
sspitzer%netscape.com 1999-09-16 20:38:26 +00:00
parent 17201cb709
commit baee37737a
2 changed files with 50 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
mozilla/suite/common/sidebar/sidebarOverlay.js
View File

@ -33,7 +33,8 @@ var RDF = Components.classes['component://netscape/rdf/rdf-service'].getService(
RDF = RDF.QueryInterface(Components.interfaces.nsIRDFService)
var defaultsidebar = new Object
defaultsidebar.db = 'chrome://sidebar/content/sidebar.rdf'
defaultsidebar.db = null;
var default_sidebar_db = 'chrome://sidebar/content/sidebar.rdf'
defaultsidebar.resource = 'NC:SidebarRoot'
// the current sidebar:
@ -41,6 +42,29 @@ var sidebar;
function sidebarOverlayInit(usersidebar)
{
defaultsidebar.db = default_sidebar_db;
try
{
profileService = Components.classes['component://netscape/profile/manager'].getService();
profileService = profileService.QueryInterface(Components.interfaces.nsIProfile);
var sidebar_url = profileService.getCurrentProfileDirFromJS();
sidebar_url.URLString += "sidebar.rdf";
if (!(sidebar_url.exists())) {
dump("using default, " + sidebar_url.URLString + "does not exist\n");
defaultsidebar.db = default_sidebar_db;
}
else {
dump("sidebar url is " + sidebar_url.URLString + "\n");
defaultsidebar.db = sidebar_url.URLString;
}
}
catch (ex)
{
dump("failed to get sidebar url, using default\n");
defaultsidebar.db = default_sidebar_db;
}
var sidebar_element = document.getElementById('sidebarbox');
if (sidebar_element.getAttribute('hidden')) {
return

26
mozilla/xpfe/components/sidebar/resources/sidebarOverlay.js
View File

@ -33,7 +33,8 @@ var RDF = Components.classes['component://netscape/rdf/rdf-service'].getService(
RDF = RDF.QueryInterface(Components.interfaces.nsIRDFService)
var defaultsidebar = new Object
defaultsidebar.db = 'chrome://sidebar/content/sidebar.rdf'
defaultsidebar.db = null;
var default_sidebar_db = 'chrome://sidebar/content/sidebar.rdf'
defaultsidebar.resource = 'NC:SidebarRoot'
// the current sidebar:
@ -41,6 +42,29 @@ var sidebar;
function sidebarOverlayInit(usersidebar)
{
defaultsidebar.db = default_sidebar_db;
try
{
profileService = Components.classes['component://netscape/profile/manager'].getService();
profileService = profileService.QueryInterface(Components.interfaces.nsIProfile);
var sidebar_url = profileService.getCurrentProfileDirFromJS();
sidebar_url.URLString += "sidebar.rdf";
if (!(sidebar_url.exists())) {
dump("using default, " + sidebar_url.URLString + "does not exist\n");
defaultsidebar.db = default_sidebar_db;
}
else {
dump("sidebar url is " + sidebar_url.URLString + "\n");
defaultsidebar.db = sidebar_url.URLString;
}
}
catch (ex)
{
dump("failed to get sidebar url, using default\n");
defaultsidebar.db = default_sidebar_db;
}
var sidebar_element = document.getElementById('sidebarbox');
if (sidebar_element.getAttribute('hidden')) {
return