Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enable Electron right click Inspect Element #4003

Merged
merged 4 commits into from
Apr 26, 2019
Merged

Enable Electron right click Inspect Element #4003

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e01507d
upgrade to electron 2.0.18 and node 8.9.3
chrisbreiding Apr 18, 2019
eb37328
enable Inspect Element in electron context menu
chrisbreiding Apr 18, 2019
94385ab
use electron-context-menu 0.11.0 due to electron 4 requirement
chrisbreiding Apr 18, 2019
5416b67
Merge branch 'develop' into issue-4002-electron-right-click
chrisbreiding Apr 26, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .node-version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
8.2.1
8.9.3
4 changes: 2 additions & 2 deletions appveyor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ branches:

# https://www.appveyor.com/docs/lang/nodejs-iojs/
environment:
# use latest version of Node 8 with NPM 6
nodejs_version: "8.2.1"
# use matching version of Node.js
nodejs_version: "8.9.3"
# encode secure variables which will NOT be used
# in pull requests
# https://www.appveyor.com/docs/build-configuration/#secure-variables
Expand Down
2 changes: 1 addition & 1 deletion packages/electron/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@packages/electron",
"version": "0.0.0",
"electronVersion": "1.8.2",
"electronVersion": "2.0.18",
"private": true,
"main": "index.js",
"scripts": {
Expand Down
4 changes: 1 addition & 3 deletions packages/server/lib/gui/windows.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,9 +209,7 @@ module.exports = {
if options.contextMenu
## adds context menu with copy, paste, inspect element, etc
contextMenu({
## don't show inspect element until this fix is released
## and we upgrade electron: https://github.com/electron/electron/pull/8688
showInspectElement: false
showInspectElement: true
window: win
})

Expand Down