diff --git a/mozilla/suite/browser/navigator.xul b/mozilla/suite/browser/navigator.xul index 5ab6706b2d4..2ff74d68a00 100644 --- a/mozilla/suite/browser/navigator.xul +++ b/mozilla/suite/browser/navigator.xul @@ -47,14 +47,17 @@ Contributor(s): ______________________________________. --> - - - - - - + + + style="border: thin solid black;"> + + + + + + + var gBookmarkPopup = null; diff --git a/mozilla/suite/common/bookmarks/bookmarks.js b/mozilla/suite/common/bookmarks/bookmarks.js index 4fede268608..2e85bb99fd1 100644 --- a/mozilla/suite/common/bookmarks/bookmarks.js +++ b/mozilla/suite/common/bookmarks/bookmarks.js @@ -141,12 +141,10 @@ function fillContextMenu(name) // remove the menu node (which tosses all of its kids); // do this in case any old command nodes are hanging around - var menuNode = popupNode.childNodes[0]; - popupNode.removeChild(menuNode); - - // create a new menu node - menuNode = document.createElement("menu"); - popupNode.appendChild(menuNode); + for (var i = 0; i < popupNode.childNodes.length; i++) + { + popupNode.removeChild(popupNode.childNodes[0]); + } var treeNode = document.getElementById("bookmarksTree"); if (!treeNode) return(false); @@ -242,7 +240,7 @@ function fillContextMenu(name) menuItem.setAttribute("value", cmdName); menuItem.setAttribute("oncommand", "return doContextCmd('" + cmdResource.Value + "');"); - menuNode.appendChild(menuItem); + popupNode.appendChild(menuItem); } return(true); diff --git a/mozilla/xpfe/appshell/src/nsWebShellWindow.cpp b/mozilla/xpfe/appshell/src/nsWebShellWindow.cpp index 71ee6016cfc..da03c695439 100644 --- a/mozilla/xpfe/appshell/src/nsWebShellWindow.cpp +++ b/mozilla/xpfe/appshell/src/nsWebShellWindow.cpp @@ -1240,7 +1240,7 @@ nsWebShellWindow::CreatePopup(nsIDOMElement* aElement, nsIDOMElement* aPopupCont nsString tagName; nsCOMPtr popupSetElement = do_QueryInterface(popupSet); popupSetElement->GetTagName(tagName); - if (tagName != "menupopupset") + if (tagName != "popupset") return NS_OK; // Now obtain the popup set frame. diff --git a/mozilla/xpfe/browser/resources/content/navigator.xul b/mozilla/xpfe/browser/resources/content/navigator.xul index 5ab6706b2d4..2ff74d68a00 100644 --- a/mozilla/xpfe/browser/resources/content/navigator.xul +++ b/mozilla/xpfe/browser/resources/content/navigator.xul @@ -47,14 +47,17 @@ Contributor(s): ______________________________________. --> - - - - - - + + + style="border: thin solid black;"> + + + + + + + var gBookmarkPopup = null; diff --git a/mozilla/xpfe/browser/resources/skin/navigator.css b/mozilla/xpfe/browser/resources/skin/navigator.css index 81e90d96d20..c1785fd5490 100644 --- a/mozilla/xpfe/browser/resources/skin/navigator.css +++ b/mozilla/xpfe/browser/resources/skin/navigator.css @@ -5,10 +5,6 @@ display: none; } -popup { - display: none; -} - titledbutton#translate-button { list-style-image:url(resource:/res/toolbar/TB_Location.gif); } diff --git a/mozilla/xpfe/components/bookmarks/resources/bookmarks.js b/mozilla/xpfe/components/bookmarks/resources/bookmarks.js index 4fede268608..2e85bb99fd1 100644 --- a/mozilla/xpfe/components/bookmarks/resources/bookmarks.js +++ b/mozilla/xpfe/components/bookmarks/resources/bookmarks.js @@ -141,12 +141,10 @@ function fillContextMenu(name) // remove the menu node (which tosses all of its kids); // do this in case any old command nodes are hanging around - var menuNode = popupNode.childNodes[0]; - popupNode.removeChild(menuNode); - - // create a new menu node - menuNode = document.createElement("menu"); - popupNode.appendChild(menuNode); + for (var i = 0; i < popupNode.childNodes.length; i++) + { + popupNode.removeChild(popupNode.childNodes[0]); + } var treeNode = document.getElementById("bookmarksTree"); if (!treeNode) return(false); @@ -242,7 +240,7 @@ function fillContextMenu(name) menuItem.setAttribute("value", cmdName); menuItem.setAttribute("oncommand", "return doContextCmd('" + cmdResource.Value + "');"); - menuNode.appendChild(menuItem); + popupNode.appendChild(menuItem); } return(true); diff --git a/mozilla/xpfe/components/bookmarks/resources/bookmarks.xul b/mozilla/xpfe/components/bookmarks/resources/bookmarks.xul index 848115779a5..e9be78c779a 100644 --- a/mozilla/xpfe/components/bookmarks/resources/bookmarks.xul +++ b/mozilla/xpfe/components/bookmarks/resources/bookmarks.xul @@ -65,9 +65,11 @@ + + menu { max-width: 400px; min-width: 125px; margin-left: 1px; @@ -351,7 +367,25 @@ menupopup menu { margin-bottom: 0px; } -menupopup menuitem { +popup > menu { + max-width: 400px; + min-width: 125px; + margin-left: 1px; + margin-right: 1px; + margin-top: 0px; + margin-bottom: 0px; +} + +menupopup > menuitem { + max-width: 400px; + min-width: 125px; + margin-left: 1px; + margin-right: 1px; + margin-top: 0px; + margin-bottom: 0px; +} + +popup > menuitem { max-width: 400px; min-width: 125px; margin-left: 1px; @@ -816,7 +850,6 @@ tabcontrol { /* all the debug stuff is here */ - /* always debug *:-moz-horizontal-box-debug { @@ -841,6 +874,7 @@ tabcontrol { border: 2px solid blue; border-top-width: 10px; color: white; +>>>>>>> 1.56 } *[debug="true"]:-moz-vertical-box-debug { @@ -1243,6 +1277,11 @@ menupopup > menuitem { padding: 2px; } +popup > menuitem { + border: 1px solid transparent; + padding: 2px; +} + menubar > menu[menuactive="true"] { border: 1px outset white; color:#333366; @@ -1257,11 +1296,21 @@ menupopup > menu[menuactive="true"] { color: white; } +popup > menu[menuactive="true"] { + background-color: #666699; + color: white; +} + menupopup > menuitem[menuactive="true"] { background-color: #666699; color: white; } +popup > menuitem[menuactive="true"] { + background-color: #666699; + color: white; +} + .menu-right { padding: 0px; border: 0px;