From adbbff32b331946081fac5b3f44944a2cffa2031 Mon Sep 17 00:00:00 2001
From: "waterson%netscape.com"
 <waterson%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Fri, 24 Sep 1999 05:44:04 +0000
Subject: [PATCH] Bug 11661. Fix <menu> templates to include <menupopup>
 children.

git-svn-id: svn://10.0.0.236/trunk@48963 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/suite/browser/navigator.xul           | 24 ++++---------------
 mozilla/suite/browser/navigatorOverlay.xul    |  8 ++++---
 .../browser/resources/content/navigator.xul   | 24 ++++---------------
 .../resources/content/navigatorOverlay.xul    |  8 ++++---
 4 files changed, 18 insertions(+), 46 deletions(-)

diff --git a/mozilla/suite/browser/navigator.xul b/mozilla/suite/browser/navigator.xul
index 49fb43fec87..aa53d51e694 100644
--- a/mozilla/suite/browser/navigator.xul
+++ b/mozilla/suite/browser/navigator.xul
@@ -188,26 +188,7 @@ Contributor(s): ______________________________________. -->
 <html:script language="javascript">
   var gBookmarkPopup = null;
 </html:script>
-<html:script src="chrome://bookmarks/content/bookmark-popup.js" />
 
-<popupset>
-  <popup id="bookmark-popup" popupanchor='bottomleft'
-    oncreate="dump(document.popupElement);"
-    datasources="rdf:bookmarks rdf:files rdf:localsearch rdf:internetsearch" ref="NC:BookmarksRoot">
-      <template>
-        <rule iscontainer="true">
-            <menu uri="..." value="rdf:http://home.netscape.com/NC-rdf#Name"/>
-        </rule>
-        <rule rdf:type="http://home.netscape.com/NC-rdf#BookmarkSeparator">
-            <menuseparator uri="..." />
-        </rule>
-        <rule>
-            <menuitem uri="..." value="rdf:http://home.netscape.com/NC-rdf#Name" oncommand="OpenBookmarkURL(event.target, 'BookmarksMenu')" />
-        </rule>
-      </template>
-  </popup>
-</popupset>
- 
 <broadcaster id="canReload" value="&reloadCmd.label;"  oncommand="BrowserReallyReload(0);"/>
 <broadcaster id="canStop"/>
 <broadcaster id="canPrint"/>
@@ -687,6 +668,7 @@ Contributor(s): ______________________________________. -->
             <menu uri="...">
               <titledbutton value="rdf:http://home.netscape.com/NC-rdf#Name"
                 align="left" />
+              <menupopup />
             </menu>
           </rule>
           <rule parent="toolbar">
@@ -698,7 +680,9 @@ Contributor(s): ______________________________________. -->
           <rule iscontainer="true">
             <menupopup>
               <menu uri="..." align="left"
-                value="rdf:http://home.netscape.com/NC-rdf#Name"/>
+                value="rdf:http://home.netscape.com/NC-rdf#Name" >
+                <menupopup />
+              </menu>
             </menupopup>
           </rule>
           <rule>
diff --git a/mozilla/suite/browser/navigatorOverlay.xul b/mozilla/suite/browser/navigatorOverlay.xul
index e9be8c14645..95304c4a130 100644
--- a/mozilla/suite/browser/navigatorOverlay.xul
+++ b/mozilla/suite/browser/navigatorOverlay.xul
@@ -138,17 +138,19 @@ Contributor(s): ______________________________________. -->
 		<template>
 			<rule iscontainer="true">
 			  <menupopup>
-				<menu uri="..." value="rdf:http://home.netscape.com/NC-rdf#Name"/>
+				<menu uri="rdf:*" value="rdf:http://home.netscape.com/NC-rdf#Name">
+                                        <menupopup />
+                                </menu>
 			  </menupopup>
 			</rule>
 			<rule rdf:type="http://home.netscape.com/NC-rdf#BookmarkSeparator">
 			  <menupopup> 
-				<menuseparator uri="..." />
+				<menuseparator uri="rdf:*" />
 			  </menupopup>
 			</rule>
 			<rule>
 			  <menupopup>
