1
0
mirror of synced 2025-12-25 17:15:17 +08:00

Compare commits

...

2 Commits
4.3.0 ... 4.3.1

Author SHA1 Message Date
Jamie Peabody
8c541ba51c Updated changes and bumped version 2021-05-19 07:57:54 +01:00
david weil
aa36977685 Updated README options : s/ignorews/ignoreaccents/ (#149)
Fixed option name in documentation
2021-05-19 07:53:47 +01:00
3 changed files with 8 additions and 2 deletions

View File

@@ -1,5 +1,11 @@
# Changes
## 4.3.1
* patch: Updated README.md to fix incorrect option name.
## 4.3.0
* feat: Added `summary` method
## 4.2.4
* patch: fixes [#142](https://github.com/wickedest/Mergely/issues/142). Added README.md to examples.

View File

@@ -100,7 +100,7 @@ $(document).ready(function () {
|<a name="fgcolor"></a>fgcolor|string\|number\|object|`{a:'#4ba3fa', c:'#a3a3a3', d:'#ff7f7f', ca:'#4b73ff', cc:'#434343', cd:'#ff4f4f'}`|The foreground color that mergely marks changes with on the canvas. The value **a** is additions, **c** changes, **d** deletions, and the prefix *c* indicates current/active change (e.g. **cd** current delection).|
|<a name="ignorews"></a>ignorews|boolean|`false`|Ignores white-space.|
|<a name="ignorecase"></a>ignorecase|boolean|`false`|Ignores case when differientiating.|
|<a name="ignoreaccents"></a>ignorews|boolean|`false`|Ignores accented characters.|
|<a name="ignoreaccents"></a>ignoreaccents|boolean|`false`|Ignores accented characters.|
|<a name="lcs"></a>lcs|boolean|`true`|Enables/disables LCS computation for paragraphs (word-by-word changes). Disabling can give a performance gain for large documents.|
|<a name="license"></a>license|string|`lgpl`|The choice of license to use with Mergely. Valid values are: `lgpl`, `gpl`, `mpl` or `lgpl-separate-notice`, `gpl-separate-notice`, `mpl-separate-notice` (the license requirements are met in a separate notice file).|
|<a name="line_numbers"></a>line_numbers|boolean|`true`|Enables/disables line numbers. Enabling line numbers will toggle the visibility of the line number margins.|

View File

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