Skip to content

Commit

Permalink
Update dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
@fxha
fxha committed Jun 7, 2020
1 parent c79f84e commit 626fd0d
Show file tree
Hide file tree
Showing 4 changed files with 113 additions and 125 deletions.
49 changes: 24 additions & 25 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,21 +42,21 @@
"chokidar": "^3.4.0",
"codemirror": "^5.54.0",
"command-exists": "^1.2.9",
"dayjs": "^1.8.27",
"dayjs": "^1.8.28",
"dom-autoscroller": "^2.3.4",
"dompurify": "^2.0.11",
"dragula": "^3.7.2",
"electron-is-accelerator": "^0.2.0",
"electron-log": "^4.1.3",
"electron-store": "^5.1.1",
"electron-log": "^4.2.1",
"electron-store": "^5.2.0",
"electron-window-state": "^5.0.3",
"element-resize-detector": "^1.2.1",
"element-ui": "^2.13.2",
"execall": "^2.0.0",
"file-icons-js": "^1.0.3",
"flowchart.js": "^1.13.0",
"fontmanager-redux": "^0.4.0",
"fs-extra": "^9.0.0",
"fs-extra": "^9.0.1",
"fuzzaldrin": "^2.1.0",
"github-markdown-css": "^3.0.1",
"html-tags": "^3.1.0",
Expand All @@ -66,7 +66,7 @@
"katex": "^0.11.1",
"keyboard-layout": "^2.0.16",
"keytar": "5.6.0",
"mermaid": "^8.5.1",
"mermaid": "^8.5.2",
"plist": "^3.0.1",
"popper.js": "^1.16.1",
"prismjs": "^1.20.0",
Expand All @@ -76,28 +76,27 @@
"turndown": "^6.0.0",
"underscore": "^1.10.2",
"unsplash-js": "^6.0.0",
"vega": "^5.10.0",
"vega-embed": "^6.4.0",
"vega-lite": "^4.7.0",
"view-image": "^0.0.1",
"vega": "^5.13.0",
"vega-embed": "^6.8.0",
"vega-lite": "^4.13.1",
"vscode-ripgrep": "^1.5.8",
"vue": "^2.6.11",
"vue-electron": "^1.0.6",
"vue-router": "^3.2.0",
"vue-router": "^3.3.2",
"vuex": "^3.4.0",
"webfontloader": "^1.6.28"
},
"devDependencies": {
"@babel/core": "^7.9.6",
"@babel/plugin-proposal-class-properties": "^7.8.3",
"@babel/plugin-proposal-export-default-from": "^7.8.3",
"@babel/plugin-proposal-function-bind": "^7.8.3",
"@babel/plugin-syntax-class-properties": "^7.8.3",
"@babel/core": "^7.10.2",
"@babel/plugin-proposal-class-properties": "^7.10.1",
"@babel/plugin-proposal-export-default-from": "^7.10.1",
"@babel/plugin-proposal-function-bind": "^7.10.1",
"@babel/plugin-syntax-class-properties": "^7.10.1",
"@babel/plugin-syntax-dynamic-import": "^7.8.3",
"@babel/plugin-transform-runtime": "^7.9.6",
"@babel/preset-env": "^7.9.6",
"@babel/register": "^7.9.0",
"@babel/runtime": "^7.9.6",
"@babel/plugin-transform-runtime": "^7.10.1",
"@babel/preset-env": "^7.10.2",
"@babel/register": "^7.10.1",
"@babel/runtime": "^7.10.2",
"@markedjs/html-differ": "^3.0.2",
"babel-eslint": "^10.1.0",
"babel-loader": "^8.1.0",
Expand All @@ -113,12 +112,12 @@
"del": "^5.1.0",
"devtron": "^1.4.0",
"dotenv": "^8.2.0",
"electron": "^8.3.0",
"electron-builder": "^22.6.0",
"electron": "^8.3.1",
"electron-builder": "^22.7.0",
"electron-devtools-installer": "^3.0.0",
"electron-rebuild": "^1.11.0",
"electron-updater": "^4.3.1",
"eslint": "^7.0.0",
"electron-updater": "^4.3.3",
"eslint": "^7.2.0",
"eslint-config-standard": "^14.1.1",
"eslint-friendly-formatter": "^4.0.1",
"eslint-import-resolver-alias": "^1.1.2",
Expand All @@ -143,9 +142,9 @@
"karma-spec-reporter": "0.0.32",
"karma-webpack": "^4.0.2",
"license-checker": "^25.0.1",
"marked": "^0.8.0",
"marked": "^0.8.2",
"mini-css-extract-plugin": "^0.9.0",
"mocha": "^7.1.2",
"mocha": "^7.2.0",
"multispinner": "^0.2.1",
"node-fetch": "^2.6.0",
"node-loader": "^0.6.0",
Expand Down
38 changes: 20 additions & 18 deletions src/renderer/components/editorWithTabs/editor.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
import { shell } from 'electron'
import log from 'electron-log'
import { mapState } from 'vuex'
import ViewImage from 'view-image'
// import ViewImage from 'view-image'
import Muya from 'muya/lib'
import TablePicker from 'muya/lib/ui/tablePicker'
import QuickInsert from 'muya/lib/ui/quickInsert'
Expand Down Expand Up @@ -106,7 +106,7 @@ import { addCommonStyle, setEditorWidth } from '@/util/theme'
import 'muya/themes/default.css'
import '@/assets/themes/codemirror/one-dark.css'
import 'view-image/lib/imgViewer.css'
// import 'view-image/lib/imgViewer.css'
import CloseIcon from '@/assets/icons/close.svg'
const STANDAR_Y = 320
Expand Down Expand Up @@ -651,27 +651,29 @@ export default {
this.imageViewer.destroy()
}
this.imageViewer = new ViewImage(this.$refs.imageViewer, {
url: data,
snapView: true
})
// Disabled due to #2120.
// this.imageViewer = new ViewImage(this.$refs.imageViewer, {
// url: data,
// snapView: true
// })
this.setImageViewerVisible(true)
}
})
this.editor.on('preview-image', ({ data }) => {
if (this.imageViewer) {
this.imageViewer.destroy()
}
this.imageViewer = new ViewImage(this.$refs.imageViewer, {
url: data,
snapView: true
})
this.setImageViewerVisible(true)
})
// Disabled due to #2120.
// this.editor.on('preview-image', ({ data }) => {
// if (this.imageViewer) {
// this.imageViewer.destroy()
// }
//
// this.imageViewer = new ViewImage(this.$refs.imageViewer, {
// url: data,
// snapView: true
// })
//
// this.setImageViewerVisible(true)
// })
this.editor.on('selectionChange', changes => {
const { y } = changes.cursorCoords
Expand Down
4 changes: 2 additions & 2 deletions src/renderer/prefComponents/spellchecker/index.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
></bool>
<separator></separator>
<bool
description="Use Hunspell instead of system spell checker on macOS and Windows 10 (requires restart).
description="Use Hunspell instead of system spell checker on macOS and Windows 10 (requires restart)."
:bool="spellcheckerIsHunspell"
:disable="!isOsSpellcheckerSupported || !spellcheckerEnabled"
:onChange="value => onSelectChange('spellcheckerIsHunspell', value)"
Expand All @@ -21,7 +21,7 @@
></bool>
<bool
v-show="isOsx && !spellcheckerIsHunspell"
description="Automatically detect document language (requires showing marks for spelling errors).
description="Automatically detect document language (requires showing marks for spelling errors)."
:bool="spellcheckerAutoDetectLanguage"
:disable="!spellcheckerEnabled"
:onChange="value => onSelectChange('spellcheckerAutoDetectLanguage', value)"
Expand Down

0 comments on commit 626fd0d

Please sign in to comment.