Merge with upstream/development

app/src/components/mainWindow/mainWindow.js

@@ -117,7 +117,9 @@ function createMainWindow(options, onAppQuit, setDockBadge) {
     };
 
     createMenu(menuOptions);
+    if (!options.disableContextMenu) {
         initContextMenu(mainWindow);
+    }
 
     if (options.userAgent) {
         mainWindow.webContents.setUserAgent(options.userAgent);

app/src/components/menu/menu.js

@@ -44,7 +44,7 @@ function createMenu({nativefierVersion, appQuit, zoomIn, zoomOut, goBack, goForw
                 },
                 {
                     label: 'Copy Current URL',
-                    accelerator: 'CmdOrCtrl+C',
+                    accelerator: 'CmdOrCtrl+L',
                     click: () => {
                         const currentURL = getCurrentUrl();
                         clipboard.writeText(currentURL);

docs/api.md

@@ -264,6 +264,14 @@ Disable window frame and controls
 
 Shows detailed logs in the console.
 
+#### [disable-context-menu]
+
+```
+--disable-context-menu
+```
+
+Disable the context menu
+
 ## Programmatic API
 
 You can use the Nativefier programmatic API as well.

src/build/buildApp.js

@@ -107,7 +107,8 @@ function selectAppArgs(options) {
         flashPluginDir: options.flashPluginDir,
         fullScreen: options.fullScreen,
         hideWindowFrame: options.hideWindowFrame,
-        maximize: options.maximize
+        maximize: options.maximize,
+        disableContextMenu: options.disableContextMenu
     };
 }
 

src/cli.js

@@ -43,6 +43,7 @@ if (require.main === module) {
         .option('--maximize', 'if the app should always be started maximized')
         .option('--hide-window-frame', 'disable window frame and controls')
         .option('--verbose', 'if verbose logs should be displayed')
+        .option('--disable-context-menu', 'disable the context menu')
         .parse(process.argv);
 
     if (!process.argv.slice(2).length) {

src/options/optionsMain.js

@@ -56,7 +56,8 @@ function optionsFactory(inpOptions, callback) {
         fullScreen: inpOptions.fullScreen || false,
         maximize: inpOptions.maximize || false,
         hideWindowFrame: inpOptions.hideWindowFrame,
-        verbose: inpOptions.verbose
+        verbose: inpOptions.verbose,
+        disableContextMenu: inpOptions.disableContextMenu
     };
 
     if (options.verbose) {