Compare commits

..

4 Commits

Author SHA1 Message Date
semantic-release-bot
c90edb3150 chore(release): 5.4.1 [skip ci]
## [5.4.1](https://github.com/wickedest/Mergely/compare/v5.4.0...v5.4.1) (2026-02-23)

### Bug Fixes

* **#225:** Fixes rendering issue when there are multiple editors ([1a2ee6a](1a2ee6af3d))
2026-02-23 18:29:31 +00:00
Fredric Johansson
1a2ee6af3d fix(#225): Fixes rendering issue when there are multiple editors 2026-02-23 16:58:35 +00:00
semantic-release-bot
aa496078fd chore(release): 5.4.0 [skip ci]
# [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](d6d8d06acc)), closes [#220](https://github.com/wickedest/Mergely/issues/220)
2025-11-15 15:43:30 +00:00
Jamie Peabody
d6d8d06acc feat(#220): Exposes Mergely's instance of CodeMirror as Mergely.CodeMirror (#221) 2025-11-15 15:42:29 +00:00
4 changed files with 19 additions and 5 deletions

View File

@@ -1,3 +1,17 @@
## [5.4.1](https://github.com/wickedest/Mergely/compare/v5.4.0...v5.4.1) (2026-02-23)
### Bug Fixes
* **#225:** Fixes rendering issue when there are multiple editors ([1a2ee6a](https://github.com/wickedest/Mergely/commit/1a2ee6af3d7d87160e72e8faca5e38cf01b36fcb))
# [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)

4
package-lock.json generated
View File

@@ -1,12 +1,12 @@
{
"name": "mergely",
"version": "5.3.6",
"version": "5.4.1",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "mergely",
"version": "5.3.6",
"version": "5.4.1",
"license": "(GPL-3.0 OR LGPL-3.0 OR MPL-1.1 OR SEE LICENSE IN LICENSE)",
"devDependencies": {
"@babel/core": "^7.1.6",

View File

@@ -1,6 +1,6 @@
{
"name": "mergely",
"version": "5.3.6",
"version": "5.4.1",
"description": "A javascript UI for diff/merge",
"license": "(GPL-3.0 OR LGPL-3.0 OR MPL-1.1 OR SEE LICENSE IN LICENSE)",
"author": {

View File

@@ -318,7 +318,7 @@ CodeMirrorDiffView.prototype.bind = function(container) {
if (!notice) {
notice = noticeTypes.lgpl;
}
const editor = this._queryElement(`#${this.id}`);
const editor = this.el;
const splash = dom.getSplash({
notice,
left: (editor.offsetWidth - 300) / 2,
@@ -1200,7 +1200,7 @@ CodeMirrorDiffView.prototype._renderDiff = function(changes) {
CodeMirrorDiffView.prototype._queryElement = function(selector) {
const cacheName = `_element:${selector}`;
const element = this[cacheName] || document.querySelector(selector);
const element = this[cacheName] || this.el.querySelector(selector);
if (!this[cacheName]) {
this[cacheName] = element;
}