public/Boostnote
1
0
Fork 0
mirror of https://github.com/BoostIo/Boostnote synced 2025-12-13 01:36:22 +00:00
Code Issues Releases Wiki Activity

Merge upstream into master

Browse Source
This commit is contained in:
nathan-castlehow
2019-08-01 19:56:38 +08:00
parent 918a8627e9
commit eeca031c86
3 changed files with 0 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
browser/components/MarkdownPreview.js
View File

@@ -248,11 +248,7 @@ export default class MarkdownPreview extends React.Component {
handleContextMenu (event) { handleContextMenu (event) {
const menu = buildMarkdownPreviewContextMenu(this, event) const menu = buildMarkdownPreviewContextMenu(this, event)
if (menu != null) { if (menu != null) {
<<<<<<< HEAD
setTimeout(() => menu.popup(remote.getCurrentWindow()), 30)
=======
menu.popup(remote.getCurrentWindow()) menu.popup(remote.getCurrentWindow())
>>>>>>> upstream/master
} }
} }

9
browser/lib/contextMenuBuilder.js
View File

@@ -81,17 +81,8 @@ const buildMarkdownPreviewContextMenu = function (markdownPreview, event) {
// Default context menu inclusions // Default context menu inclusions
const template = [{ const template = [{
<<<<<<< HEAD
role: 'cut'
}, {
role: 'copy' role: 'copy'
}, { }, {
role: 'paste'
}, {
=======
role: 'copy'
}, {
>>>>>>> upstream/master
role: 'selectall' role: 'selectall'
}] }]

5
tests/lib/contextMenuBuilder.test.js
View File

@@ -4,13 +4,8 @@ jest.mock('electron', () => {
}) })
const spellcheck = require('browser/lib/spellcheck') const spellcheck = require('browser/lib/spellcheck')
<<<<<<< HEAD
const buildEditorContextMenu = require('browser/lib/contextMenuBuilder')
const buildMarkdownPreviewContextMenu = require('browser/lib/contextMenuBuilder')
=======
const buildEditorContextMenu = require('browser/lib/contextMenuBuilder').buildEditorContextMenu const buildEditorContextMenu = require('browser/lib/contextMenuBuilder').buildEditorContextMenu
const buildMarkdownPreviewContextMenu = require('browser/lib/contextMenuBuilder').buildMarkdownPreviewContextMenu const buildMarkdownPreviewContextMenu = require('browser/lib/contextMenuBuilder').buildMarkdownPreviewContextMenu
>>>>>>> upstream/master
beforeEach(() => { beforeEach(() => {
menuBuilderParameter = null menuBuilderParameter = null