Commit fbfbf8e7 authored by Johnathan Nightingale's avatar Johnathan Nightingale
Browse files

Bug 514520 - Double separator in context menu after properties dialog deletion. r=dao

parent a8cdd9aa

browser/base/content/browser-context.inc

+1 −1
Original line number Diff line number Diff line
@@ -285,7 +285,6 @@ 
                    oncommand="gContextMenu.viewFrameInfo();"/>

        </menupopup>

      </menu>

      <menuseparator id="context-sep-properties"/>

      <menuitem id="context-viewpartialsource-selection"

                label="&viewPartialSourceForSelectionCmd.label;"

                accesskey="&viewPartialSourceCmd.accesskey;"
@@ -296,6 +295,7 @@ 
                accesskey="&viewPartialSourceCmd.accesskey;"

                oncommand="gContextMenu.viewPartialSource('mathml');"

                observes="isImage"/>

      <menuseparator id="context-sep-viewsource"/>

      <menuitem id="context-viewsource"

                label="&viewPageSourceCmd.label;"

                accesskey="&viewPageSourceCmd.accesskey;"

browser/base/content/nsContextMenu.js

+1 −2
Original line number Diff line number Diff line
@@ -222,8 +222,7 @@ nsContextMenu.prototype = { 
    this.showItem("context-viewsource", shouldShow);

    this.showItem("context-viewinfo", shouldShow);



    this.showItem("context-sep-properties",

                  (shouldShow || this.isContentSelected));

    this.showItem("context-sep-viewsource", shouldShow);



    // Set as Desktop background depends on whether an image was clicked on,

    // and only works if we have a shell service.

browser/base/content/test/test_contextmenu.html

+0 −1
Original line number Diff line number Diff line
@@ -283,7 +283,6 @@ function runTest(testNum) { 
                          "---",                  null,

                          "context-viewbgimage",  false,

                          "context-selectall",    true,

                          "---",                  null,

                          "frame",                null,

                              ["context-showonlythisframe", true,

                               "context-openframe",         true,