wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 654687 - Combine Stop and Reload in the page context menu. r=felipe

Browse Source
This commit is contained in:
Jared Wein 2012-07-03 23:21:53 -07:00
parent 630f786a41
commit 121d46ca3b
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -148,8 +148,9 @@ nsContextMenu.prototype = {
this.onTextInput);
this.showItem("context-back", shouldShow);
this.showItem("context-forward", shouldShow);
this.showItem("context-reload", shouldShow);
this.showItem("context-stop", shouldShow);
var shouldShowReload = XULBrowserWindow.stopCommand.getAttribute("disabled") == "true";
this.showItem("context-reload", shouldShow && shouldShowReload);
this.showItem("context-stop", shouldShow && !shouldShowReload);
this.showItem("context-sep-stop", shouldShow);
// XXX: Stop is determined in browser.js; the canStop broadcaster is broken

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

@ -272,7 +272,6 @@ function runTest(testNum) {
plainTextItems = ["context-back", false,
"context-forward", false,
"context-reload", true,
"context-stop", false,
"---", null,
"context-bookmarkpage", true,
"context-savepage", true,
@ -428,7 +427,6 @@ function runTest(testNum) {
checkContextMenu(["context-back", false,
"context-forward", false,
"context-reload", true,
"context-stop", false,
"---", null,
"context-bookmarkpage", true,
"context-savepage", true,
@ -653,7 +651,6 @@ function runTest(testNum) {
"context-back", false,
"context-forward", false,
"context-reload", true,
"context-stop", false,
"---", null,
"context-bookmarkpage", true,
"context-savepage", true,
@ -687,7 +684,6 @@ function runTest(testNum) {
"context-back", false,
"context-forward", false,
"context-reload", true,
"context-stop", false,
"---", null,
"context-bookmarkpage", true,
"context-savepage", true,
@ -716,7 +712,6 @@ function runTest(testNum) {
checkContextMenu(["context-back", false,
"context-forward", false,
"context-reload", true,
"context-stop", false,
"---", null,
"context-bookmarkpage", true,
"context-savepage", true,