fix context menu on macos (marktext#1993)

Jocs · web-flow · commit fe641a67f0ab · 2020-03-25T10:54:53.000+08:00
* fix context menu on macos

* update yarn.lock

* update lock file

* try to fix CI error

* try to fix CI error
diff --git a/.travis.yml b/.travis.yml
@@ -1,9 +1,8 @@
-sudo: required
 language: node_js
 node_js:
   - 12
 
-matrix:
+jobs:
   include:
   - os: osx
     osx_image: xcode9.4
diff --git a/src/renderer/contextMenu/editor/index.js b/src/renderer/contextMenu/editor/index.js
@@ -47,5 +47,5 @@ export const showContextMenu = (event, selection, spellchecker, selectedWord, wo
   CONTEXT_ITEMS.forEach(item => {
     menu.append(new MenuItem(item))
   })
-  menu.popup({ window: win, x: event.clientX, y: event.clientY })
+  menu.popup([{ window: win, x: event.clientX, y: event.clientY }])
 }
diff --git a/src/renderer/contextMenu/sideBar/index.js b/src/renderer/contextMenu/sideBar/index.js
@@ -35,5 +35,5 @@ export const showContextMenu = (event, hasPathCache) => {
   CONTEXT_ITEMS.forEach(item => {
     menu.append(new MenuItem(item))
   })
-  menu.popup({ window: win, x: event.clientX, y: event.clientY })
+  menu.popup([{ window: win, x: event.clientX, y: event.clientY }])
 }
diff --git a/src/renderer/contextMenu/tabs/index.js b/src/renderer/contextMenu/tabs/index.js
@@ -28,5 +28,5 @@ export const showContextMenu = (event, tab) => {
     menuItem._tabId = tab.id
     menu.append(menuItem)
   })
-  menu.popup({ window: win, x: event.clientX, y: event.clientY })
+  menu.popup([{ window: win, x: event.clientX, y: event.clientY }])
 }
diff --git a/src/renderer/prefComponents/spellchecker/index.vue b/src/renderer/prefComponents/spellchecker/index.vue
@@ -14,7 +14,7 @@
       :onChange="value => onSelectChange('spellcheckerIsHunspell', value)"
     ></bool>
     <bool
-      description="Don't underline spelling mistakes. You can still correct spelling mistakes via the right click menu."				
+      description="Don't underline spelling mistakes. You can still correct spelling mistakes via the right click menu."
       :bool="spellcheckerNoUnderline"
       :disable="!spellcheckerEnabled"
       :onChange="value => onSelectChange('spellcheckerNoUnderline', value)"
diff --git a/yarn.lock b/yarn.lock
@@ -4602,8 +4602,8 @@ electron-window-state@^5.0.3:
 
 electron@^8.1.1:
   version "8.1.1"
-  resolved "https://registry.yarnpkg.com/electron/-/electron-8.1.1.tgz#737a5af03c7b4af60b49dff7bfe1203fcbd5bf89"
-  integrity sha512-t+5zzFo7VOgckJc9YpImHJkpqeWxwpmEjywWbAa4IT5MULS7h1XU52H9gMswK/y8xc5lBNwxLhJSty/15+gi1A==
+  resolved "https://registry.npm.taobao.org/electron/download/electron-8.1.1.tgz#737a5af03c7b4af60b49dff7bfe1203fcbd5bf89"
+  integrity sha1-c3pa8Dx7SvYLSd/3v+EgP8vVv4k=
   dependencies:
     "@electron/get" "^1.0.1"
     "@types/node" "^12.0.12"
@@ -8481,17 +8481,10 @@ no-case@^2.2.0, no-case@^2.3.2:
   dependencies:
     lower-case "^1.1.1"
 
-node-abi@^2.11.0:
+node-abi@2.15.0, node-abi@^2.11.0, node-abi@^2.7.0:
   version "2.15.0"
-  resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-2.15.0.tgz#51d55cc711bd9e4a24a572ace13b9231945ccb10"
-  integrity sha512-FeLpTS0F39U7hHZU1srAK4Vx+5AHNVOTP+hxBNQknR/54laTHSFIJkDWDqiquY1LeLUgTfPN7sLPhMubx0PLAg==
-  dependencies:
-    semver "^5.4.1"
-
-node-abi@^2.7.0:
-  version "2.14.0"
-  resolved "https://registry.npmjs.org/node-abi/-/node-abi-2.14.0.tgz#24650e24e8ffad2b61352519263f0cf4e2ddbfe9"
-  integrity sha512-y54KGgEOHnRHlGQi7E5UiryRkH8bmksmQLj/9iLAjoje743YS+KaKB/sDYXgqtT0J16JT3c3AYJZNI98aU/kYg==
+  resolved "https://registry.npm.taobao.org/node-abi/download/node-abi-2.15.0.tgz#51d55cc711bd9e4a24a572ace13b9231945ccb10"
+  integrity sha1-UdVcxxG9nkokpXKs4TuSMZRcyxA=
   dependencies:
     semver "^5.4.1"
 

Original file line number	Diff line number	Diff line change
`@@ -47,5 +47,5 @@ export const showContextMenu = (event, selection, spellchecker, selectedWord, wo`
`47`	`47`	`CONTEXT_ITEMS.forEach(item => {`
`48`	`48`	`menu.append(new MenuItem(item))`
`49`	`49`	`})`
`50`		`- menu.popup({ window: win, x: event.clientX, y: event.clientY })`
	`50`	`+ menu.popup([{ window: win, x: event.clientX, y: event.clientY }])`
`51`	`51`	`}`
Original file line number	Diff line number	Diff line change
`@@ -35,5 +35,5 @@ export const showContextMenu = (event, hasPathCache) => {`
`35`	`35`	`CONTEXT_ITEMS.forEach(item => {`
`36`	`36`	`menu.append(new MenuItem(item))`
`37`	`37`	`})`
`38`		`- menu.popup({ window: win, x: event.clientX, y: event.clientY })`
	`38`	`+ menu.popup([{ window: win, x: event.clientX, y: event.clientY }])`
`39`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,5 +28,5 @@ export const showContextMenu = (event, tab) => {`
`28`	`28`	`menuItem._tabId = tab.id`
`29`	`29`	`menu.append(menuItem)`
`30`	`30`	`})`
`31`		`- menu.popup({ window: win, x: event.clientX, y: event.clientY })`
	`31`	`+ menu.popup([{ window: win, x: event.clientX, y: event.clientY }])`
`32`	`32`	`}`