prosemirror
Advanced tools
Comparing version 0.8.0 to 0.8.1
@@ -0,1 +1,11 @@ | ||
## 0.8.1 (2016-06-16) | ||
### Bug fixes | ||
Fixes `addActiveMark` and `removeActiveMark` ignoring marks from the | ||
document, and thus accidentally resetting the set of marks when used. | ||
Properly export the parser, serializer, and state classes from the | ||
`markdown` module. | ||
## 0.8.0 (2016-06-15) | ||
@@ -2,0 +12,0 @@ |
@@ -560,4 +560,3 @@ "use strict"; | ||
value: function activeMarks() { | ||
var head; | ||
return this.input.storedMarks || ((head = this.selection.head) != null ? this.doc.marksAt(head) : Mark.none); | ||
return this.input.storedMarks || currentMarks(this); | ||
} | ||
@@ -574,3 +573,3 @@ | ||
if (this.selection.empty) { | ||
this.input.storedMarks = mark.addToSet(this.input.storedMarks || Mark.none); | ||
this.input.storedMarks = mark.addToSet(this.input.storedMarks || currentMarks(this)); | ||
this.on.activeMarkChange.dispatch(); | ||
@@ -587,3 +586,3 @@ } | ||
if (this.selection.empty) { | ||
this.input.storedMarks = markType.removeFromSet(this.input.storedMarks || Mark.none); | ||
this.input.storedMarks = markType.removeFromSet(this.input.storedMarks || currentMarks(this)); | ||
this.on.activeMarkChange.dispatch(); | ||
@@ -783,2 +782,7 @@ } | ||
function currentMarks(pm) { | ||
var head = pm.selection.head; | ||
return head == null ? Mark.none : pm.doc.marksAt(head); | ||
} | ||
var nullOptions = {}; | ||
@@ -785,0 +789,0 @@ |
@@ -263,7 +263,7 @@ "use strict"; | ||
exports.MarkdownParser = MarkdownParser; | ||
// :: MarkdownParser | ||
// A parser parsing unextended [CommonMark](http://commonmark.org/), | ||
// without inline HTML, and producing a document in the basic schema. | ||
var defaultMarkdownParser = new MarkdownParser(schema, markdownit("commonmark", { html: false }), { | ||
@@ -270,0 +270,0 @@ blockquote: { block: "blockquote" }, |
@@ -56,6 +56,6 @@ "use strict"; | ||
exports.MarkdownSerializer = MarkdownSerializer; | ||
// :: MarkdownSerializer | ||
// A serializer for the [basic schema](#schema). | ||
var defaultMarkdownSerializer = new MarkdownSerializer({ | ||
@@ -381,2 +381,4 @@ blockquote: function blockquote(state, node) { | ||
return MarkdownSerializerState; | ||
}(); | ||
}(); | ||
exports.MarkdownSerializerState = MarkdownSerializerState; |
{ | ||
"name": "prosemirror", | ||
"version": "0.8.0", | ||
"version": "0.8.1", | ||
"description": "Well-defined WYSIWYG editor", | ||
@@ -5,0 +5,0 @@ "main": "dist/edit/index.js", |
@@ -439,5 +439,3 @@ require("./css") | ||
activeMarks() { | ||
var head | ||
return this.input.storedMarks || | ||
((head = this.selection.head) != null ? this.doc.marksAt(head) : Mark.none) | ||
return this.input.storedMarks || currentMarks(this) | ||
} | ||
@@ -451,3 +449,3 @@ | ||
if (this.selection.empty) { | ||
this.input.storedMarks = mark.addToSet(this.input.storedMarks || Mark.none) | ||
this.input.storedMarks = mark.addToSet(this.input.storedMarks || currentMarks(this)) | ||
this.on.activeMarkChange.dispatch() | ||
@@ -461,3 +459,3 @@ } | ||
if (this.selection.empty) { | ||
this.input.storedMarks = markType.removeFromSet(this.input.storedMarks || Mark.none) | ||
this.input.storedMarks = markType.removeFromSet(this.input.storedMarks || currentMarks(this)) | ||
this.on.activeMarkChange.dispatch() | ||
@@ -607,2 +605,7 @@ } | ||
function currentMarks(pm) { | ||
let head = pm.selection.head | ||
return head == null ? Mark.none : pm.doc.marksAt(head) | ||
} | ||
const nullOptions = {} | ||
@@ -609,0 +612,0 @@ |
@@ -180,2 +180,3 @@ const markdownit = require("markdown-it") | ||
} | ||
exports.MarkdownParser = MarkdownParser | ||
@@ -182,0 +183,0 @@ // :: MarkdownParser |
@@ -38,2 +38,3 @@ // ;; A specification for serializing a ProseMirror document as | ||
} | ||
exports.MarkdownSerializer = MarkdownSerializer | ||
@@ -308,1 +309,2 @@ // :: MarkdownSerializer | ||
} | ||
exports.MarkdownSerializerState = MarkdownSerializerState |
1255996
29815