Commit Graph

6 Commits

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
274d85bf05 Made use of CodeMirror viewport to greatly improve performance. Added settings to toggle paragraph LCD; line wrapping; white space; and side bars.
Released with CodeMirror 3.1.
2013-02-24 21:57:25 +00:00
Jamie Peabody
49f57eb72b Major work to update Mergely to work with the head of codemirror git. 2013-02-10 20:19:35 +00:00
Jamie Peabody
5b390c6737 Mergely 3.0 that works with CodeMirror 3.0 beta. 2012-11-03 18:17:49 +00:00
Jamie Peabody
e1a5c8f8f3 initial check-in 2012-03-06 18:46:25 +00:00