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
2,131 Commits 24 Branches 75 Tags
sync-with-patch
Commit Graph

2131 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Javan Makhmali b0545686fc WIP: Patch nodes when syncing 2016-08-31 09:36:18 -04:00
Javan Makhmali 222a6efa5b Trix 0.9.9 0.9.9 2016-08-25 15:17:58 -04:00
Javan Makhmali 06f39f3a6f Update LICENSE when releasing 2016-08-25 09:32:22 -04:00
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
Javan Makhmali 8969add746 Merge pull request #301 from basecamp/remove-leading-block-newline 
Improve behavior when backspacing into a formatted block from a block with a leading newline
 2016-08-25 08:31:36 -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
Javan Makhmali 619eee5832 Remove right block's leading newline when backspacing through a block break 2016-08-25 08:20:11 -04:00
Javan Makhmali 0cc4ab0791 Merge pull request #299 from basecamp/header-insert-newline 
Fix inserting multiple newlines before formatted block
 2016-08-25 08:17:14 -04:00
Drew Rygh 95a77d5601 Remove extraneous variables 2016-08-24 10:46:08 -05:00
Drew Rygh 33b6c9e395 Fix inserting multiple newlines before formatted block 2016-08-23 11:55:30 -05:00
Javan Makhmali c61c4e6674 Merge pull request #297 from basecamp/fix-ci 
Bump Blade’s Sauce Labs plugin
 2016-08-22 15:55:21 -04:00
Javan Makhmali 9bacbcf48b Bump Blade’s Sauce Labs plugin 2016-08-22 15:45:18 -04:00
Javan Makhmali 143cda00ad Add <details> polyfill for the inspector 2016-08-22 11:24:19 -04: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 a627e25720 Rename indentation icon class names 2016-08-18 18:29:52 -05:00
Sam Stephenson da4ebc1fe5 Merge pull request #294 from basecamp/indentable 
Nestable block attributes
 2016-08-18 18:15:58 -05: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 d8d3b0fbe2 Extract Trix.spliceArray helper 2016-08-18 16:40:03 -05:00
Sam Stephenson 380fdb063e List indentation constraints consider the list type 2016-08-18 16:28:37 -05:00
Sam Stephenson 3f401aca3a Reuse splice helper 2016-08-18 16:27:11 -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 19a12948c2 Consider only the last block attribute in Block#isListItem 2016-08-17 17:03:35 -05:00
Sam Stephenson 06e39770bd Preserve subsequent block attributes when unindenting 2016-08-17 15:26:57 -05:00
Sam Stephenson 73691b32ce WIP: Model indentation level/indentable block attributes 2016-08-16 19:00:55 -05:00
Javan Makhmali 2c2c829414 Merge pull request #263 from basecamp/header 
Headings
 2016-08-15 16:18:46 -04: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 5e187edff4 Rename and refactor config helper methods 2016-08-15 11:35:53 -05:00
Drew Rygh 43d08508eb Add local variable for clarity/readability 2016-08-15 10:46:36 -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 631cb2068b Reuse calculated variables in LineBreakInsertion 2016-08-09 09:31:48 -05:00
Drew Rygh efe9e43b37 Move insertion functionality to Composition 2016-08-04 14:31:53 -05:00
Drew Rygh ae96675ff4 Use helper methods to access config attributes 2016-08-04 11:53:07 -05:00
Drew Rygh 3a908bfbc3 Prevent private attribute from polluting global namespace 2016-08-04 10:09:30 -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 37c0b6f518 Merge pull request #280 from basecamp/extract-line-break-insertion 
Extract Trix.LineBreakInsertion
 2016-08-03 14:40:48 -05:00
Drew Rygh e1a9402eb6 Remove switch statement 2016-08-03 14:28:01 -05:00
Javan Makhmali ab9e43df23 Extract Trix.LineBreakInsertion 2016-08-03 10:44:11 -07:00
Drew Rygh c9ea6c7949 Refactor, move config getter methods to config helper 2016-08-03 12:26:10 -05:00
Drew Rygh f0d3b7507e Remove hardcoded references to list block attributes 2016-08-03 11:46:28 -05:00