-				<menuitem uri="..." value="rdf:http://home.netscape.com/NC-rdf#Name" oncommand="OpenBookmarkURL(event.target, 'BookmarksMenu')" />
+				<menuitem uri="rdf:*" value="rdf:http://home.netscape.com/NC-rdf#Name" oncommand="OpenBookmarkURL(event.target, 'BookmarksMenu')" />
 			  </menupopup>
 			</rule>
 		</template>
diff --git a/mozilla/xpfe/browser/resources/content/navigator.xul b/mozilla/xpfe/browser/resources/content/navigator.xul
index 49fb43fec87..aa53d51e694 100644
--- a/mozilla/xpfe/browser/resources/content/navigator.xul
+++ b/mozilla/xpfe/browser/resources/content/navigator.xul
@@ -188,26 +188,7 @@ Contributor(s): ______________________________________. -->
 <html:script language="javascript">
   var gBookmarkPopup = null;
 </html:script>
-<html:script src="chrome://bookmarks/content/bookmark-popup.js" />
 
-<popupset>
-  <popup id="bookmark-popup" popupanchor='bottomleft'
-    oncreate="dump(document.popupElement);"
-    datasources="rdf:bookmarks rdf:files rdf:localsearch rdf:internetsearch" ref="NC:BookmarksRoot">
-      <template>
-        <rule iscontainer="true">
-            <menu uri="..." value="rdf:http://home.netscape.com/NC-rdf#Name"/>
-        </rule>
-        <rule rdf:type="http://home.netscape.com/NC-rdf#BookmarkSeparator">
-            <menuseparator uri="..." />
-        </rule>
-        <rule>
-            <menuitem uri="..." value="rdf:http://home.netscape.com/NC-rdf#Name" oncommand="OpenBookmarkURL(event.target, 'BookmarksMenu')" />
-        </rule>
-      </template>
-  </popup>
-</popupset>
- 
 <broadcaster id="canReload" value="&reloadCmd.label;"  oncommand="BrowserReallyReload(0);"/>
 <broadcaster id="canStop"/>
 <broadcaster id="canPrint"/>
@@ -687,6 +668,7 @@ Contributor(s): ______________________________________. -->
             <menu uri="...">
               <titledbutton value="rdf:http://home.netscape.com/NC-rdf#Name"
                 align="left" />
+              <menupopup />
             </menu>
           </rule>
           <rule parent="toolbar">
@@ -698,7 +680,9 @@ Contributor(s): ______________________________________. -->
           <rule iscontainer="true">
             <menupopup>
               <menu uri="..." align="left"
-                value="rdf:http://home.netscape.com/NC-rdf#Name"/>
+                value="rdf:http://home.netscape.com/NC-rdf#Name" >
+                <menupopup />
+              </menu>
             </menupopup>
           </rule>
           <rule>
diff --git a/mozilla/xpfe/browser/resources/content/navigatorOverlay.xul b/mozilla/xpfe/browser/resources/content/navigatorOverlay.xul
index e9be8c14645..95304c4a130 100644
--- a/mozilla/xpfe/browser/resources/content/navigatorOverlay.xul
+++ b/mozilla/xpfe/browser/resources/content/navigatorOverlay.xul
@@ -138,17 +138,19 @@ Contributor(s): ______________________________________. -->
 		<template>
 			<rule iscontainer="true">
 			  <menupopup>
-				<menu uri="..." value="rdf:http://home.netscape.com/NC-rdf#Name"/>
+				<menu uri="rdf:*" value="rdf:http://home.netscape.com/NC-rdf#Name">
+                                        <menupopup />
+                                </menu>
 			  </menupopup>
 			</rule>
 			<rule rdf:type="http://home.netscape.com/NC-rdf#BookmarkSeparator">
 			  <menupopup> 
-				<menuseparator uri="..." />
+				<menuseparator uri="rdf:*" />
 			  </menupopup>
 			</rule>
 			<rule>
 			  <menupopup>
-				<menuitem uri="..." value="rdf:http://home.netscape.com/NC-rdf#Name" oncommand="OpenBookmarkURL(event.target, 'BookmarksMenu')" />
+				<menuitem uri="rdf:*" value="rdf:http://home.netscape.com/NC-rdf#Name" oncommand="OpenBookmarkURL(event.target, 'BookmarksMenu')" />
 			  </menupopup>
 			</rule>
 		</template>