Mergely

Files

Kljh f1782d1933 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 15:55:47 +01:00

codemirror.css

Made use of CodeMirror viewport to greatly improve performance. Added settings to toggle paragraph LCD; line wrapping; white space; and side bars.

2013-02-24 21:57:25 +00:00

codemirror.js

Made use of CodeMirror viewport to greatly improve performance. Added settings to toggle paragraph LCD; line wrapping; white space; and side bars.

2013-02-24 21:57:25 +00:00

codemirror.min.js

Fixes rendering issue.

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

mergely.css

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