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.

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

adapted to the latest vditor version and fixed the build errors #102

Open
wants to merge 13 commits into
base: master
Choose a base branch
from
4 changes: 4 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,7 @@ jobs:
id: publishToOpenVSX
with:
pat: ${{ secrets.OPEN_VSX_TOKEN }}
- name: Upload VSIX as an artifact
uses: actions/upload-artifact@v3
with:
path: ${{ steps.publishToOpenVSX.outputs.vsixPath }}
3 changes: 1 addition & 2 deletions media-src/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
},
"browserslist": "> 0%",
"devDependencies": {
"@types/node": "^14.14.41",
"typescript": "^4.2.3"
},
"dependencies": {
Expand All @@ -20,6 +19,6 @@
"jquery": "^3.6.0",
"jquery-confirm": "^3.3.4",
"lodash": "^4.17.21",
"vditor": "^3.8.4"
"vditor": "^3.10.7"
}
}
22 changes: 11 additions & 11 deletions media-src/src/fix-table-ir.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
*/
import { keyboard } from '@testing-library/user-event/dist/keyboard'
import $ from 'jquery'
import { i18n } from 'vditor/src/ts/i18n/index'
// import { i18n } from 'vditor/src/ts/i18n/index'
import { updateHotkeyTip } from 'vditor/src/ts/util/compatibility'
import { lang } from './lang'
// import { lang } from './lang'

const tablePanelId = 'fix-table-ir-wrapper'
let disableVscodeHotkeys = false
Expand All @@ -26,63 +26,63 @@ export function fixTableIr() {
>
<button
type="button"
aria-label="${i18n[lang].alignLeft}<${updateHotkeyTip('⇧⌘L')}>"
aria-label="${window.VditorI18n.alignLeft}<${updateHotkeyTip('⇧⌘L')}>"
data-type="left"
class="vditor-icon vditor-tooltipped vditor-tooltipped__n vditor-icon--current"
>
<svg><use xlink:href="#vditor-icon-align-left"></use></svg></button
><button
type="button"
aria-label="${i18n[lang].alignCenter}<${updateHotkeyTip('⇧⌘C')}>"
aria-label="${window.VditorI18n.alignCenter}<${updateHotkeyTip('⇧⌘C')}>"
data-type="center"
class="vditor-icon vditor-tooltipped vditor-tooltipped__n"
>
<svg><use xlink:href="#vditor-icon-align-center"></use></svg></button
><button
type="button"
aria-label="${i18n[lang].alignRight}<${updateHotkeyTip('⇧⌘R')}>"
aria-label="${window.VditorI18n.alignRight}<${updateHotkeyTip('⇧⌘R')}>"
data-type="right"
class="vditor-icon vditor-tooltipped vditor-tooltipped__n"
>
<svg><use xlink:href="#vditor-icon-align-right"></use></svg></button
><button
type="button"
aria-label="${i18n[lang].insertRowAbove}<${updateHotkeyTip('⇧⌘F')}>"
aria-label="${window.VditorI18n.insertRowAbove}<${updateHotkeyTip('⇧⌘F')}>"
data-type="insertRowA"
class="vditor-icon vditor-tooltipped vditor-tooltipped__n"
>
<svg><use xlink:href="#vditor-icon-insert-rowb"></use></svg></button
><button
type="button"
aria-label="${i18n[lang].insertRowBelow}<${updateHotkeyTip('⌘=')}>"
aria-label="${window.VditorI18n.insertRowBelow}<${updateHotkeyTip('⌘=')}>"
data-type="insertRowB"
class="vditor-icon vditor-tooltipped vditor-tooltipped__n"
>
<svg><use xlink:href="#vditor-icon-insert-row"></use></svg></button
><button
type="button"
aria-label="${i18n[lang].insertColumnLeft}<${updateHotkeyTip('⇧⌘G')}>"
aria-label="${window.VditorI18n.insertColumnLeft}<${updateHotkeyTip('⇧⌘G')}>"
data-type="insertColumnL"
class="vditor-icon vditor-tooltipped vditor-tooltipped__n"
>
<svg><use xlink:href="#vditor-icon-insert-columnb"></use></svg></button
><button
type="button"
aria-label="${i18n[lang].insertColumnRight}<${updateHotkeyTip('⇧⌘=')}>"
aria-label="${window.VditorI18n.insertColumnRight}<${updateHotkeyTip('⇧⌘=')}>"
data-type="insertColumnR"
class="vditor-icon vditor-tooltipped vditor-tooltipped__n"
>
<svg><use xlink:href="#vditor-icon-insert-column"></use></svg></button
><button
type="button"
aria-label="${i18n[lang]['delete-row']}<${updateHotkeyTip('⌘-')}>"
aria-label="${window.VditorI18n['delete-row']}<${updateHotkeyTip('⌘-')}>"
data-type="deleteRow"
class="vditor-icon vditor-tooltipped vditor-tooltipped__n"
>
<svg><use xlink:href="#vditor-icon-delete-row"></use></svg></button
><button
type="button"
aria-label="${i18n[lang]['delete-column']}<${updateHotkeyTip('⇧⌘-')}>"
aria-label="${window.VditorI18n['delete-column']}<${updateHotkeyTip('⇧⌘-')}>"
data-type="deleteColumn"
class="vditor-icon vditor-tooltipped vditor-tooltipped__n"
>
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
"displayName": "Markdown Editor",
"icon": "media/logo.png",
"description": "A full-featured WYSIWYG editor for markdown.",
"version": "0.1.12",
"version": "0.1.13",
"publisher": "zaaack",
"private": true,
"engines": {
"vscode": "^1.47.0"
"vscode": "^1.94.0"
},
"categories": [
"Programming Languages",
Expand Down