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

Bug 11661. Fix <menu> templates to include <menupopup> children.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@48963 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
waterson%netscape.com
1999-09-24 05:44:04 +00:00
parent a6bb4901f0
commit adbbff32b3
4 changed files with 18 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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>

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

@@ -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>

24
mozilla/xpfe/browser/resources/content/navigator.xul
View File

@@ -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>

8
mozilla/xpfe/browser/resources/content/navigatorOverlay.xul
View File

@@ -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>