Bug 201854 Can't drag/move bookmark from/to/within overflow/dropdown/chevron list of personal toolbar

patch by durbacher@gmx.de r=neil sr=jag


git-svn-id: svn://10.0.0.236/trunk@156318 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
timeless%mozdev.org
2004-05-12 20:23:05 +00:00
parent d5257d5cba
commit 828c26d076
2 changed files with 12 additions and 1 deletions

View File

@@ -312,7 +312,8 @@
template="bookmarksMenuTemplate"
ref="NC:PersonalToolbarFolder" flags="dont-test-empty"
oncommand="BookmarksUtils.loadBookmarkBrowser(event, event.target, this.database)">
<menupopup onpopupshowing="if (event.target == this) BookmarksToolbar.updateOverflowMenu(this);"/>
<menupopup id="bookmarks-chevron-popup"
onpopupshowing="if (event.target == this) BookmarksToolbar.updateOverflowMenu(this);"/>
</toolbarbutton>
</hbox>
</toolbar>

View File

@@ -112,6 +112,8 @@ var BookmarksMenu = {
break;
case "bookmarks-chevron":
parent = "NC:PersonalToolbarFolder";
item = document.getElementById("bookmarks-ptf").lastChild;
aOrientation == BookmarksUtils.DROP_AFTER;
break;
default:
if (aOrientation == BookmarksUtils.DROP_ON)
@@ -151,6 +153,7 @@ var BookmarksMenu = {
case "BookmarksMenu":
return "NC:BookmarksRoot";
case "PersonalToolbar":
case "bookmarks-chevron":
return "NC:PersonalToolbarFolder";
case "bookmarks-button":
return "NC:BookmarksRoot";
@@ -432,6 +435,12 @@ var BookmarksMenuDNDObserver = {
else
BookmarksUtils.moveSelection("drag", selection, selTarget);
var chevron = document.getElementById("bookmarks-chevron");
if (chevron.getAttribute("open") == "true") {
BookmarksToolbar.resizeFunc(null);
BookmarksToolbar.updateOverflowMenu(document.getElementById("bookmarks-chevron-popup"));
}
// show again the menuseparator
if (menuTarget.hasChildNodes() &&
menuTarget.lastChild.id == "openintabs-menuitem") {
@@ -449,6 +458,7 @@ var BookmarksMenuDNDObserver = {
target.id.substring(0,5) != "find:" ||
target.id == "BookmarksMenu" ||
target.id == "bookmarks-button" ||
target.id == "bookmarks-chevron" ||
target.id == "bookmarks-ptf";
},