Minor context menu tweaking

suite/browser/navigator.xul

@@ -61,23 +61,15 @@ Contributor(s): ______________________________________. -->
  </popup>
 </popupset>
 
-<!-- Context menu
-
-     This script is inline here because it's really a part of the .xul;
-     navigator.js doesn't care about this detail.
--->
-<html:script>
-var contextTarget = null; // Content element to which context menu applies.
-</html:script>
-
+<!-- Context menu -->
 <popupset>
     <!-- This is the skeleton context menu.  It is populated and emptied
          dynamically, from the template (see below) via the oncreate/ondestroy
          handlers.
     -->
     <popup id="context"
-           oncreate="contextTarget=event.target;BrowserCreateContextMenu(this,event)"
-           ondestroy="contextTarget=null;BrowserDestroyContextMenu(this)">
+           oncreate="BrowserCreateContextMenu(this,event)"
+           ondestroy="BrowserDestroyContextMenu(this)">
     </popup>
 
     <!-- This is the context menu template used to populate the actual
@@ -89,16 +81,16 @@ var contextTarget = null; // Content element to which context menu applies.
         <menuitem id="template-openlink"
                   value="&openLinkCmd.label;"
                   accesskey=""
-                  oncommand="BrowserOpenLink(contextTarget);"/>
+                  oncommand="BrowserOpenLink();"/>
         <menuitem id="template-editlink"
                   value="&editLinkCmd.label;"
                   accesskey=""
-                  oncommand="BrowserEditLink(contextTarget);"/>
+                  oncommand="BrowserEditLink();"/>
         <menuitem id="template-openframe"
                   value="&openFrameCmd.label;"
                   accesskey=""
-                  oncommand="BrowserOpenFrame(contextTarget);"/>
-        <menuseparator/>
+                  oncommand="BrowserOpenFrame();"/>
+        <menuseparator id="context-sep-open"/>
         <!-- Navigation ============================== -->
         <menuitem id="template-back"
                   value="&goBackCmd.label;"
@@ -125,7 +117,7 @@ var contextTarget = null; // Content element to which context menu applies.
         <menuitem id="template-viewframesource"
                   value="&viewFrameSourceCmd.label;"
                   accesskey=""
-                  oncommand="BrowserViewFrameSource(contextTarget);"/>
+                  oncommand="BrowserViewFrameSource();"/>
         <menuitem id="template-viewinfo"
                   value="&viewPageInfoCmd.label;"
                   accesskey=""
@@ -133,11 +125,11 @@ var contextTarget = null; // Content element to which context menu applies.
         <menuitem id="template-viewframeinfo"
                   value="&viewFrameInfoCmd.label;"
                   accesskey=""
-                  oncommand="BrowserViewFrameInfo(contextTarget);"/>
+                  oncommand="BrowserViewFrameInfo();"/>
         <menuitem id="template-viewimage"
                   value="&viewImageCmd.label;"
                   accesskey=""
-                  oncommand="BrowserViewImage(contextTarget);"/>
+                  oncommand="BrowserViewImage();"/>
         <menuseparator/>
         <!-- Misc ==================================== -->
 		<menuitem id="template-bookmarkpage"
@@ -158,19 +150,19 @@ var contextTarget = null; // Content element to which context menu applies.
         <menuitem id="template-saveframe"
                   value="&saveFrameCmd.label;"
                   accesskey="&saveFrameCmd.accesskey;"
-                  oncommand="BrowserSaveFrame(contextTarget);"/>
+                  oncommand="BrowserSaveFrame();"/>
         <menuitem id="template-savelink"
                   value="&saveLinkCmd.label;"
                   accesskey="&saveLinkCmd.accesskey;"
-                  oncommand="BrowserSaveLink(contextTarget);"/>
+                  oncommand="BrowserSaveLink();"/>
         <menuitem id="template-saveimage"
                   value="&saveImageCmd.label;"
                   accesskey="&saveImageCmd.accesskey;"
-                  oncommand="BrowserSaveImage(contextTarget);"/>
+                  oncommand="BrowserSaveImage();"/>
         <menuitem id="template-savebgimage"
                   value="&saveBGImageCmd.label;"
                   accesskey="&saveBGImageCmd.accesskey;"
-                  oncommand="BrowserSaveBGImage(contextTarget);"/>
+                  oncommand="BrowserSaveBGImage();"/>
         <menuseparator/>
         <!-- Clipboard =============================== -->
         <menuitem id="template-selectall"
@@ -184,12 +176,11 @@ var contextTarget = null; // Content element to which context menu applies.
         <menuitem id="template-copylink"
                   value="&copyLinkCmd.label;"
                   accesskey="&copyLinkCmd.accesskey;"
-                  oncommand="BrowserCopyLink(contextTarget);"/>
+                  oncommand="BrowserCopyLink();"/>
         <menuitem id="template-copyimage"
                   value="&copyImageCmd.label;"
                   accesskey="&copyImageCmd.accesskey;"
-                  oncommand="BrowserCopyImage(contextTarget);"/>
-        <menuseparator/>
+                  oncommand="BrowserCopyImage();"/>
     </popup>
 </popupset>
 

