7 Commits

Author SHA1 Message Date
Jamie Peabody
4610ed3535 feat(#137): added 'summary' method 2021-04-29 21:20:53 +01:00
johan456789
79608df3fb fix rhs typo 2019-02-10 20:33:21 +08:00
Jamie Peabody
bde295febd Build improvements (#73)
* removed editor and initial cleanup

* cleanup

* updated jquery

* tidy up

* moved src and build to lib

* tidy up and fixed webpack

* updated readme

* removed junk

* tidy up

* works with sample and editor

* removed editor_width and editor_height

* auto width and height

* added license feature

* not doing dist

* fixed typo

* added searchcursor

* fixed typo

* doc updates

* improved comment

* updated init for cm settings

* fixed jquery/cm includes

* documentation updates

* updated changes doc

* fixed cmsettings

* updated examples
2017-12-18 21:53:03 +00:00
Jamie Peabody
1b96990b1f Fixed typo. 2014-08-17 15:39:30 +01:00
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