Merge branch 'master' into async-suggestions

This commit is contained in:
Philipp Kühn
2020-08-07 14:23:08 +02:00
committed by GitHub
23 changed files with 183 additions and 20694 deletions

View File

@@ -1,8 +1,8 @@
{
"name": "tiptap-commands",
"version": "1.14.0",
"version": "1.14.3",
"description": "Commands for tiptap",
"homepage": "https://tiptap.scrumpy.io",
"homepage": "https://tiptap.dev",
"license": "MIT",
"main": "dist/commands.common.js",
"module": "dist/commands.esm.js",
@@ -14,10 +14,10 @@
],
"repository": {
"type": "git",
"url": "git+https://github.com/scrumpy/tiptap.git"
"url": "git+https://github.com/ueberdosis/tiptap.git"
},
"bugs": {
"url": "https://github.com/scrumpy/tiptap/issues"
"url": "https://github.com/ueberdosis/tiptap/issues"
},
"dependencies": {
"prosemirror-commands": "^1.1.4",
@@ -27,6 +27,6 @@
"prosemirror-state": "^1.3.3",
"prosemirror-tables": "^1.1.0",
"prosemirror-utils": "^0.9.6",
"tiptap-utils": "^1.10.0"
"tiptap-utils": "^1.10.3"
}
}

View File

@@ -1,8 +1,8 @@
{
"name": "tiptap-extensions",
"version": "1.31.0",
"version": "1.31.3",
"description": "Extensions for tiptap",
"homepage": "https://tiptap.scrumpy.io",
"homepage": "https://tiptap.dev",
"license": "MIT",
"main": "dist/extensions.common.js",
"module": "dist/extensions.esm.js",
@@ -15,10 +15,10 @@
],
"repository": {
"type": "git",
"url": "git+https://github.com/scrumpy/tiptap.git"
"url": "git+https://github.com/ueberdosis/tiptap.git"
},
"bugs": {
"url": "https://github.com/scrumpy/tiptap/issues"
"url": "https://github.com/ueberdosis/tiptap/issues"
},
"dependencies": {
"lowlight": "^1.14.0",
@@ -30,8 +30,8 @@
"prosemirror-transform": "^1.2.6",
"prosemirror-utils": "^0.9.6",
"prosemirror-view": "^1.15.0",
"tiptap": "^1.29.0",
"tiptap-commands": "^1.14.0"
"tiptap": "^1.29.3",
"tiptap-commands": "^1.14.3"
},
"peerDependencies": {
"vue": "^2.5.17",

View File

@@ -21,6 +21,9 @@ export default class History extends Extension {
'Mod-z': undo,
'Mod-y': redo,
'Shift-Mod-z': redo,
// Russian language
'Mod-я': undo,
'Shift-Mod-я': redo,
}
return keymap

View File

@@ -1,8 +1,8 @@
{
"name": "tiptap-utils",
"version": "1.10.0",
"version": "1.10.3",
"description": "Utility functions for tiptap",
"homepage": "https://tiptap.scrumpy.io",
"homepage": "https://tiptap.dev",
"license": "MIT",
"main": "dist/utils.common.js",
"module": "dist/utils.esm.js",
@@ -14,10 +14,10 @@
],
"repository": {
"type": "git",
"url": "git+https://github.com/scrumpy/tiptap.git"
"url": "git+https://github.com/ueberdosis/tiptap.git"
},
"bugs": {
"url": "https://github.com/scrumpy/tiptap/issues"
"url": "https://github.com/ueberdosis/tiptap/issues"
},
"dependencies": {
"prosemirror-model": "^1.10.0",

View File

@@ -1,8 +1,8 @@
{
"name": "tiptap",
"version": "1.29.0",
"version": "1.29.3",
"description": "A rich-text editor for Vue.js",
"homepage": "https://tiptap.scrumpy.io",
"homepage": "https://tiptap.dev",
"license": "MIT",
"main": "dist/tiptap.common.js",
"module": "dist/tiptap.esm.js",
@@ -14,10 +14,10 @@
],
"repository": {
"type": "git",
"url": "git+https://github.com/scrumpy/tiptap.git"
"url": "git+https://github.com/ueberdosis/tiptap.git"
},
"bugs": {
"url": "https://github.com/scrumpy/tiptap/issues"
"url": "https://github.com/ueberdosis/tiptap/issues"
},
"dependencies": {
"prosemirror-commands": "1.1.4",
@@ -28,8 +28,8 @@
"prosemirror-model": "1.10.0",
"prosemirror-state": "1.3.3",
"prosemirror-view": "1.15.0",
"tiptap-commands": "^1.14.0",
"tiptap-utils": "^1.10.0"
"tiptap-commands": "^1.14.3",
"tiptap-utils": "^1.10.3"
},
"peerDependencies": {
"vue": "^2.5.17",

View File

@@ -274,7 +274,7 @@ export default class Editor extends Emitter {
if (typeof content === 'string') {
const htmlString = `<div>${content}</div>`
const parser = new window.DOMParser()
const element = parser.parseFromString(htmlString, 'text/html').body
const element = parser.parseFromString(htmlString, 'text/html').body.firstElementChild
return DOMParser.fromSchema(this.schema).parse(element, parseOptions)
}