Compare commits

..

8 Commits

Author SHA1 Message Date
semantic-release-bot
3651df9ad6 chore(release): 5.4.4 [skip ci]
## [5.4.4](https://github.com/wickedest/Mergely/compare/v5.4.3...v5.4.4) (2026-02-23)

### Bug Fixes

* Updated examples README.md ([f1e58f5](f1e58f58fe))
2026-02-23 19:48:25 +00:00
Jamie Peabody
f1e58f58fe fix: Updated examples README.md 2026-02-23 19:47:18 +00:00
semantic-release-bot
5cb3946182 chore(release): 5.4.3 [skip ci]
## [5.4.3](https://github.com/wickedest/Mergely/compare/v5.4.2...v5.4.3) (2026-02-23)

### Bug Fixes

* Removed whitespace from example ([69ecf76](69ecf76fe6))
2026-02-23 19:38:58 +00:00
Jamie Peabody
69ecf76fe6 fix: Removed whitespace from example 2026-02-23 19:37:43 +00:00
semantic-release-bot
93eee752a7 chore(release): 5.4.2 [skip ci]
## [5.4.2](https://github.com/wickedest/Mergely/compare/v5.4.1...v5.4.2) (2026-02-23)

### Bug Fixes

* Removed whitespace from example ([00a7917](00a79170a8))
2026-02-23 19:22:43 +00:00
Jamie Peabody
00a79170a8 fix: Removed whitespace from example 2026-02-23 18:59:11 +00:00
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
7 changed files with 33 additions and 10 deletions

View File

@@ -1,3 +1,31 @@
## [5.4.4](https://github.com/wickedest/Mergely/compare/v5.4.3...v5.4.4) (2026-02-23)
### Bug Fixes
* Updated examples README.md ([f1e58f5](https://github.com/wickedest/Mergely/commit/f1e58f58fea85628b1dd345b98b23923f05d8c2e))
## [5.4.3](https://github.com/wickedest/Mergely/compare/v5.4.2...v5.4.3) (2026-02-23)
### Bug Fixes
* Removed whitespace from example ([69ecf76](https://github.com/wickedest/Mergely/commit/69ecf76fe6066ded1efca06f9ee0ad985e8ed047))
## [5.4.2](https://github.com/wickedest/Mergely/compare/v5.4.1...v5.4.2) (2026-02-23)
### Bug Fixes
* Removed whitespace from example ([00a7917](https://github.com/wickedest/Mergely/commit/00a79170a8d4b701d6da98c1d6ea921b592fb3d1))
## [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)

View File

@@ -1,6 +1,5 @@
# Mergely examples
## Mergely development server
To run the hot dev-server for development, you need to run:

View File

@@ -2,9 +2,6 @@ require('codemirror/addon/selection/mark-selection.js');
require('codemirror/lib/codemirror.css');
require('../src/mergely.css');
document.onreadystatechange = function () {
if (document.readyState !== 'complete') {
return;

View File

@@ -14,7 +14,6 @@ the quick brown fox
jumped over the lazy dog
`;
document.onreadystatechange = function () {
if (document.readyState !== 'complete') {
return;

4
package-lock.json generated
View File

@@ -1,12 +1,12 @@
{
"name": "mergely",
"version": "5.4.0",
"version": "5.4.4",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "mergely",
"version": "5.4.0",
"version": "5.4.4",
"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.4.0",
"version": "5.4.4",
"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;
}