diff --git a/mozilla/browser/app/profile/bookmarks.html b/mozilla/browser/app/profile/bookmarks.html
index 3cd3608a80f..5b9a0894813 100644
--- a/mozilla/browser/app/profile/bookmarks.html
+++ b/mozilla/browser/app/profile/bookmarks.html
@@ -7,7 +7,7 @@ Do Not Edit! -->
Bookmarks
-
-
+
Bookmarks Toolbar Folder
- Add bookmarks to this folder to see them displayed on the Bookmarks Toolbar
- Mozilla Firebird Help
diff --git a/mozilla/browser/base/content/browser.js b/mozilla/browser/base/content/browser.js
index d45d446f25b..1c189a6fea4 100644
--- a/mozilla/browser/base/content/browser.js
+++ b/mozilla/browser/base/content/browser.js
@@ -409,12 +409,13 @@ function delayedStartup()
}
#endif
- // now load bookmarks after a delay
- var hasRead = BMSVC.readBookmarks();
+ // now load bookmarks
+ BMSVC.readBookmarks();
var bt = document.getElementById("bookmarks-ptf");
if (bt) {
- if (hasRead)
- bt.builder.rebuild();
+ var btf = BMSVC.getBookmarksToolbarFolder().Value
+ bt.ref = btf;
+ document.getElementById("bookmarks-chevron").ref = btf;
bt.database.AddObserver(BookmarksToolbarRDFObserver);
}
window.addEventListener("resize", BookmarksToolbar.resizeFunc, false);
diff --git a/mozilla/browser/base/content/browser.xul b/mozilla/browser/base/content/browser.xul
index 786bbf2dad2..e4e4c423075 100644
--- a/mozilla/browser/base/content/browser.xul
+++ b/mozilla/browser/base/content/browser.xul
@@ -424,8 +424,7 @@
0 && !aSelection.containsImmutable;
default:
@@ -1099,46 +1089,12 @@ var BookmarksUtils = {
if (type != "")
type = type.split("#")[1];
if (type == "Folder") {
- if (this.isPersonalToolbarFolder(aResource))
+ if (aResource == BMSVC.getBookmarksToolbarFolder())
type = "PersonalToolbarFolder";
}
return type;
},
- /////////////////////////////////////////////////////////////////////////////
- // Returns true if aResource is the Personal Toolbar Folder
- isPersonalToolbarFolder: function (aResource) {
- return this.getProperty(aResource, NC_NS+"FolderType") == "NC:PersonalToolbarFolder";
- },
-
- /////////////////////////////////////////////////////////////////////////////
- // Returns the folder which 'FolderType' is aProperty
- getSpecialFolder: function (aProperty)
- {
- var sources = BMDS.GetSources(RDF.GetResource(NC_NS+"FolderType"),
- RDF.GetResource(aProperty), true);
- var folder = null;
- if (sources.hasMoreElements())
- folder = sources.getNext();
- else
- folder = RDF.GetResource("NC:BookmarksRoot");
- return folder;
- },
-
- /////////////////////////////////////////////////////////////////////////////
- // Returns the New Bookmark Folder
- getNewBookmarkFolder: function()
- {
- return this.getSpecialFolder("NC:NewBookmarkFolder");
- },
-
- /////////////////////////////////////////////////////////////////////////////
- // Returns the New Search Folder
- getNewSearchFolder: function()
- {
- return this.getSpecialFolder("NC:NewSearchFolder");
- },
-
/////////////////////////////////////////////////////////////////////////////
// Returns the container of a given container
getParentOfContainer: function(aChild)
diff --git a/mozilla/browser/components/bookmarks/content/bookmarksMenu.js b/mozilla/browser/components/bookmarks/content/bookmarksMenu.js
index ccbc1644583..e68ca9dca60 100644
--- a/mozilla/browser/components/bookmarks/content/bookmarksMenu.js
+++ b/mozilla/browser/components/bookmarks/content/bookmarksMenu.js
@@ -151,7 +151,7 @@ var BookmarksMenu = {
var item;
switch (aNode.id) {
case "bookmarks-ptf":
- item = "NC:PersonalToolbarFolder";
+ item = BMSVC.getBookmarksToolbarFolder().Value;
break;
case "bookmarks-menu":
item = "NC:BookmarksRoot";
@@ -179,14 +179,14 @@ var BookmarksMenu = {
var item, parent, index;
switch (aNode.id) {
case "bookmarks-ptf":
- parent = "NC:PersonalToolbarFolder";
+ parent = BMSVC.getBookmarksToolbarFolder().Value;
item = BookmarksToolbar.getLastVisibleBookmark();
break;
case "bookmarks-menu":
parent = "NC:BookmarksRoot";
break;
case "bookmarks-chevron":
- parent = "NC:PersonalToolbarFolder";
+ parent = BMSVC.getBookmarksToolbarFolder().Value;
break;
default:
if (aOrientation == BookmarksUtils.DROP_ON)
@@ -226,7 +226,7 @@ var BookmarksMenu = {
case "bookmarks-chevron":
case "bookmarks-stack":
case "bookmarks-toolbar":
- return "NC:PersonalToolbarFolder";
+ return BMSVC.getBookmarksToolbarFolder().Value;
case "bookmarks-menu":
return "NC:BookmarksRoot";
default:
@@ -880,6 +880,13 @@ var BookmarksToolbarRDFObserver =
{
onAssert: function (aDataSource, aSource, aProperty, aTarget)
{
+ if (aProperty.Value == NC_NS+"BookmarksToolbarFolder") {
+ var bt = document.getElementById("bookmarks-ptf");
+ if (bt) {
+ bt.ref = aSource.Value;
+ document.getElementById("bookmarks-chevron").ref = aSource.Value;
+ }
+ }
this.setOverflowTimeout(aSource, aProperty);
},
onUnassert: function (aDataSource, aSource, aProperty, aTarget)
@@ -896,7 +903,8 @@ var BookmarksToolbarRDFObserver =
{
if (this._overflowTimerInEffect)
return;
- if (aSource.Value != "NC:PersonalToolbarFolder" || aProperty.Value == NC_NS+"LastModifiedDate")
+ if (aSource != BMSVC.getBookmarksToolbarFolder()
+ || aProperty.Value == NC_NS+"LastModifiedDate")
return;
this._overflowTimerInEffect = true;
setTimeout(BookmarksToolbar.resizeFunc, 0);
diff --git a/mozilla/browser/components/bookmarks/content/bookmarksProperties.js b/mozilla/browser/components/bookmarks/content/bookmarksProperties.js
index f76f4b686e9..35b57e7b7fc 100644
--- a/mozilla/browser/components/bookmarks/content/bookmarksProperties.js
+++ b/mozilla/browser/components/bookmarks/content/bookmarksProperties.js
@@ -50,7 +50,7 @@ function showDescription()
gResource = RDF.GetResource(window.arguments[0]);
- if (BookmarksUtils.isPersonalToolbarFolder(gResource)) {
+ if (gResource == BMSVC.getBookmarksToolbarFolder()) {
var description = BookmarksUtils.getLocaleString("description_PersonalToolbarFolder");
var box = document.getElementById("description-box");
box.hidden = false;
diff --git a/mozilla/browser/components/bookmarks/content/bookmarksTree.xml b/mozilla/browser/components/bookmarks/content/bookmarksTree.xml
index d9abc2d261c..096a1b4b2ef 100644
--- a/mozilla/browser/components/bookmarks/content/bookmarksTree.xml
+++ b/mozilla/browser/components/bookmarks/content/bookmarksTree.xml
@@ -528,7 +528,6 @@
return;
}
}
-
var browserTarget = BookmarksUtils.getBrowserTargetFromEvent(aEvent);
BookmarksCommand.openBookmark(selection, browserTarget, this.db);
]]>
@@ -819,7 +818,7 @@
onkeypress="event.preventBubble();"/>