Commits · e2042a9a8b9a8cc3198e23974c565608d7d5538f · Moritz Aurel Pascal Schubotz / CodeMirror

Mar 07, 2017
- [merge addon] Don't try to align lines in deleted chunks · bfbdd885
  Marijn Haverbeke authored 8 years ago
  
  Issue #4627
  bfbdd885
Mar 01, 2017
- [merge addon] Realign when a redraw updates a previously estimated line height · c41d05e2
  Marijn Haverbeke authored 8 years ago
  
  Closes #4621
  c41d05e2
- [merge addon] Re-align after swapping docs. · 8d552508
  Erik Welander authored 8 years ago
  
  8d552508
Feb 28, 2017
- [merge addon] Stop other side from trailing behind during scrolling · 17159fec
  Erik Welander authored 8 years ago
  
  ... in a 3-editor view, by immediately syncing the scrolling from the left to the right and vice-versa.
  17159fec
Feb 27, 2017
- [merge addon] Fix corner case in getChunks · b2a4da9c
  Marijn Haverbeke authored 8 years ago
  
  Issue #4607
  b2a4da9c
Feb 26, 2017
- [merge adddon] Rename ignoreWS option, simplify code · a3891b51
  Marijn Haverbeke authored 8 years ago
  
  Issue #4608
  a3891b51
- [merge addon] Support for ignoring whitespace within a line in diff · 608e3f82
  Arun Narasani authored 8 years ago
  
  608e3f82
- [merge demo] Make the editor handle mouse events on spacers · c7348e70
  Marijn Haverbeke authored 8 years ago
  
  Closes #4605
  c7348e70
Feb 23, 2017
- [merge addon] Fix aligning around widgets directly before change or eol · e68976f7
  Marijn Haverbeke authored 8 years ago
  
  Issue #4575
  e68976f7
Feb 22, 2017
- [merge addon] Notice changed() calls on widgets and markers when aligning · 15609286
  Marijn Haverbeke authored 8 years ago
  
  Issue #4575
  15609286
Feb 21, 2017
- [merge addon] Improve aligning to work with collapsed markers and widgets · 7943e50e
  Marijn Haverbeke authored 8 years ago
  
  Issue #4575
  7943e50e
Feb 15, 2017
- [merge addon] Listen to line widget events to realign chunks · 3d669e59
  Marijn Haverbeke authored 8 years ago
  
  Issue #4575
  3d669e59
Feb 14, 2017
- [merge addon] Remove debug statements · fdf68198
  Marijn Haverbeke authored 8 years ago
  
  Issue #4559
  fdf68198
- [merge addon] Fix cyclic scroll syncing issue · 6c272f2c
  Marijn Haverbeke authored 8 years ago
  
  Issue #4559
  6c272f2c
- [merge addon] Fix bug in determining the extent of chunks near the end of the doc · 459873b5
  Marijn Haverbeke authored 8 years ago
  
  Issue #4572
  459873b5
- [merge addon] Fix bug in drawing of changed chunks at end of doc · ad4d266c
  Marijn Haverbeke authored 8 years ago
  
  Issue #4572
  ad4d266c
Feb 13, 2017
- [merge addon] Add support for a revertChunk callback · a86de0c3
  Marijn Haverbeke authored 8 years ago
  
  Issue #4537
  a86de0c3
Feb 10, 2017
- [merge addon] Don't drop scroll sync when scrolling happens with out-of-date diff · c9997b59
  Marijn Haverbeke authored 8 years ago
  
  Issue #4556
  c9997b59
- [merge addon] Remove unneccesarily obscure logic · 3d6bb944
  Marijn Haverbeke authored 8 years ago
  
  3d6bb944
Jan 13, 2017
- [merge addon] Fix incorrect compare · 66d9403c
  Marijn Haverbeke authored 8 years ago
  
  Issue #4492
  66d9403c
Jan 12, 2017
- [merge addon] Anchor copy button to editable side for insertions · dc94b0f0
  Marijn Haverbeke authored 8 years ago
  
  Since showing it next to an empty chunk looks bad Issue #4492
  dc94b0f0
Dec 15, 2016
- [merge addon] Don't use DMP's cleanupSemantic function · 45c54ada
  Marijn Haverbeke authored 8 years ago
  
  It sometimes produces invalid output. Closes #4410
  45c54ada
Nov 02, 2016
- Make sure initial connectors are drawn after aligning/collapsing · e6ec325b
  Marijn Haverbeke authored 8 years ago
  
  So that their vertical offsets actually match the position of the corresponding lines. Issue #4364
  e6ec325b
- Add an includeWidgets argument to heightAtLine · f5e211fa
  Marijn Haverbeke authored 8 years ago
  
  And use it in the merge addon to get the proper offsets for merge buttons Issue #4364
  f5e211fa
- [merge addon] Fix sorted insertion in aligned line set (again) · ea796dad
  Marijn Haverbeke authored 8 years ago
  
  Issue #4353
  ea796dad
Nov 01, 2016
- [merge addon] Fix corner case in alignable-chunk sorting · 6d3a7457
  Marijn Haverbeke authored 8 years ago
  
  Issue #4353
  6d3a7457
- [merge addon] Fix bug in chunk-aligning algorithm · 5105da7f
  Marijn Haverbeke authored 8 years ago
  
  Closes #4353
  5105da7f
Oct 29, 2016
- Fix constructor typo for MergeView. · e2c146e6
  Adrien Bertrand authored 8 years ago
  
  e2c146e6
Oct 23, 2016
- [merge addon] Remove the end class when removing chunk styling · db12d642
  Todd Berman authored 8 years ago
  
  db12d642
Oct 21, 2016
- Add classes to each pane for isolated style changes, handle document swapping · 63bf6594
  Todd Berman authored 8 years ago
  
  63bf6594
Oct 20, 2016
- Update previous patch to change option name and clean up code · 9a316b33
  Marijn Haverbeke authored 8 years ago
  
  Issue #4288
  9a316b33
- Add `mergeMarkerLocation` to options to allow customization · 1502f805
  Todd Berman authored 8 years ago
  
  1502f805
Jul 19, 2016
- Fix accidental 'let' · 5d9808a0
  Marijn Haverbeke authored 8 years ago
  
  5d9808a0
- [merge addon] Adjust for space above editor when drawing connections · f532bda3
  Marijn Haverbeke authored 8 years ago
  
  Issue #4112
  f532bda3
Mar 02, 2016
- [merge addon] Correctly compute chunk start when copying at end of document · 11f3d969
  Marijn Haverbeke authored 9 years ago
  
  Closes #3802
  11f3d969
Feb 02, 2016
- [merge addon] Fix bug when merging a deletion at the bottom of the document · b5f98103
  Marijn Haverbeke authored 9 years ago
  
  Closes #3802
  b5f98103
Oct 20, 2015
- [merge addon] Don't suppress highlight updates when collapsing code · d71a3285
  Marijn Haverbeke authored 9 years ago
  
  Since collapsing might move previously hidden code into the viewport Issue #3599
  d71a3285
Oct 19, 2015
- [merge addon] Stop trying to require diff_match_patch · 00738408
  Marijn Haverbeke authored 9 years ago
  
  Issue #3593
  00738408
Sep 25, 2015
- [merge addon] Use CodeMirror.on to register event handler · 5c4b8de1
  Marijn Haverbeke authored 9 years ago
  
  Closes #3549
  5c4b8de1
Aug 12, 2015
- [merge addon] Assume diff_match_patch to be global · 723c9f1a
  Marijn Haverbeke authored 9 years ago
  
  Since the library is completely oblivious to module loaders Issue #3447
  723c9f1a