Commit Graph
470 Commits
Author SHA1 Message Date
Javan Makhmali 5e7233b4fb Make code blocks terminal
HTML spec doesn't permit <pre> to contain block elements
2016-08-25 08:45:08 -04:00
Drew Rygh 6c51986b9b Test backspacing a newline at beginning of non-formatted block 2016-08-25 08:20:11 -04:00
Drew Rygh ae3d898255 Add tests 2016-08-25 08:20:11 -04:00
Drew Rygh 33b6c9e395 Fix inserting multiple newlines before formatted block 2016-08-23 11:55:30 -05:00
Javan Makhmali 7ca7157f9d Fix sporadic test failure from inconsistent attribute ordering 2016-08-21 07:24:17 -04:00
Javan Makhmali d8622cb8f2 Fix SplittableList#removeObjectsInRange
Introduced in d8d3b0fbe2
2016-08-21 07:19:17 -04:00
Sam Stephenson bb256869c1 “Indentation” -> “Nesting” 2016-08-18 18:08:48 -05:00
Sam Stephenson ac5b01f6a4 Rename toolbar indentation level actions
Deprecate the `block-level` class and `increaseBlockLevel`/`decreaseBlockLevel` actions, but keep them around for compatibility
2016-08-18 17:07:24 -05:00
Sam Stephenson 380fdb063e List indentation constraints consider the list type 2016-08-18 16:28:37 -05:00
Sam Stephenson 9eb10f3b06 Quotes inside a list item should be indentable 2016-08-18 16:05:05 -05:00
Sam Stephenson dd4f127506 Indenting a block doubles the last indentable attribute 2016-08-17 18:54:33 -05:00
Sam Stephenson 06e39770bd Preserve subsequent block attributes when unindenting 2016-08-17 15:26:57 -05:00
Drew Rygh 90b6f9fc4d Remove newlines 2016-08-15 14:36:16 -05:00
Drew Rygh 140d504c52 Revert "Decreasing indentation should not remove heading"
This reverts commit d9366ff8d0.
2016-08-15 13:57:16 -05:00
Drew Rygh d9366ff8d0 Decreasing indentation should not remove heading 2016-08-15 10:01:40 -05:00
Drew Rygh d468601bdf Prevent multi-block selections from creating nested headings 2016-08-11 13:39:42 -05:00
Drew Rygh c393c5209b Merge branch 'master' of https://github.com/basecamp/trix into header 2016-08-11 09:21:05 -05:00
Drew Rygh 8c842141f3 Fix breaking out of a formatted block with adjacent non-formatted blocks 2016-08-10 17:01:39 -05:00
Javan Makhmali 2cbc06f9b7 Fix parsing HTML for pending attachments. Fixes #287 2016-08-10 14:31:22 -04:00
Drew Rygh 7d2d366507 Fix breaking out of end of heading block with preceding blocks 2016-08-09 12:35:05 -05:00
Drew Rygh 69748a3c46 Inserting multiple newlines before heading should not break block 2016-08-09 11:15:07 -05:00
Drew Rygh 3f80c42c5a Fix inserting newline in heading when next block contains text 2016-08-03 17:37:00 -05:00
Drew Rygh e263eda5bc Merge remote-tracking branch 'origin/master' into header 2016-08-03 09:34:15 -05:00
Drew Rygh 4b28f559f6 Update expected behavior 2016-08-03 09:30:59 -05:00
Drew Rygh 3bcff68968 Revert "Non-H1 headings should receive bold attribute when pasted"
This reverts commit 8464fcf7d0.
2016-08-01 12:15:31 -05:00
Drew Rygh 8464fcf7d0 Non-H1 headings should receive bold attribute when pasted 2016-07-28 14:29:12 -05:00
Drew Rygh 983d591ece Fix breaking out of middle of heading block with preceding blocks 2016-07-28 10:11:26 -05:00
Drew Rygh 3fc5cfc022 Breaking out of heading block should create new block without heading attr 2016-07-27 18:56:21 -05:00
Drew Rygh 86e792cf40 Breaking out of heading block should create new block 2016-07-27 16:00:40 -05:00
Drew Rygh 4167d20035 Add fixtures for headings 2016-07-27 14:05:38 -05:00
Drew Rygh aac1e4df18 Multiple headings/list items should not be grouped together 2016-07-27 10:33:05 -05:00
Javan Makhmali 98931a15c1 Avoid inheriting text attributes for BR elements from parent block elements
Fixes the fix in ed39bb8022
2016-07-25 16:19:00 -04:00
Drew Rygh 1e554f8770 Clean up tests 2016-07-25 10:37:56 -05:00
Drew Rygh 91dbb2240a Fix inserting newline after single character header
Closes #274
2016-07-25 10:09:09 -05:00
Drew Rygh f17a9a4297 Heading > Heading1 2016-07-14 15:57:13 -05:00
Drew Rygh 2578fe9525 Build document declaratively for newline test 2016-07-13 11:04:18 -05:00
Drew Rygh 3d3da48e1a Correct assertions for insert newline test 2016-07-12 14:07:02 -05:00
Drew Rygh 3dc4e6f17a Header > Heading 2016-07-11 15:08:01 -05:00
Drew Rygh 24e27e637b Fix inserting newline before heading 2016-07-11 13:44:07 -05:00
Drew Rygh fe6eaa4bac Only allow last attribute in stack to be removed 2016-07-07 09:39:54 -05:00
Drew Rygh 5abcaf3b0a Add toolbar assertations 2016-07-05 16:06:29 -05:00
Drew Rygh c9bbde1ed6 Returning from within header block should not break block 2016-07-05 14:45:00 -05:00
Drew Rygh a00ad83222 Add partial header support and tests 2016-07-05 09:56:02 -05:00
Javan Makhmali 0b79f1b640 Skip autofocus test on CI pending a better solution 2016-07-05 10:06:35 -04:00
Javan Makhmali ee9a2f52f5 Fix Document#getPieceAtPosition 2016-06-19 19:09:45 -05:00
Javan Makhmali a3a5706c90 Ensure window is active on CI so focus and blur events are natively dispatched
This is the right fix for b4745a816d, reverted in c2e82c4f08
2016-06-17 12:39:39 -04:00
Javan Makhmali 0e4dc6e1a0 Handle autocapitalization without a reparse 2016-06-16 11:37:27 -04:00
Javan Makhmali 92d47f97f5 Fix typing formatted text after a newline at the end of a block
contenteditable naturally types over <br>s at the end of a block element, and we need to account for their removal now that we’re correctly summarizing <br> mutations (1497f5213a).
2016-06-16 11:35:27 -04:00
Javan Makhmali 41352e0fe6 Prefer pasting text/plain when the text/html clipboard data is equivelant to help preserve whitespace characters. Closes #246 2016-06-10 14:02:27 -04:00
Javan Makhmali 5b2d974d27 Fix triggering "trix-focus" event when autofocusing 2016-05-27 13:11:21 -04:00