1
0
mirror of synced 2025-11-06 04:30:40 +08:00

22 Commits

Author SHA1 Message Date
Jamie Peabody
dec1e9509d fix: updated CDN example 2023-08-27 13:16:11 +01:00
Jamie Peabody
2b561c1856 chore(doc): Update CDN example 2023-08-27 11:38:38 +01:00
Jamie Peabody
37fedd05c8 v5.0 (#174)
* feat: v5

BREAKING CHANGE: Mergely is no longer a jQuery plugin.

BREAKING CHANGE: Removed `options.autoresize`

BREAKING CHANGE: Removed `options.editor_width`

BREAKING CHANGE: Removed `options.editor_height`

BREAKING CHANGE: Removed `options.fadein`

BREAKING CHANGE: Removed `options.fgcolor`

BREAKING CHANGE: Removed `options.resize`

BREAKING CHANGE: Removed `options.width`

BREAKING CHANGE: Removed `options.height`

BREAKING CHANGE: Removed `options.loaded` callback

BREAKING CHANGE: Removed `options.resized` callback

BREAKING CHANGE: Removed styles `.mergely-resizer`, `.mergely-full-screen-0`, and `.mergely-full-screen-8`

BREAKING CHANGE: Changed default for `options.change_timeout` changed from `150` to `50`.

BREAKING CHANGE: No longer automatically scrolls to first change.

feat: CodeMirror is now an explicit dependency.

feat: No longer necessary to separately require codemirror/addon/search/searchcursor

feat: No longer necessary to separately require codemirror/addon/selection/mark-selection

feat: `mergely.js` is now unminimized, and added new minimized version `mergely.min.js`

feat: Gutter click now scrolls to any line

feat: Mergely now emits `resize` event on resize

feat: The UI is now non-blocking as diff now runs in background

feat: Added support to provide `options.lhs` and `options.rhs` as strings

feat: #16 added titles to editor.mergely.com

fix: #165 block of changes at end of file are now distinguishable

fix: #140 fixed performance issue with large files

fix: Fixed issue where canvas markup was not rendered when `viewport` enabled

fix: Fixed timing issue where swap sides may not work as expected.

fix: Fixed issue where unmarkup did not emit an updated event.

fix: Fixed documentation issue where `merge` incorrectly stated: from the specified `side` to the opposite side.

fix: Fixed performance issue scrolling

fix: Fixed issue where initial render scrolled to first change, showing it at the bottom (as opposed to middle as expected)

fix: Fixed issue where line-diffs failed to diff non-alphanumeric characters

* chore: tweaked no-start/end styles

* feat: dark mode

* chore: updated examples

* chore(ci): updated webpack

* chore(ci): alpha, beta, next branches

* chore(ci): test

* chore(ci): package-lock.json

* chore(ci): ignore alpha, beta, next on branch

* fix: fixes firefox scroll-linked effect issue

* fix: fixes firefox scroll-linked effect issue

* chore: fix css

* chore: debug
2023-04-23 16:29:59 +01:00
Jamie Peabody
615e1afd97 patch(#139): fixes inline diff rendering issue with whitespace (#158)
Co-authored-by: Jamie Peabody <jpeabody@axway.com>
2021-10-03 16:49:44 +01:00
Jamie Peabody
4610ed3535 feat(#137): added 'summary' method 2021-04-29 21:20:53 +01:00
Jamie Peabody
d2c41d1ee1 patch(#142): added examples README.md 2021-04-29 20:24:21 +01:00
Jamie Peabody
827c9ed8ef removed unnecessary addon 2020-01-03 23:10:02 +00:00
johan456789
79608df3fb fix rhs typo 2019-02-10 20:33:21 +08:00
Jamie Peabody
4498b8bbf5 revert debug code 2019-01-23 22:41:59 +00:00
Jamie Peabody
a2eaef8a13 patch(issue #106): fixes merge edge-case with add (#107)
* patch(issue #106): fixes merge edge-case with add

* bump
2019-01-23 22:39:04 +00:00
Jamie Peabody
d9f2edc1ad chore: webpack upgrade (#98)
* upgraded to webpack 4.x

* updated webpack
2018-11-17 09:12:45 +00: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
Jamie Peabody
a3e50f8d8e Initial fix for auto-height and multiple editors. 2013-03-09 13:48:46 +00:00
Jamie Peabody
eaf41856fa Fixed rendering issue where changes were skipped. Upgraded to work with jquery 1.9.0. 2013-02-03 21:00:30 +00:00
Jamie Peabody
6d40b165eb Normalize line endings 2012-11-15 19:26:33 +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
b5e669d330 Fixed canvas width issue 2012-07-31 20:32:47 +01:00
Jamie Peabody
e1a5c8f8f3 initial check-in 2012-03-06 18:46:25 +00:00