Mergely

liuxm/Mergely

Fork 0

forked from lxm_front/Mergely

Commit Graph

Author	SHA1	Message	Date
Kljh	572eb08aaa	Morning clean up. Removed useless function get_changes. Moved current_diff out of this.settings (and along this.changes) Handle the case where comparing identical files (e.g. changes.length==0). ajax.html uses https for jquery so that it can be hosted on a https server. ajax.html uses full available screen width, auto height is trickier (note that call to _auto_height is commented out in mergely.js).	2014-08-17 08:11:13 +01:00
Kljh	4128796bfa	Played with ajax.html. It's probably no longer simple enough as an example. On the other hand it has a nice drag and drop feature. I couldn't make the "ignorews" checkbos work. I had to update codemirror.css to have the texteditor height match the container. I tested using Opera browser and there seems to be no autosizing.	2014-08-17 00:17:39 +01:00
Jamie Peabody	ea2263ff29	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

Author

SHA1

Message

Date

Kljh

572eb08aaa

Morning clean up.

Removed useless function get_changes. Moved current_diff out of this.settings (and along this.changes)
Handle the case where comparing identical files (e.g. changes.length==0).

ajax.html uses https for jquery so that it can be hosted on a https server.
ajax.html uses full available screen width, auto height is trickier (note that call to _auto_height is commented out in mergely.js).

2014-08-17 08:11:13 +01:00

Kljh

4128796bfa

Played with ajax.html.

It's probably no longer simple enough as an example. On the other hand it has a nice drag and drop feature. I couldn't make the "ignorews" checkbos work.

I had to update codemirror.css to have the texteditor height match the container. I tested using Opera browser and there seems to be no autosizing.

2014-08-17 00:17:39 +01:00

Jamie Peabody

ea2263ff29

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

3 Commits