Commits · 3d669e59eb148af29fab81a498e0cd21dbd400b4 · Moritz Aurel Pascal Schubotz / CodeMirror · GitLab

Snippets Groups Projects

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
Feb 24, 2015
- [merge addon] Define goNextDiff and goPrevDiff commands · fb78920c
  Marijn Haverbeke authored 10 years ago
  
  Closes #2858
  fb78920c
Feb 19, 2015
- [merge addon] Update display faster on changes that add/remove lines · de684860
  Marijn Haverbeke authored 10 years ago
  
  de684860
- [merge addon] When aligning, align whole document at once · 725ef666
  Marijn Haverbeke authored 10 years ago
  
  To prevent scrolling artifacts
  725ef666
Feb 16, 2015
- [merge addon] Add an onCollapse callback · 444b0f10
  Marijn Haverbeke authored 10 years ago
  
  ... for getting information about collapsed spans
  444b0f10
- [merge addon] Support collapsing unchanged ranges in three-way merge · 19d0d1d1
  Marijn Haverbeke authored 10 years ago
  
  19d0d1d1
- [merge addon] Rewrite aligning algorithm to work with three views · 850a6f5c
  Marijn Haverbeke authored 10 years ago
  
  850a6f5c
- [merge addon] Keep chunks in an array rather than using an iterator · b67c0d43
  Marijn Haverbeke authored 10 years ago
  
  b67c0d43
Feb 15, 2015
- [merge addon] Give space elements a CSS class · 4ed39b19
  Marijn Haverbeke authored 10 years ago
  
  4ed39b19
Jan 02, 2015
- [merge addon] Keep stable scroll position when removing/adding alignment padding · 1bfa6661
  Marijn Haverbeke authored 10 years ago
  
  See http://discuss.codemirror.net/t/jittering-mousewheel-scrolling-with-merge-addon-align-mode/125
  1bfa6661
Dec 01, 2014
- [merge addon] Allow collapsing of identical stretches of text · 5d74cb02
  Marijn Haverbeke authored 10 years ago
  
  Using the collapseIdentical option.
  5d74cb02
- [merge addon] Support aligning both panels by adding empty space · b6be5c27
  Marijn Haverbeke authored 10 years ago
  
  b6be5c27