Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-10 20:05:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 239307 - Remove 'Send Link...' from context menus. r=fryn ui-r=shorlander

Browse Source
This commit is contained in:
Jared Wein 2012-07-03 13:42:18 -07:00
parent 6f12f59b71
commit f4fa33262b
4 changed files with 1 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
browser/base/content/browser-context.inc
View File

@ -37,10 +37,6 @@
label="&saveLinkCmd.label;"
accesskey="&saveLinkCmd.accesskey;"
oncommand="gContextMenu.saveLink();"/>
<menuitem id="context-sendlink"
label="&sendLinkCmd.label;"
accesskey="&sendLinkCmd.accesskey;"
oncommand="gContextMenu.sendLink();"/>
<menuitem id="context-copyemail"
label="&copyEmailCmd.label;"
accesskey="&copyEmailCmd.accesskey;"
@ -188,10 +184,6 @@
label="&savePageCmd.label;"
accesskey="&savePageCmd.accesskey2;"
oncommand="gContextMenu.savePageAs();"/>
<menuitem id="context-sendpage"
label="&sendPageCmd.label;"
accesskey="&sendPageCmd.accesskey;"
oncommand="gContextMenu.sendPage();"/>
<menuseparator id="context-sep-viewbgimage"/>
<menuitem id="context-viewbgimage"
label="&viewBGImageCmd.label;"

13
browser/base/content/nsContextMenu.js
View File

@ -171,11 +171,9 @@ nsContextMenu.prototype = {
this.isContentSelected || this.onImage ||
this.onCanvas || this.onVideo || this.onAudio);
this.showItem("context-savepage", shouldShow);
this.showItem("context-sendpage", shouldShow);
// Save+Send link depends on whether we're in a link, or selected text matches valid URL pattern.
// Save link depends on whether we're in a link, or selected text matches valid URL pattern.
this.showItem("context-savelink", this.onSaveableLink || this.onPlainTextLink);
this.showItem("context-sendlink", this.onSaveableLink || this.onPlainTextLink);
// Save image depends on having loaded its content, video and audio don't.
this.showItem("context-saveimage", this.onLoadedImage || this.onCanvas);
@ -1050,11 +1048,6 @@ nsContextMenu.prototype = {
this.saveHelper(this.linkURL, linkText, null, true, doc);
},
sendLink: function() {
// we don't know the title of the link so pass in an empty string
MailIntegration.sendMessage( this.linkURL, "" );
},
// Backwards-compatibility wrapper
saveImage : function() {
if (this.onCanvas || this.onImage)
@ -1403,10 +1396,6 @@ nsContextMenu.prototype = {
saveDocument(this.browser.contentDocument);
},
sendPage: function CM_sendPage() {
MailIntegration.sendLinkForWindow(this.browser.contentWindow);
},
printFrame: function CM_printFrame() {
PrintUtils.print(this.target.ownerDocument.defaultView);
},

7
browser/base/content/test/test_contextmenu.html
View File

@ -276,7 +276,6 @@ function runTest(testNum) {
"---", null,
"context-bookmarkpage", true,
"context-savepage", true,
"context-sendpage", true,
"---", null,
"context-viewbgimage", false,
"context-selectall", true,
@ -296,7 +295,6 @@ function runTest(testNum) {
"---", null,
"context-bookmarklink", true,
"context-savelink", true,
"context-sendlink", true,
"context-copylink", true
].concat(inspectItems));
closeContextMenu();
@ -434,7 +432,6 @@ function runTest(testNum) {
"---", null,
"context-bookmarkpage", true,
"context-savepage", true,
"context-sendpage", true,
"---", null,
"context-viewbgimage", false,
"context-selectall", true,
@ -660,7 +657,6 @@ function runTest(testNum) {
"---", null,
"context-bookmarkpage", true,
"context-savepage", true,
"context-sendpage", true,
"---", null,
"context-viewbgimage", false,
"context-selectall", true,
@ -695,7 +691,6 @@ function runTest(testNum) {
"---", null,
"context-bookmarkpage", true,
"context-savepage", true,
"context-sendpage", true,
"---", null,
"context-viewbgimage", false,
"context-selectall", true,
@ -725,7 +720,6 @@ function runTest(testNum) {
"---", null,
"context-bookmarkpage", true,
"context-savepage", true,
"context-sendpage", true,
"---", null,
"context-viewbgimage", false,
"context-selectall", true,
@ -764,7 +758,6 @@ function runTest(testNum) {
"---", null,
"context-bookmarklink", true,
"context-savelink", true,
"context-sendlink", true,
"context-copy", true,
"context-selectall", true,
"---", null,

2
browser/locales/en-US/chrome/browser/browser.dtd
View File

@ -450,8 +450,6 @@ These should match what Safari and other Apple applications use on OS X Lion. --
<!ENTITY printFrameCmd.accesskey "P">
<!ENTITY saveLinkCmd.label "Save Link As…">
<!ENTITY saveLinkCmd.accesskey "k">
<!ENTITY sendLinkCmd.label "Send Link…">
<!ENTITY sendLinkCmd.accesskey "d">
<!ENTITY saveImageCmd.label "Save Image As…">
<!ENTITY saveImageCmd.accesskey "v">
<!ENTITY saveVideoCmd.label "Save Video As…">