Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
014a482984 |
21
CHANGELOG.md
21
CHANGELOG.md
@@ -1,24 +1,3 @@
|
|||||||
# [5.4.0](https://github.com/wickedest/Mergely/compare/v5.3.6...v5.4.0) (2025-11-15)
|
|
||||||
|
|
||||||
|
|
||||||
### Features
|
|
||||||
|
|
||||||
* **#220:** Exposes Mergely's instance of CodeMirror as Mergely.CodeMirror ([#221](https://github.com/wickedest/Mergely/issues/221)) ([d6d8d06](https://github.com/wickedest/Mergely/commit/d6d8d06accaa4fa3a4352b95620e3e456226d444)), closes [#220](https://github.com/wickedest/Mergely/issues/220)
|
|
||||||
|
|
||||||
## [5.3.6](https://github.com/wickedest/Mergely/compare/v5.3.5...v5.3.6) (2024-10-11)
|
|
||||||
|
|
||||||
|
|
||||||
### Bug Fixes
|
|
||||||
|
|
||||||
* **#207:** Updated documentation for search method. ([#214](https://github.com/wickedest/Mergely/issues/214)) ([350e5af](https://github.com/wickedest/Mergely/commit/350e5af2e8b2e852364dc5a5729e03e3bc75358b)), closes [#207](https://github.com/wickedest/Mergely/issues/207)
|
|
||||||
|
|
||||||
## [5.3.5](https://github.com/wickedest/Mergely/compare/v5.3.4...v5.3.5) (2024-10-11)
|
|
||||||
|
|
||||||
|
|
||||||
### Bug Fixes
|
|
||||||
|
|
||||||
* bump dependencies ([#213](https://github.com/wickedest/Mergely/issues/213)) ([83df02d](https://github.com/wickedest/Mergely/commit/83df02d967ce3100a33216f8ca77c2168bd53234))
|
|
||||||
|
|
||||||
## [5.3.4](https://github.com/wickedest/Mergely/compare/v5.3.3...v5.3.4) (2024-10-11)
|
## [5.3.4](https://github.com/wickedest/Mergely/compare/v5.3.3...v5.3.4) (2024-10-11)
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
19
README.md
19
README.md
@@ -84,15 +84,13 @@ Mergely will emit an `updated` event when the editor is first initialized, and e
|
|||||||
|
|
||||||
### Visualization modes
|
### Visualization modes
|
||||||
|
|
||||||
Mergely does not support any CodeMirror highlighting for different languages (xml, html, javascript etc.) out of the box.
|
Mergely supports the following CodeMirror visualizations for [mode](codemirror.net/5/doc/manual.html#option_mode):
|
||||||
You can compile your own Mergely-Version with support for the desired modes by adding them to diff-view.js. For example:
|
|
||||||
```
|
* go
|
||||||
require('codemirror/mode/go/go.js');
|
* javascript
|
||||||
require('codemirror/mode/javascript/javascript.js');
|
* htmlmixed
|
||||||
require('codemirror/mode/htmlmixed/htmlmixed.js');
|
* markdown
|
||||||
require('codemirror/mode/markdown/markdown.js');
|
* python
|
||||||
require('codemirror/mode/python/python.js');
|
|
||||||
```
|
|
||||||
|
|
||||||
## Options
|
## Options
|
||||||
|
|
||||||
@@ -355,7 +353,7 @@ Scrolls to the next change specified by `direction`.
|
|||||||
doc.scrollToDiff('next');
|
doc.scrollToDiff('next');
|
||||||
```
|
```
|
||||||
|
|
||||||
### <a name="search"></a>search(side: string, needle: string, direction: string = 'next')
|
### <a name="search"></a>search(side: string, needle: string)
|
||||||
|
|
||||||
Search the editor for `needle`, scrolling to the next available match. Repeating the call will find the next available token.
|
Search the editor for `needle`, scrolling to the next available match. Repeating the call will find the next available token.
|
||||||
|
|
||||||
@@ -365,7 +363,6 @@ Search the editor for `needle`, scrolling to the next available match. Repeating
|
|||||||
|----|----|-----------|
|
|----|----|-----------|
|
||||||
|side|string|The editor side, either `lhs` or `rhs`.|
|
|side|string|The editor side, either `lhs` or `rhs`.|
|
||||||
|needle|string|The text for which to search.|
|
|needle|string|The text for which to search.|
|
||||||
|direction|string|The direction to search, either `prev` or `next`.|
|
|
||||||
|
|
||||||
#### Example
|
#### Example
|
||||||
|
|
||||||
|
|||||||
4
package-lock.json
generated
4
package-lock.json
generated
@@ -1,12 +1,12 @@
|
|||||||
{
|
{
|
||||||
"name": "mergely",
|
"name": "mergely",
|
||||||
"version": "5.4.0",
|
"version": "5.3.4",
|
||||||
"lockfileVersion": 3,
|
"lockfileVersion": 3,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"packages": {
|
"packages": {
|
||||||
"": {
|
"": {
|
||||||
"name": "mergely",
|
"name": "mergely",
|
||||||
"version": "5.4.0",
|
"version": "5.3.4",
|
||||||
"license": "(GPL-3.0 OR LGPL-3.0 OR MPL-1.1 OR SEE LICENSE IN LICENSE)",
|
"license": "(GPL-3.0 OR LGPL-3.0 OR MPL-1.1 OR SEE LICENSE IN LICENSE)",
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@babel/core": "^7.1.6",
|
"@babel/core": "^7.1.6",
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "mergely",
|
"name": "mergely",
|
||||||
"version": "5.4.0",
|
"version": "5.3.4",
|
||||||
"description": "A javascript UI for diff/merge",
|
"description": "A javascript UI for diff/merge",
|
||||||
"license": "(GPL-3.0 OR LGPL-3.0 OR MPL-1.1 OR SEE LICENSE IN LICENSE)",
|
"license": "(GPL-3.0 OR LGPL-3.0 OR MPL-1.1 OR SEE LICENSE IN LICENSE)",
|
||||||
"author": {
|
"author": {
|
||||||
|
|||||||
@@ -18,11 +18,9 @@ function CodeMirrorDiffView(el, options) {
|
|||||||
const coords = this.cursorCoords(null, 'local');
|
const coords = this.cursorCoords(null, 'local');
|
||||||
this.scrollTo(null,
|
this.scrollTo(null,
|
||||||
(coords.top + coords.bottom) / 2 - (this.getScrollerElement().clientHeight / 2));
|
(coords.top + coords.bottom) / 2 - (this.getScrollerElement().clientHeight / 2));
|
||||||
});
|
});
|
||||||
this.init(el, options);
|
this.init(el, options);
|
||||||
};
|
};
|
||||||
|
|
||||||
CodeMirrorDiffView.CodeMirror = CodeMirror;
|
|
||||||
|
|
||||||
const trace = console.log;
|
const trace = console.log;
|
||||||
const traceTimeStart = console.time;
|
const traceTimeStart = console.time;
|
||||||
|
|||||||
@@ -253,8 +253,6 @@ class Mergely {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Mergely.CodeMirror = CodeMirrorDiffView.CodeMirror;
|
|
||||||
|
|
||||||
window.Mergely = Mergely;
|
window.Mergely = Mergely;
|
||||||
|
|
||||||
module.exports = Mergely;
|
module.exports = Mergely;
|
||||||
|
|||||||
Reference in New Issue
Block a user