chore(release): 5.0.2 [skip ci]

## [5.0.2](https://github.com/wickedest/Mergely/compare/v5.0.1...v5.0.2) (2023-04-24) ### Bug Fixes * **scroll:** fixed issue where first rhs scroll was unlinked ([7b2040c](7b2040c6ad))
fix(scroll): fixed issue where first rhs scroll was unlinked
2025-12-14 18:38:33 +08:00 · 2023-04-24 07:51:30 +00:00 · 2023-04-24 08:50:14 +01:00 · 2023-04-23 21:50:20 +01:00 · 2023-04-23 20:44:06 +00:00 · 2023-04-23 21:42:58 +01:00
5 changed files with 144 additions and 7 deletions
--- a/.releaserc.yaml
+++ b/.releaserc.yaml
@@ -0,0 +1,11 @@
+branches:
+  - master
+  - name: alpha
+    prerelease: true
+plugins:
+  - "@semantic-release/commit-analyzer"
+  - "@semantic-release/release-notes-generator"
+  - "@semantic-release/changelog"
+  - "@semantic-release/npm"
+  - "@semantic-release/git"
+  - "@semantic-release/github"
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,41 @@
+## [5.0.2](https://github.com/wickedest/Mergely/compare/v5.0.1...v5.0.2) (2023-04-24)
+
+
+### Bug Fixes
+
+* **scroll:** fixed issue where first rhs scroll was unlinked ([7b2040c](https://github.com/wickedest/Mergely/commit/7b2040c6ad17ea70a09720f54d9a255cdc57cd67))
+
+## [5.0.1](https://github.com/wickedest/Mergely/compare/v5.0.0...v5.0.1) (2023-04-23)
+
+
+### Bug Fixes
+
+* update release ([a8b497b](https://github.com/wickedest/Mergely/commit/a8b497bc9b68beb5d8265106d9f010aa9489dd17))
+
 # Changelog

 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.

+### [5.0.0](https://github.com/wickedest/Mergely/compare/v4.3.9...v5.0.0) (2023-04-23)
+
+
+### BREAKING CHANGES
+
+- Mergely is no longer a jQuery plugin.
+- Removed options.autoresize
+- Removed options.editor_width
+- Removed options.editor_height
+- Removed options.fadein
+- Removed options.fgcolor
+- Removed options.resize
+- Removed options.width
+- Removed options.height
+- Removed options.loaded callback
+- Removed options.resized callback
+- Removed styles .mergely-resizer, .mergely-full-screen-0, and .mergely-full-screen-8
+- Changed default for options.change_timeout changed from 150 to 50.
+- No longer automatically scrolls to first change.
+
 ### 4.3.9 (2022-01-19)


--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
  "name": "mergely",
-  "version": "5.0.0-alpha.2",
+  "version": "5.0.2",
  "lockfileVersion": 3,
  "requires": true,
  "packages": {
    "": {
      "name": "mergely",
-      "version": "5.0.0-alpha.2",
+      "version": "5.0.2",
      "license": "(GPL-3.0 OR LGPL-3.0 OR MPL-1.1 OR SEE LICENSE IN LICENSE)",
      "devDependencies": {
        "@babel/core": "^7.1.6",
@@ -14,6 +14,8 @@
        "@commitlint/cli": "^17.6.1",
        "@commitlint/config-conventional": "^15.0.0",
        "@commitlint/prompt-cli": "^15.0.0",
+        "@semantic-release/changelog": "^6.0.3",
+        "@semantic-release/git": "^10.0.1",
        "babel-loader": "^8.2.3",
        "babel-plugin-syntax-dynamic-import": "^6.18.0",
        "chai": "^4.3.4",
@@ -3496,6 +3498,59 @@
        "node": ">=12"
      }
    },
+    "node_modules/@semantic-release/changelog": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/@semantic-release/changelog/-/changelog-6.0.3.tgz",
+      "integrity": "sha512-dZuR5qByyfe3Y03TpmCvAxCyTnp7r5XwtHRf/8vD9EAn4ZWbavUX8adMtXYzE86EVh0gyLA7lm5yW4IV30XUag==",
+      "dev": true,
+      "dependencies": {
+        "@semantic-release/error": "^3.0.0",
+        "aggregate-error": "^3.0.0",
+        "fs-extra": "^11.0.0",
+        "lodash": "^4.17.4"
+      },
+      "engines": {
+        "node": ">=14.17"
+      },
+      "peerDependencies": {
+        "semantic-release": ">=18.0.0"
+      }
+    },
+    "node_modules/@semantic-release/changelog/node_modules/fs-extra": {
+      "version": "11.1.1",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.1.1.tgz",
+      "integrity": "sha512-MGIE4HOvQCeUCzmlHs0vXpih4ysz4wg9qiSAu6cd42lVwPbTM1TjV7RusoyQqMmk/95gdQZX72u+YW+c3eEpFQ==",
+      "dev": true,
+      "dependencies": {
+        "graceful-fs": "^4.2.0",
+        "jsonfile": "^6.0.1",
+        "universalify": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=14.14"
+      }
+    },
+    "node_modules/@semantic-release/changelog/node_modules/jsonfile": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
+      "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
+      "dev": true,
+      "dependencies": {
+        "universalify": "^2.0.0"
+      },
+      "optionalDependencies": {
+        "graceful-fs": "^4.1.6"
+      }
+    },
+    "node_modules/@semantic-release/changelog/node_modules/universalify": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
+      "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
+      "dev": true,
+      "engines": {
+        "node": ">= 10.0.0"
+      }
+    },
    "node_modules/@semantic-release/commit-analyzer": {
      "version": "9.0.2",
      "resolved": "https://registry.npmjs.org/@semantic-release/commit-analyzer/-/commit-analyzer-9.0.2.tgz",
@@ -3526,6 +3581,37 @@
        "node": ">=14.17"
      }
    },
+    "node_modules/@semantic-release/git": {
+      "version": "10.0.1",
+      "resolved": "https://registry.npmjs.org/@semantic-release/git/-/git-10.0.1.tgz",
+      "integrity": "sha512-eWrx5KguUcU2wUPaO6sfvZI0wPafUKAMNC18aXY4EnNcrZL86dEmpNVnC9uMpGZkmZJ9EfCVJBQx4pV4EMGT1w==",
+      "dev": true,
+      "dependencies": {
+        "@semantic-release/error": "^3.0.0",
+        "aggregate-error": "^3.0.0",
+        "debug": "^4.0.0",
+        "dir-glob": "^3.0.0",
+        "execa": "^5.0.0",
+        "lodash": "^4.17.4",
+        "micromatch": "^4.0.0",
+        "p-reduce": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=14.17"
+      },
+      "peerDependencies": {
+        "semantic-release": ">=18.0.0"
+      }
+    },
+    "node_modules/@semantic-release/git/node_modules/p-reduce": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/p-reduce/-/p-reduce-2.1.0.tgz",
+      "integrity": "sha512-2USApvnsutq8uoxZBGbbWM0JIYLiEMJ9RlaN7fAzVNb9OZN0SHjjTTfIcb667XynS5Y1VhwDJVDa72TnPzAYWw==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
    "node_modules/@semantic-release/github": {
      "version": "8.0.7",
      "resolved": "https://registry.npmjs.org/@semantic-release/github/-/github-8.0.7.tgz",
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "mergely",
-  "version": "5.0.0-alpha.2",
+  "version": "5.0.2",
  "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": {
@@ -14,7 +14,7 @@
  },
  "repository": {
    "type": "git",
-    "url": "git+https://github.com/wickedest/Mergely.git"
+    "url": "git@github.com:wickedest/Mergely.git"
  },
  "main": "lib/mergely.js",
  "files": [
@@ -36,6 +36,8 @@
    "@commitlint/cli": "^17.6.1",
    "@commitlint/config-conventional": "^15.0.0",
    "@commitlint/prompt-cli": "^15.0.0",
+    "@semantic-release/changelog": "^6.0.3",
+    "@semantic-release/git": "^10.0.1",
    "babel-loader": "^8.2.3",
    "babel-plugin-syntax-dynamic-import": "^6.18.0",
    "chai": "^4.3.4",
--- a/src/diff-view.js
+++ b/src/diff-view.js
@@ -45,6 +45,7 @@ CodeMirrorDiffView.prototype.init = function(el, options = {}) {
 		gutters: (this.settings.line_numbers && [ 'merge', 'CodeMirror-linenumbers' ]) || [],
 	};
 	this._vdoc = new VDoc({ _debug: this.settings._debug });
+	this._linkedScrollTimeout = {};
 };

 CodeMirrorDiffView.prototype.unbind = function() {
@@ -701,11 +702,14 @@ CodeMirrorDiffView.prototype._scrolling = function({ side }) {
 		// coming in 2s, so this will "link" scrolling the other editor to
 		// this editor until this editor stops scrolling and times out.
 		this._skipscroll[oside] = true;
-		if (this._linkedScrollTimeout) {
-			clearTimeout(this._linkedScrollTimeout);
+		trace('scroll#set oside skip set:', oside, this._skipscroll);
+		if (this._linkedScrollTimeout[oside]) {
+			clearTimeout(this._linkedScrollTimeout[oside]);
+			trace('scroll#clearing timeout:', this._skipscroll);
 		}
-		this._linkedScrollTimeout = setTimeout(() => {
+		this._linkedScrollTimeout[oside] = setTimeout(() => {
 			this._skipscroll[oside] = false;
+			trace('scroll#set oside skip unset:', oside, this._skipscroll);
 		}, 100);

 		const top = top_to - top_adjust;
Author	SHA1	Message	Date
semantic-release-bot	cb46821103	chore(release): 5.0.2 [skip ci] ## [5.0.2](https://github.com/wickedest/Mergely/compare/v5.0.1...v5.0.2) (2023-04-24) ### Bug Fixes * scroll: fixed issue where first rhs scroll was unlinked ([`7b2040c`](`7b2040c6ad`))	2023-04-24 07:51:30 +00:00
Jamie Peabody	7b2040c6ad	fix(scroll): fixed issue where first rhs scroll was unlinked	2023-04-24 08:50:14 +01:00
Jamie Peabody	df7d23244b	chore: fix changelog	2023-04-23 21:50:20 +01:00
semantic-release-bot	a6751b5957	chore(release): 5.0.1 [skip ci] ## [5.0.1](https://github.com/wickedest/Mergely/compare/v5.0.0...v5.0.1) (2023-04-23) ### Bug Fixes * update release ([`a8b497b`](`a8b497bc9b`))	2023-04-23 20:44:06 +00:00
Jamie Peabody	a8b497bc9b	fix: update release	2023-04-23 21:42:58 +01:00
Jamie Peabody	166446c945	chore(ci): fixed branch name	2023-04-23 17:01:29 +01:00
Jamie Peabody	caff902c99	chore(ci): fix release (#175 )	2023-04-23 16:54:56 +01:00
Jamie Peabody	37fedd05c8	v5.0 (#174 ) * feat: v5 BREAKING CHANGE: Mergely is no longer a jQuery plugin. BREAKING CHANGE: Removed `options.autoresize` BREAKING CHANGE: Removed `options.editor_width` BREAKING CHANGE: Removed `options.editor_height` BREAKING CHANGE: Removed `options.fadein` BREAKING CHANGE: Removed `options.fgcolor` BREAKING CHANGE: Removed `options.resize` BREAKING CHANGE: Removed `options.width` BREAKING CHANGE: Removed `options.height` BREAKING CHANGE: Removed `options.loaded` callback BREAKING CHANGE: Removed `options.resized` callback BREAKING CHANGE: Removed styles `.mergely-resizer`, `.mergely-full-screen-0`, and `.mergely-full-screen-8` BREAKING CHANGE: Changed default for `options.change_timeout` changed from `150` to `50`. BREAKING CHANGE: No longer automatically scrolls to first change. feat: CodeMirror is now an explicit dependency. feat: No longer necessary to separately require codemirror/addon/search/searchcursor feat: No longer necessary to separately require codemirror/addon/selection/mark-selection feat: `mergely.js` is now unminimized, and added new minimized version `mergely.min.js` feat: Gutter click now scrolls to any line feat: Mergely now emits `resize` event on resize feat: The UI is now non-blocking as diff now runs in background feat: Added support to provide `options.lhs` and `options.rhs` as strings feat: #16 added titles to editor.mergely.com fix: #165 block of changes at end of file are now distinguishable fix: #140 fixed performance issue with large files fix: Fixed issue where canvas markup was not rendered when `viewport` enabled fix: Fixed timing issue where swap sides may not work as expected. fix: Fixed issue where unmarkup did not emit an updated event. fix: Fixed documentation issue where `merge` incorrectly stated: from the specified `side` to the opposite side. fix: Fixed performance issue scrolling fix: Fixed issue where initial render scrolled to first change, showing it at the bottom (as opposed to middle as expected) fix: Fixed issue where line-diffs failed to diff non-alphanumeric characters * chore: tweaked no-start/end styles * feat: dark mode * chore: updated examples * chore(ci): updated webpack * chore(ci): alpha, beta, next branches * chore(ci): test * chore(ci): package-lock.json * chore(ci): ignore alpha, beta, next on branch * fix: fixes firefox scroll-linked effect issue * fix: fixes firefox scroll-linked effect issue * chore: fix css * chore: debug	2023-04-23 16:29:59 +01:00