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

4 Commits

Author SHA1 Message Date
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
d9f2edc1ad chore: webpack upgrade (#98)
* upgraded to webpack 4.x

* updated webpack
2018-11-17 09:12:45 +00:00
Jamie Peabody
6716096215 patch(issue #89): fixes missing merge buttons (#91)
* patch(fix-89): fixes missing merge buttons

* 4.0.6
2018-07-17 13:46:54 -07: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