1
0
mirror of synced 2025-12-11 00:38:02 +08:00

Compare commits

..

3 Commits

Author SHA1 Message Date
Jamie Peabody
3d44470103 4.0.7 2018-08-06 13:01:19 +01:00
Jamie Peabody
2c8f6cd340 chore: updated docs 2018-08-06 13:01:13 +01: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
3 changed files with 7 additions and 4 deletions

View File

@@ -1,5 +1,8 @@
# Changes
## 4.0.7
* chore: updated documentation
## 4.0.6
* #89: fixes missing merge buttons

View File

@@ -9,6 +9,9 @@ Mergely is a javascript component to diff/merge files interactively in a browser
### Installation via webpack
The recommended way to install mergely is to use npm and [webpack](https://webpack.js.org/) to install mergely and its dependencies. It is highly recommended that you start by cloning [mergely-webpack](https://github.com/wickedest/mergely-webpack). It has everything that you need to get started.
### Angular 6.1.1
You can also use mergely within angular. You can start by cloning [mergely-angular](https://github.com/wickedest/mergely-angular).
### Installation via .tgz
Unpack mergely.tgz into a folder, e.g. `./lib`, and then add the following to the `<head>` of your target html source file.
@@ -46,9 +49,6 @@ The following example can be used to set the `lhs` and `rhs` editors synchronous
```js
$(document).ready(function () {
// initialize mergely
$('#mergely').mergely();
// set editor content
$('#mergely').mergely({
lhs: function(setValue) {

View File

@@ -1,6 +1,6 @@
{
"name": "mergely",
"version": "4.0.6",
"version": "4.0.7",
"description": "A javascript UI for diff/merge",
"directories": {
"doc": "doc",