Compare commits

..

4 Commits

Author SHA1 Message Date
semantic-release-bot
fa30d277e5 chore(release): 5.4.6 [skip ci]
## [5.4.6](https://github.com/wickedest/Mergely/compare/v5.4.5...v5.4.6) (2026-02-24)

### Bug Fixes

* **#228:** Clicking on edit marker in gutter now accounts for top position of editor. ([cc7df68](cc7df68aea)), closes [#228](https://github.com/wickedest/Mergely/issues/228)
2026-02-24 20:20:30 +00:00
Jamie Peabody
cc7df68aea fix(#228): Clicking on edit marker in gutter now accounts for top position of editor. 2026-02-24 20:19:07 +00:00
semantic-release-bot
6ed235c4b0 chore(release): 5.4.5 [skip ci]
## [5.4.5](https://github.com/wickedest/Mergely/compare/v5.4.4...v5.4.5) (2026-02-23)

### Bug Fixes

* **#222:** Fixed issue with poor rendering performance and marker misalignment ([27778f0](27778f0840)), closes [#222](https://github.com/wickedest/Mergely/issues/222) [#227](https://github.com/wickedest/Mergely/issues/227)
2026-02-23 21:52:15 +00:00
Jamie Peabody
27778f0840 fix(#222): Fixed issue with poor rendering performance and marker misalignment
* fix(#222): Fixed poor rendering performance in large files
* fix(#222): Right-hand editor gutter marker was not aligned correctly (#227)
2026-02-23 21:51:02 +00:00
4 changed files with 20 additions and 4 deletions

View File

@@ -1,3 +1,17 @@
## [5.4.6](https://github.com/wickedest/Mergely/compare/v5.4.5...v5.4.6) (2026-02-24)
### Bug Fixes
* **#228:** Clicking on edit marker in gutter now accounts for top position of editor. ([cc7df68](https://github.com/wickedest/Mergely/commit/cc7df68aea62e2e3a18c996fa56048f1e583faa5)), closes [#228](https://github.com/wickedest/Mergely/issues/228)
## [5.4.5](https://github.com/wickedest/Mergely/compare/v5.4.4...v5.4.5) (2026-02-23)
### Bug Fixes
* **#222:** Fixed issue with poor rendering performance and marker misalignment ([27778f0](https://github.com/wickedest/Mergely/commit/27778f0840895bf5e029d8c962e99890b8a0a8f6)), closes [#222](https://github.com/wickedest/Mergely/issues/222) [#227](https://github.com/wickedest/Mergely/issues/227)
## [5.4.4](https://github.com/wickedest/Mergely/compare/v5.4.3...v5.4.4) (2026-02-23)

4
package-lock.json generated
View File

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

@@ -1190,7 +1190,9 @@ CodeMirrorDiffView.prototype._renderDiff = function(changes) {
ex.lhs_scroller.scrollTo({ top: sto });
};
this._handleRhsMarginClick = function (ev) {
const y = ev.pageY - ex.rhs_xyoffset.top - (rto / 2);
// `top` accounts for the editor starting at position other than 0 on page
const { top } = ev.currentTarget.offsetParent.getBoundingClientRect();
const y = (ev.pageY - top) - ex.rhs_xyoffset.top - (rto / 2);
const sto = Math.max(0, (y / mcanvas_rhs.height) * ex.rhs_scroller.scrollHeight);
ex.rhs_scroller.scrollTo({ top: sto });
};