xpfe/browser/resources/content/navigator.xul

@@ -61,23 +61,15 @@ Contributor(s): ______________________________________. -->
  </popup>
 </popupset>
 
-<!-- Context menu
-
-     This script is inline here because it's really a part of the .xul;
-     navigator.js doesn't care about this detail.
--->
-<html:script>
-var contextTarget = null; // Content element to which context menu applies.
-</html:script>
-
+<!-- Context menu -->
 <popupset>
     <!-- This is the skeleton context menu.  It is populated and emptied
          dynamically, from the template (see below) via the oncreate/ondestroy
          handlers.
     -->
     <popup id="context"
-           oncreate="contextTarget=event.target;BrowserCreateContextMenu(this,event)"
-           ondestroy="contextTarget=null;BrowserDestroyContextMenu(this)">
+           oncreate="BrowserCreateContextMenu(this,event)"
+           ondestroy="BrowserDestroyContextMenu(this)">
     </popup>
 
     <!-- This is the context menu template used to populate the actual
@@ -89,16 +81,16 @@ var contextTarget = null; // Content element to which context menu applies.
         <menuitem id="template-openlink"
                   value="&openLinkCmd.label;"
                   accesskey=""
-                  oncommand="BrowserOpenLink(contextTarget);"/>
+                  oncommand="BrowserOpenLink();"/>
         <menuitem id="template-editlink"
                   value="&editLinkCmd.label;"
                   accesskey=""
-                  oncommand="BrowserEditLink(contextTarget);"/>
+                  oncommand="BrowserEditLink();"/>
         <menuitem id="template-openframe"
                   value="&openFrameCmd.label;"
                   accesskey=""
-                  oncommand="BrowserOpenFrame(contextTarget);"/>
-        <menuseparator/>
+                  oncommand="BrowserOpenFrame();"/>
+        <menuseparator id="context-sep-open"/>
         <!-- Navigation ============================== -->
         <menuitem id="template-back"
                   value="&goBackCmd.label;"
@@ -125,7 +117,7 @@ var contextTarget = null; // Content element to which context menu applies.
         <menuitem id="template-viewframesource"
                   value="&viewFrameSourceCmd.label;"
                   accesskey=""
-                  oncommand="BrowserViewFrameSource(contextTarget);"/>
+                  oncommand="BrowserViewFrameSource();"/>
         <menuitem id="template-viewinfo"
                   value="&viewPageInfoCmd.label;"
                   accesskey=""
@@ -133,11 +125,11 @@ var contextTarget = null; // Content element to which context menu applies.
         <menuitem id="template-viewframeinfo"
                   value="&viewFrameInfoCmd.label;"
                   accesskey=""
-                  oncommand="BrowserViewFrameInfo(contextTarget);"/>
+                  oncommand="BrowserViewFrameInfo();"/>
         <menuitem id="template-viewimage"
                   value="&viewImageCmd.label;"
                   accesskey=""
-                  oncommand="BrowserViewImage(contextTarget);"/>
+                  oncommand="BrowserViewImage();"/>
         <menuseparator/>
         <!-- Misc ==================================== -->
 		<menuitem id="template-bookmarkpage"
@@ -158,19 +150,19 @@ var contextTarget = null; // Content element to which context menu applies.
         <menuitem id="template-saveframe"
                   value="&saveFrameCmd.label;"
                   accesskey="&saveFrameCmd.accesskey;"
-                  oncommand="BrowserSaveFrame(contextTarget);"/>
+                  oncommand="BrowserSaveFrame();"/>
         <menuitem id="template-savelink"
                   value="&saveLinkCmd.label;"
                   accesskey="&saveLinkCmd.accesskey;"
-                  oncommand="BrowserSaveLink(contextTarget);"/>
+                  oncommand="BrowserSaveLink();"/>
         <menuitem id="template-saveimage"
                   value="&saveImageCmd.label;"
                   accesskey="&saveImageCmd.accesskey;"
-                  oncommand="BrowserSaveImage(contextTarget);"/>
+                  oncommand="BrowserSaveImage();"/>
         <menuitem id="template-savebgimage"
                   value="&saveBGImageCmd.label;"
                   accesskey="&saveBGImageCmd.accesskey;"
-                  oncommand="BrowserSaveBGImage(contextTarget);"/>
+                  oncommand="BrowserSaveBGImage();"/>
         <menuseparator/>
         <!-- Clipboard =============================== -->
         <menuitem id="template-selectall"
@@ -184,12 +176,11 @@ var contextTarget = null; // Content element to which context menu applies.
         <menuitem id="template-copylink"
                   value="&copyLinkCmd.label;"
                   accesskey="&copyLinkCmd.accesskey;"
-                  oncommand="BrowserCopyLink(contextTarget);"/>
+                  oncommand="BrowserCopyLink();"/>
         <menuitem id="template-copyimage"
                   value="&copyImageCmd.label;"
                   accesskey="&copyImageCmd.accesskey;"
-                  oncommand="BrowserCopyImage(contextTarget);"/>
-        <menuseparator/>
+                  oncommand="BrowserCopyImage();"/>
     </popup>
 </popupset>