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

Bug 128629 -- speed up personal toolbar a bit. Patch by

Browse Source 
neil@parkwaycc.co.uk, r=pierrechanial@netscape.net, sr=ben


git-svn-id: svn://10.0.0.236/trunk@211170 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
bzbarsky%mit.edu 2006-09-14 06:04:26 +00:00
parent 20247c0a6f
commit c80dd0b9bc
4 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mozilla/suite/browser/navigator.js
View File

@ -496,7 +496,7 @@ function LoadBookmarksCallback()
.getService(Components.interfaces.nsIBookmarksService);
gBookmarksService.ReadBookmarks();
// tickle personal toolbar to load personal toolbar items
var personalToolbar = document.getElementById("innermostBox");
var personalToolbar = document.getElementById("NC:PersonalToolbarFolder");
personalToolbar.builder.rebuild();
} catch (e) {
}

5
mozilla/suite/browser/navigator.xul
View File

@ -242,7 +242,6 @@ Contributor(s):
<toolbar id="PersonalToolbar" class="chromeclass-directories" persist="collapsed"
grippytooltiptext="&personalToolbar.tooltip;" tbalign="stretch"
oncommand="OpenBookmarkURL(event.target,document.getElementById('BookmarksMenu').database)"
ondraggesture="nsDragAndDrop.startDrag(event, personalToolbarDNDObserver)"
ondragdrop="nsDragAndDrop.drop(event, personalToolbarDNDObserver); event.preventBubble()"
ondragenter="nsDragAndDrop.dragEnter(event, personalToolbarDNDObserver); event.preventBubble()"
@ -265,6 +264,7 @@ Contributor(s):
persist="hidden" label="&bookmarksButton.label;"
datasources="rdf:bookmarks rdf:files rdf:localsearch rdf:internetsearch"
ref="NC:BookmarksRoot" container="true" flags="dont-test-empty"
oncommand="OpenBookmarkURL(event.target, this.database)"
template="bookmarksMenuTemplate"
ondraggesture="if (event.target.id=='bookmarks-button') event.preventBubble()">
<menupopup onpopupshowing="checkBookmarksMenuTemplateBuilder(); updateGroupmarkMenuitem('PT_bookmarks_groupmark');">
@ -278,9 +278,10 @@ Contributor(s):
</toolbarbutton>
<!-- Personal toolbar items -->
<hbox id="innermostBox" flex="1" style="min-width: 1px;" context="bmContext"
<hbox id="NC:PersonalToolbarFolder" flex="1" style="min-width: 1px;" context="bmContext"
datasources="rdf:bookmarks rdf:files rdf:localsearch rdf:internetsearch"
ref="NC:PersonalToolbarFolder" flags="dont-test-empty"
oncommand="OpenBookmarkURL(event.target, this.database)"
rdf:type="http://home.netscape.com/NC-rdf#Folder">
<tooltip id="ptTooltip" noautohide="true" onpopupshowing="return FillInPTTooltip(document.tooltipNode)">
<vbox id="ptTooltipTextBox" flex="1">

12
mozilla/suite/browser/navigatorDD.js
View File

@ -252,7 +252,7 @@ var personalToolbarDNDObserver = {
return;
//PCH: cleanup needed here, url is already calculated in isBookmark()
var db = document.getElementById("innermostBox").database;
var db = document.getElementById("NC:PersonalToolbarFolder").database;
var url = RDFUtils.getTarget(db, uri, NC_RDF("URL"));
if (url)
url = url.QueryInterface(Components.interfaces.nsIRDFLiteral).Value;
@ -323,7 +323,7 @@ var personalToolbarDNDObserver = {
return;
var elementRes = RDFUtils.getResource(xferData[0]);
var childDB = document.getElementById("innermostBox").database;
var childDB = document.getElementById("NC:PersonalToolbarFolder").database;
var rdfContainer = Components.classes["@mozilla.org/rdf/container;1"].createInstance(Components.interfaces.nsIRDFContainer);
// if dragged url is already bookmarked, remove it from current location first
@ -362,8 +362,6 @@ var personalToolbarDNDObserver = {
if (aEvent.target.id == "bookmarks-button")
// dropPosition is always DROP_ON
parentContainer = RDFUtils.getResource("NC:BookmarksRoot");
else if (aEvent.target.id == "innermostBox")
parentContainer = RDFUtils.getResource("NC:PersonalToolbarFolder");
else if (dropPosition == this.DROP_ON)
parentContainer = RDFUtils.getResource(aEvent.target.id);
else {
@ -431,7 +429,7 @@ var personalToolbarDNDObserver = {
{
var children = aNode.childNodes;
for (var i = 0; i < children.length; i++) {
if (children[i].id == "innermostBox") {
if (children[i].id == "NC:PersonalToolbarFolder") {
this.onDragCloseMenu(children[i]);
}
else if (this.isContainer(children[i]) && children[i].getAttribute("open") == "true") {
@ -450,7 +448,7 @@ var personalToolbarDNDObserver = {
return
}
// The bookmark button is not a sibling of the folders in the PT
if (this.mCurrentDragOverTarget.parentNode.id == "innermostBox")
if (this.mCurrentDragOverTarget.parentNode.id == "NC:PersonalToolbarFolder")
this.onDragCloseMenu(document.getElementById("PersonalToolbar"));
else
this.onDragCloseMenu(this.mCurrentDragOverTarget.parentNode);
@ -642,7 +640,7 @@ var personalToolbarDNDObserver = {
{
if (!aURI)
return false;
var db = document.getElementById("innermostBox").database;
var db = document.getElementById("NC:PersonalToolbarFolder").database;
var typeValue = RDFUtils.getTarget(db, aURI, _RDF("type"));
typeValue = RDFUtils.getValueFromResource(typeValue);
return (typeValue == NC_RDF("BookmarkSeparator") ||

2
mozilla/suite/browser/navigatorOverlay.xul
View File

@ -297,7 +297,7 @@
<menu id="BookmarksMenu" label="&bookmarksMenu.label;" accesskey="&bookmarksMenu.accesskey;"
datasources="rdf:bookmarks rdf:files rdf:localsearch rdf:internetsearch"
ref="NC:BookmarksRoot" flags="dont-test-empty" template="bookmarksMenuTemplate"
oncommand="OpenBookmarkURL(event.target, document.getElementById('BookmarksMenu').database)">
oncommand="OpenBookmarkURL(event.target, this.database)">
<template id="bookmarksMenuTemplate" xmlns:nc="http://home.netscape.com/NC-rdf#">
<rule nc:FolderGroup="true" iscontainer="true">
<menupopup>