chore(ci): fix release

.releaserc.yaml

@@ -1,11 +0,0 @@
-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"

CHANGELOG.md

@@ -1,41 +1,7 @@
-## [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)
 
 

package-lock.json

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

package.json

@@ -1,6 +1,6 @@
 {
   "name": "mergely",
-  "version": "5.0.2",
+  "version": "5.0.0",
   "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@github.com:wickedest/Mergely.git"
+    "url": "git+https://github.com/wickedest/Mergely.git"
   },
   "main": "lib/mergely.js",
   "files": [
@@ -30,6 +30,22 @@
     "diff",
     "myers"
   ],
+  "release": {
+    "branches": [
+      "main",
+      "alpha",
+      "beta",
+      "next"
+    ],
+    "plugins": [
+      "@semantic-release/commit-analyzer",
+      "@semantic-release/release-notes-generator",
+      "@semantic-release/changelog",
+      "@semantic-release/npm",
+      "@semantic-release/git",
+      "@semantic-release/github"
+    ]
+  },
   "devDependencies": {
     "@babel/core": "^7.1.6",
     "@babel/preset-env": "^7.1.6",

src/diff-view.js

@@ -45,7 +45,6 @@ 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() {
@@ -702,14 +701,11 @@ 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;
-		trace('scroll#set oside skip set:', oside, this._skipscroll);
+		if (this._linkedScrollTimeout) {
-		if (this._linkedScrollTimeout[oside]) {
+			clearTimeout(this._linkedScrollTimeout);
-			clearTimeout(this._linkedScrollTimeout[oside]);
-			trace('scroll#clearing timeout:', this._skipscroll);
 		}
-		this._linkedScrollTimeout[oside] = setTimeout(() => {
+		this._linkedScrollTimeout = setTimeout(() => {
 			this._skipscroll[oside] = false;
-			trace('scroll#set oside skip unset:', oside, this._skipscroll);
 		}, 100);
 
 		const top = top_to - top_adjust;