ianhitchman/tiptap
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'master' into feature/suggestions

Browse Source 
# Conflicts:
#	examples/Components/App/style.scss
#	examples/Components/Subnavigation/index.vue
#	examples/main.js
#	packages/tiptap-extensions/package.json
This commit is contained in:
Philipp Kühn
2018-09-24 15:44:42 +02:00
parent 20a7a490e9 2dd2e3361e
commit b2e73fc0a4
30 changed files with 567 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/tiptap-extensions/src/nodes/BulletList.js
View File

@@ -1,5 +1,5 @@
import { Node } from 'tiptap'
import { wrappingInputRule, wrapInList, toggleList } from 'tiptap-commands'
import { wrappingInputRule, toggleList } from 'tiptap-commands'
export default class BulletNode extends Node {
@@ -22,9 +22,9 @@ export default class BulletNode extends Node {
return toggleList(type, schema.nodes.list_item)
}
keys({ type }) {
keys({ type, schema }) {
return {
'Shift-Ctrl-8': wrapInList(type),
'Shift-Ctrl-8': toggleList(type, schema.nodes.list_item),
}
}

2
packages/tiptap-extensions/src/nodes/ListItem.js
View File

@@ -1,7 +1,7 @@
import { Node } from 'tiptap'
import { splitListItem, liftListItem, sinkListItem } from 'tiptap-commands'
export default class OrderedListNode extends Node {
export default class ListItemNode extends Node {
get name() {
return 'list_item'

6
packages/tiptap-extensions/src/nodes/OrderedList.js
View File

@@ -1,5 +1,5 @@
import { Node } from 'tiptap'
import { wrappingInputRule, wrapInList, toggleList } from 'tiptap-commands'
import { wrappingInputRule, toggleList } from 'tiptap-commands'
export default class OrderedListNode extends Node {
@@ -32,9 +32,9 @@ export default class OrderedListNode extends Node {
return toggleList(type, schema.nodes.list_item)
}
keys({ type }) {
keys({ type, schema }) {
return {
'Shift-Ctrl-9': wrapInList(type),
'Shift-Ctrl-9': toggleList(type, schema.nodes.list_item),
}
}