GitHub/trix
1
0
Fork 0
mirror of https://github.com/basecamp/trix.git synced 2026-05-17 12:00:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make code blocks terminal

Browse Source 
HTML spec doesn't permit <pre> to contain block elements
This commit is contained in:
Javan Makhmali
2016-08-25 08:45:08 -04:00
parent 8969add746
commit 5e7233b4fb
2 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/trix/config/block_attributes.coffee
+1
View File
@@ -12,6 +12,7 @@ Trix.config.blockAttributes = attributes =
group: false
code:
tagName: "pre"
terminal: true
text:
plaintext: true
bulletList:
test/src/system/block_formatting_test.coffee
+17 -6
View File
@@ -57,22 +57,22 @@ testGroup "Block formatting", template: "editor_empty", ->
test "applying block attributes to adjacent unformatted blocks consolidates them", (done) ->
document = new Trix.Document [
new Trix.Block(Trix.Text.textForStringWithAttributes("1"), ["code"])
new Trix.Block(Trix.Text.textForStringWithAttributes("1"), ["bulletList", "bullet"])
new Trix.Block(Trix.Text.textForStringWithAttributes("a"), [])
new Trix.Block(Trix.Text.textForStringWithAttributes("b"), [])
new Trix.Block(Trix.Text.textForStringWithAttributes("c"), [])
new Trix.Block(Trix.Text.textForStringWithAttributes("2"), ["code"])
new Trix.Block(Trix.Text.textForStringWithAttributes("3"), ["code"])
new Trix.Block(Trix.Text.textForStringWithAttributes("2"), ["bulletList", "bullet"])
new Trix.Block(Trix.Text.textForStringWithAttributes("3"), ["bulletList", "bullet"])
]
replaceDocument(document)
getEditorController().setLocationRange([{index: 0, offset: 0}, {index: 5, offset: 1}])
defer ->
clickToolbarButton attribute: "quote", ->
assert.blockAttributes([0, 2], ["code", "quote"])
assert.blockAttributes([0, 2], ["bulletList", "bullet", "quote"])
assert.blockAttributes([2, 8], ["quote"])
assert.blockAttributes([8, 10], ["code", "quote"])
assert.blockAttributes([10, 12], ["code", "quote"])
assert.blockAttributes([8, 10], ["bulletList", "bullet", "quote"])
assert.blockAttributes([10, 12], ["bulletList", "bullet", "quote"])
done()
test "breaking out of the end of a block", (done) ->
@@ -527,6 +527,17 @@ testGroup "Block formatting", template: "editor_empty", ->
assert.notOk isToolbarButtonActive(action: "increaseNestingLevel")
done()
test "code blocks are terminal", (done) ->
clickToolbarButton attribute: "code", ->
assert.ok isToolbarButtonDisabled(attribute: "quote")
assert.ok isToolbarButtonDisabled(attribute: "heading1")
assert.ok isToolbarButtonDisabled(attribute: "bullet")
assert.ok isToolbarButtonDisabled(attribute: "number")
assert.notOk isToolbarButtonDisabled(attribute: "code")
assert.notOk isToolbarButtonDisabled(attribute: "bold")
assert.notOk isToolbarButtonDisabled(attribute: "italic")
done()
test "unindenting a code block inside a bullet", (expectDocument) ->
clickToolbarButton attribute: "bullet", ->
clickToolbarButton attribute: "code", ->