Turn View Image context entry into a preference disabled by default

Author: K4sum1

browser/base/content/browser-context.inc

@@ -190,9 +190,12 @@
                 data-l10n-id="main-context-menu-media-show-controls"
                 />
       <menuseparator id="context-media-sep-video-commands"/>
-      <menuitem id="context-viewvideo"
+      <menuitem id="context-viewvideotab"
                 data-l10n-id="main-context-menu-video-view-new-tab"
                 />
+      <menuitem id="context-viewvideo"
+                data-l10n-id="main-context-menu-video-view"
+                />
       <menuitem id="context-video-pictureinpicture"
                 data-l10n-id="main-context-menu-media-watch-pip"
                 type="checkbox"
@@ -201,9 +204,12 @@
       <menuitem id="context-reloadimage"
                 data-l10n-id="main-context-menu-image-reload"
                 />
-      <menuitem id="context-viewimage"
+      <menuitem id="context-viewimagetab"
                 data-l10n-id="main-context-menu-image-view-new-tab"
                 />
+      <menuitem id="context-viewimage"
+                data-l10n-id="main-context-menu-image-view"
+                />
       <menuitem id="context-saveimage"
                 data-l10n-id="main-context-menu-image-save-as"
                 />

browser/base/content/browser-context.js

@@ -114,6 +114,8 @@ document.addEventListener(
         case "context-media-showcontrols":
           gContextMenu.mediaCommand("showcontrols");
           break;
+        case "context-viewimagetab":
+        case "context-viewvideotab":
         case "context-viewimage":
         case "context-viewvideo":
           gContextMenu.viewMedia(event);

browser/base/content/nsContextMenu.sys.mjs

@@ -665,6 +665,7 @@ export class nsContextMenu {
       !this.onAudio &&
       !this.onLink &&
       !this.onTextInput;
+    if (Services.prefs.getBoolPref("r3dfox.view.image")) {
       this.showItem("context-viewimage", showViewImage);
 
       var shouldShow = !(
@@ -694,6 +695,12 @@ export class nsContextMenu {
       );
 
       this.document.getElementById("context-viewbgimage").disabled = !this.hasBGImage;
+      this.showItem("context-viewimagetab", false);
+    } else {
+      this.showItem("context-viewimagetab", showViewImage || showBGImage);
+      this.showItem("context-viewimage", false);
+      this.showItem("context-viewbgimage", false);
+    }
 
     // Save image depends on having loaded its content.
     this.showItem(
@@ -825,11 +832,21 @@ export class nsContextMenu {
     this.showItem("context-inspect-a11y", showInspectA11Y);
 
     // View video depends on not having a standalone video.
-    this.showItem(
-      "context-viewvideo",
-      this.onVideo && (!this.inSyntheticDoc || this.inFrame)
-    );
-    this.setItemAttr("context-viewvideo", "disabled", !this.mediaURL);
+    if (Services.prefs.getBoolPref("r3dfox.view.image")) {
+      this.showItem(
+        "context-viewvideo",
+        this.onVideo && (!this.inSyntheticDoc || this.inFrame)
+      );
+      this.setItemAttr("context-viewvideo", "disabled", !this.mediaURL);
+      this.showItem("context-viewvideotab", false);
+    } else {
+      this.showItem(
+        "context-viewvideotab",
+        this.onVideo && (!this.inSyntheticDoc || this.inFrame)
+      );
+      this.setItemAttr("context-viewvideotab", "disabled", !this.mediaURL);
+      this.showItem("context-viewvideo", false);
+    }
   }
 
   initMiscItems() {
@@ -1739,9 +1756,11 @@ export class nsContextMenu {
   // Change current window to the URL of the image, video, or audio.
   viewMedia(e) {
     let where = lazy.BrowserUtils.whereToOpenLink(e, false, false);
-//    if (where == "current") {
-//      where = "tab";
-//    }
+    if (!Services.prefs.getBoolPref("r3dfox.view.image")) {
+      if (where == "current") {
+        where = "tab";
+      }
+    }
     let referrerInfo = this.contentData.referrerInfo;
     let systemPrincipal = Services.scriptSecurityManager.getSystemPrincipal();
     if (this.onCanvas) {

browser/components/preferences/main.inc.xhtml

@@ -149,6 +149,13 @@
   </hbox>
   <description class="indent tip-caption" data-l10n-id="r3dfox-one-offs-desc"/>
 
+  <hbox align="center">
+    <checkbox id="r3dfoxviewimage"
+              data-l10n-id="r3dfox-view-image"
+              preference="r3dfox.view.image"/>
+  </hbox>
+  <description class="indent tip-caption" data-l10n-id="r3dfox-view-image-desc"/>
+
   <hbox align="center">
     <checkbox id="r3dfoxmodern"
               data-l10n-id="r3dfox-modern"

browser/components/preferences/main.js

@@ -77,6 +77,7 @@ Preferences.addAll([
   { id: "r3dfox.force.transparency", type: "bool" },
   { id: "r3dfox.caption.text.color", type: "bool" },
   { id: "browser.urlbar.oneOffsInstant", type: "bool" },
+  { id: "r3dfox.view.image", type: "bool" },
   { id: "widget.windows-style.modern", type: "bool" },
   { id: "browser.e10s.disabled", type: "bool" },
   { id: "accessibility.force_disabled", type: "int" },

browser/locales/en-US/browser/browserContext.ftl

@@ -267,6 +267,10 @@ main-context-menu-image-reload =
     .accesskey = R
 
 main-context-menu-image-view-new-tab =
+    .label = Open Image in New Tab
+    .accesskey = I
+
+main-context-menu-image-view =
     .label = View Image
     .accesskey = I
 
@@ -275,6 +279,10 @@ main-context-menu-image-view-background =
     .accesskey = w
 
 main-context-menu-video-view-new-tab =
+    .label = Open Video in New Tab
+    .accesskey = i
+
+main-context-menu-video-view =
     .label = View Video
     .accesskey = i
 

browser/locales/en-US/browser/preferences/preferences.ftl

@@ -213,6 +213,11 @@ r3dfox-one-offs =
 
 r3dfox-one-offs-desc = Enable for instant one off searches.
 
+r3dfox-view-image =
+    .label = Restore classic View Image context menu option
+
+r3dfox-view-image-desc = Restore the classic View Image and View Background Image context menu options instead of always opening images in a new tab.
+
 r3dfox-modern =
     .label = Modern UI (Requires browser restart)
 

modules/libpref/init/all.js

@@ -661,6 +661,7 @@ pref("r3dfox.transparent.menubar", false);
 // Translucent navbar design
 pref("r3dfox.translucent.navbar", false);
 // Disable other customizations by default
+pref("r3dfox.view.image", false);
 pref("r3dfox.colors.esr", false);
 pref("r3dfox.browser.plasmafox", false);
 pref("r3dfox.colors.plasmafox", false);