From 7ea32914f96b69ed54ee736add6fdf300f6bb01d Mon Sep 17 00:00:00 2001
From: chris <kokosias@yahoo.gr>
Date: Fri, 16 Apr 2021 12:40:52 +0300
Subject: [PATCH] fix
---
wax-prosemirror-core/src/Wax.js | 5 ++---
wax-prosemirror-core/src/WaxOptions.js | 1 -
wax-prosemirror-core/src/WaxView.js | 10 ++--------
wax-prosemirror-schema/src/nodes/footNoteNode.js | 4 +++-
4 files changed, 7 insertions(+), 13 deletions(-)
diff --git a/wax-prosemirror-core/src/Wax.js b/wax-prosemirror-core/src/Wax.js
index c08fefea4..0299c3f0f 100644
--- a/wax-prosemirror-core/src/Wax.js
+++ b/wax-prosemirror-core/src/Wax.js
@@ -62,7 +62,7 @@ const Wax = props => {
schema.nodes.footnote.spec.toDOM = node => {
// eslint-disable-next-line prefer-rest-params
old.apply(this);
- return ['footnote', node.attrs, 0];
+ if (node) return ['footnote', node.attrs, 0];
};
}
@@ -72,13 +72,12 @@ const Wax = props => {
const serialize = serializer(schema);
WaxOnchange(serialize(value));
}
-
if (schema.nodes.footnote) {
const old = schema.nodes.footnote.spec.toDOM;
schema.nodes.footnote.spec.toDOM = node => {
// eslint-disable-next-line prefer-rest-params
old.apply(this);
- return ['footnote', node.attrs];
+ if (node) return ['footnote', node.attrs];
};
}
},
diff --git a/wax-prosemirror-core/src/WaxOptions.js b/wax-prosemirror-core/src/WaxOptions.js
index 71a6e691a..fa09e1f70 100644
--- a/wax-prosemirror-core/src/WaxOptions.js
+++ b/wax-prosemirror-core/src/WaxOptions.js
@@ -52,6 +52,5 @@ export default ({ placeholder, targetFormat, value, schema, plugins }) => {
const parse = parser(schema);
WaxOptions.doc = parse(editorContent);
}
-
return WaxOptions;
};
diff --git a/wax-prosemirror-core/src/WaxView.js b/wax-prosemirror-core/src/WaxView.js
index 3a887c001..881606bc8 100644
--- a/wax-prosemirror-core/src/WaxView.js
+++ b/wax-prosemirror-core/src/WaxView.js
@@ -131,17 +131,11 @@ export default props => {
'main',
);
}
-<<<<<<< HEAD
- if (view.state.doc !== previousDoc || tr.getMeta('forceUpdate'))
- props.onChange(state.doc.content);
-=======
- console.log(state);
->>>>>>> cleanup
if (targetFormat === 'JSON') {
- props.onChange(state.config.schema)(state.doc.toJSON());
+ props.onChange(schema)(state.doc.toJSON());
} else {
- props.onChange(state.config.schema)(state.doc.content);
+ props.onChange(schema)(state.doc.content);
}
};
diff --git a/wax-prosemirror-schema/src/nodes/footNoteNode.js b/wax-prosemirror-schema/src/nodes/footNoteNode.js
index 582da4bc0..625f0b44c 100644
--- a/wax-prosemirror-schema/src/nodes/footNoteNode.js
+++ b/wax-prosemirror-schema/src/nodes/footNoteNode.js
@@ -7,7 +7,9 @@ const footnote = {
id: { default: '' },
},
toDOM: node => {
- return ['footnote', node.attrs];
+ if (node) {
+ return ['footnote', node.attrs];
+ }
},
parseDOM: [
{
--
GitLab