mirror of https://github.com/wickedest/Mergely.git synced 2026-03-20 09:38:39 +08:00

Go to file

Kljh 885fcd4e05 Added keyboard shortcuts à la WinMerge.

Alt + Up or Down arrow : go to previous or next difference
Alt + Left or Right arrow : merge difference using right or left content

Shift, Ctr, Alt or Meta keys can be used indifferntly (to cope with browser's idiosyncratics).
Event handler is now attached to text editor. This is clearly to review (does not capture all page events and too intrusive).

New state "current_diff" has been added.

Need to scroll the editor to center it on currently active state (scrollToChange function to add).

2014-08-16 17:31:15 +01:00

doc

Complete rewrite of the editor. Added search previous. Minor bug fixes include: issues with merging; scroll indicator out of alignment with actual source; inner-markup; resize.

2013-06-24 20:20:19 +01:00

editor

Fixes rendering issue.

2014-01-25 12:24:01 +00:00

examples

New inner-line diff algorithm. Added method 'unmarkup' to clear markup. Added option: vpcolor. Fixed autoresize and resize.

2013-05-12 19:52:47 +01:00

lib

Added keyboard shortcuts à la WinMerge.