fix: fixes undefined 'k' due to scoped 'let'

chore(release): 5.1.0 [skip ci]
# [5.1.0](https://github.com/wickedest/Mergely/compare/v5.0.4...v5.1.0) (2023-08-27) ### Features * support CM modes: go, javascript, htmlmixed, markdown, python ([827487a](827487a598))
2025-12-25 08:58:08 +08:00 · 2024-03-11 19:43:28 +00:00 · 2023-08-27 13:04:50 +00:00 · 2023-08-27 14:03:41 +01:00 · 2023-08-27 12:17:49 +00:00 · 2023-08-27 13:16:11 +01:00
9 changed files with 39 additions and 12 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,17 @@
+# [5.1.0](https://github.com/wickedest/Mergely/compare/v5.0.4...v5.1.0) (2023-08-27)
+
+
+### Features
+
+* support CM modes: go, javascript, htmlmixed, markdown, python ([827487a](https://github.com/wickedest/Mergely/commit/827487a5983cb89ef41415435d44239e35983b9a))
+
+## [5.0.4](https://github.com/wickedest/Mergely/compare/v5.0.3...v5.0.4) (2023-08-27)
+
+
+### Bug Fixes
+
+* updated CDN example ([dec1e95](https://github.com/wickedest/Mergely/commit/dec1e9509d94811914e77cbc33dc1aaedf154f7c))
+
 ## [5.0.3](https://github.com/wickedest/Mergely/compare/v5.0.2...v5.0.3) (2023-08-27)


--- a/README.md
+++ b/README.md
@@ -36,13 +36,11 @@ rm -rf .git

 ### Usage via CDN

-Add the following to the `<head>` of your target HTML source file.
+Add the following to the `<head>` of your target HTML source file. Note that `codemirror` is bundled.

 ```html
 <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/mergely/5.0.0/mergely.min.js"></script>
 <link type="text/css" rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/mergely/5.0.0/mergely.css" />
-<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.65.12/codemirror.min.js"></script>
-<link type="text/css" rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.65.12/codemirror.css" />
 ```

 ### Synchronous initialization
@@ -84,6 +82,16 @@ Mergely will emit an `updated` event when the editor is first initialized, and e
 </body>
 ```

+### Visualization modes
+
+Mergely supports the following CodeMirror visualizations for [mode](codemirror.net/5/doc/manual.html#option_mode):
+
+* go
+* javascript
+* htmlmixed
+* markdown
+* python
+
 ## Options

 |Option|Type|Default value|Description|
--- a/examples/cdn.html
+++ b/examples/cdn.html
@@ -14,9 +14,6 @@
 	<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/mergely/5.0.0/mergely.min.js"></script>
 	<link type="text/css" rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/mergely/5.0.0/mergely.css" />

-	<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.65.12/codemirror.min.js"></script>
-	<link type="text/css" rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.65.12/codemirror.css" />
-
 	<style type="text/css">
 		html, body {
 			height: 100%;
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
  "name": "mergely",
-  "version": "5.0.3",
+  "version": "5.1.0",
  "lockfileVersion": 3,
  "requires": true,
  "packages": {
    "": {
      "name": "mergely",
-      "version": "5.0.3",
+      "version": "5.1.0",
      "license": "(GPL-3.0 OR LGPL-3.0 OR MPL-1.1 OR SEE LICENSE IN LICENSE)",
      "devDependencies": {
        "@babel/core": "^7.1.6",
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "mergely",
-  "version": "5.0.3",
+  "version": "5.1.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": {
--- a/src/diff-view.js
+++ b/src/diff-view.js
@@ -2,6 +2,12 @@ const CodeMirror = require('codemirror');
 require('codemirror/addon/search/searchcursor.js');
 require('codemirror/addon/selection/mark-selection.js');
 require('codemirror/lib/codemirror.css');
+require('codemirror/mode/go/go.js');
+require('codemirror/mode/javascript/javascript.js');
+require('codemirror/mode/htmlmixed/htmlmixed.js');
+require('codemirror/mode/markdown/markdown.js');
+require('codemirror/mode/python/python.js');
+
 const dom = require('./dom.js');
 const VDoc = require('./vdoc');

--- a/src/diff.js
+++ b/src/diff.js
@@ -146,7 +146,7 @@ diff.prototype._sms = function(lhs_ctx, lhs_lower, lhs_upper, rhs_ctx, rhs_lower
 			}
 		}
 		// Extend the reverse path.
-		for (k = kup - d; k <= kup + d; k += 2) {
+		for (let k = kup - d; k <= kup + d; k += 2) {
 			// find the only or better starting point
 			if (k === kup + d) {
 				x = vector_u[offset_up + k - 1]; // up
--- a/src/mergely.js
+++ b/src/mergely.js
@@ -23,7 +23,8 @@ const defaultOptions = {
 	vpcolor: 'rgba(0, 0, 200, 0.5)',
 	license: 'lgpl',
 	cmsettings: {
-		styleSelectedText: true
+		styleSelectedText: true,
+		mode: null
 	},
 	lhs_cmsettings: {},
 	rhs_cmsettings: {},
--- a/test/mergely.spec.js
+++ b/test/mergely.spec.js
@@ -22,7 +22,8 @@ const defaultOptions = {
 	vpcolor: 'rgba(0, 0, 200, 0.5)',
 	license: 'lgpl',
 	cmsettings: {
-		styleSelectedText: true
+		styleSelectedText: true,
+		mode: null
 	},
 	_debug: false
 };
Author	SHA1	Message	Date
Jamie Peabody	e1db3c4f9e	fix: fixes undefined 'k' due to scoped 'let'	2024-03-11 19:43:28 +00:00
semantic-release-bot	5e4dfc9e78	chore(release): 5.1.0 [skip ci] # [5.1.0](https://github.com/wickedest/Mergely/compare/v5.0.4...v5.1.0) (2023-08-27) ### Features * support CM modes: go, javascript, htmlmixed, markdown, python ([`827487a`](`827487a598`))	2023-08-27 13:04:50 +00:00
Jamie Peabody	827487a598	feat: support CM modes: go, javascript, htmlmixed, markdown, python	2023-08-27 14:03:41 +01:00
semantic-release-bot	bc46617d5e	chore(release): 5.0.4 [skip ci] ## [5.0.4](https://github.com/wickedest/Mergely/compare/v5.0.3...v5.0.4) (2023-08-27) ### Bug Fixes * updated CDN example ([`dec1e95`](`dec1e9509d`))	2023-08-27 12:17:49 +00:00
Jamie Peabody	dec1e9509d	fix: updated CDN example	2023-08-27 13:16:11 +01:00