mirror of
https://github.com/wickedest/Mergely.git
synced 2026-02-06 10:07:49 +08:00
37fedd05c8
* 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
47 lines
1.4 KiB
HTML
47 lines
1.4 KiB
HTML
<!--
|
|
This example demonstrates the minimum amount of code required to use Mergely.
|
|
-->
|
|
<!DOCTYPE html>
|
|
<html lang="en">
|
|
<head>
|
|
<meta charset="utf-8" /><title>Mergely - Simple Example</title>
|
|
<meta http-equiv="X-UA-Compatible" content="chrome=1, IE=edge">
|
|
<meta http-equiv="content-type" content="text/html; charset=UTF-8"/>
|
|
<meta name="description" content="Mergely examples" />
|
|
<meta name="keywords" content="mergely,diff,merge,compare" />
|
|
<meta name="author" content="Jamie Peabody" />
|
|
<link rel="icon" href="/favicon.svg" type="image/svg+xml">
|
|
<style type="text/css">
|
|
dd {
|
|
margin-bottom: 1em;
|
|
}
|
|
</style>
|
|
</head>
|
|
<body>
|
|
<h1>Examples</h1>
|
|
|
|
<dl>
|
|
<dt><a href="editor.html">editor.html</a></dt>
|
|
<dd>An example editor showcasing some of Mergely's API features.</dd>
|
|
|
|
<dt><a href="fixed-height.html">fixed-height.html</a></dt>
|
|
<dd>A fixed height editor.</dd>
|
|
|
|
<dt><a href="fixed-size.html">fixed-size.html</a></dt>
|
|
<dd>A fixed size editor.</dd>
|
|
|
|
<dt><a href="full-page.html">full-page.html</a></dt>
|
|
<dd>A full page editor.</dd>
|
|
|
|
<dt><a href="change-styles.html">change-styles.html</a></dt>
|
|
<dd>Showcase the change styles.</dd>
|
|
|
|
<dt><a href="scroll-to-first-change.html">scroll-to-first-change.html</a></dt>
|
|
<dd>Scrolls to first change on initial render.</dd>
|
|
|
|
<dt><a href="visible.html">visible.html</a></dt>
|
|
<dd>An editor that becomes visible once ready (less flicker).</dd>
|
|
</dl>
|
|
</body>
|
|
</html>
|