4.0.7

chore: updated docs
patch(issue #89 ): fixes missing merge buttons (#91 )
2025-12-26 09:28:12 +08:00 · 2018-08-06 13:01:19 +01:00 · 2018-08-06 13:01:13 +01:00 · 2018-07-17 13:46:54 -07:00
6 changed files with 24 additions and 7 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /node_modules
 /lib
 mergely-*.tgz
+package-lock.json
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,5 +1,20 @@
 # Changes

+## 4.0.7
+* chore: updated documentation
+
+## 4.0.6
+
+* #89: fixes missing merge buttons
+
+## 4.0.5
+
+* #85: fixes XSS vulnerability with DOM id
+
+## 4.0.2
+
+* #83: fixes poor rendering performance
+
 ## 4.0.0

 ### Breaking changes
--- a/README.md
+++ b/README.md
@@ -9,6 +9,9 @@ Mergely is a javascript component to diff/merge files interactively in a browser
 ### Installation via webpack
 The recommended way to install mergely is to use npm and [webpack](https://webpack.js.org/) to install mergely and its dependencies.  It is highly recommended that you start by cloning [mergely-webpack](https://github.com/wickedest/mergely-webpack).  It has everything that you need to get started.

+### Angular 6.1.1
+You can also use mergely within angular.  You can start by cloning [mergely-angular](https://github.com/wickedest/mergely-angular).
+
 ### Installation via .tgz

 Unpack mergely.tgz into a folder, e.g. `./lib`, and then add the following to the `<head>` of your target html source file.
@@ -46,9 +49,6 @@ The following example can be used to set the `lhs` and `rhs` editors synchronous

 ```js
 $(document).ready(function () {
-    // initialize mergely
-    $('#mergely').mergely();
-
    // set editor content
    $('#mergely').mergely({
        lhs: function(setValue) {
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "mergely",
-  "version": "4.0.5",
+  "version": "4.0.7",
  "description": "A javascript UI for diff/merge",
  "directories": {
    "doc": "doc",
--- a/src/mergely.js
+++ b/src/mergely.js
@@ -461,11 +461,11 @@ jQuery.extend(Mgly.CodeMirrorDiffView.prototype, {
 			lineNumbers: this.settings.line_numbers
 		};
 		var lhs_gutters = [];
-		if (this.lhs_cmsettings.line_numbers) {
+		if (this.lhs_cmsettings.lineNumbers) {
 			lhs_gutters = ['merge', 'CodeMirror-linenumbers']
 		}
 		var rhs_gutters = [];
-		if (this.rhs_cmsettings.line_numbers) {
+		if (this.rhs_cmsettings.lineNumbers) {
 			rhs_gutters = ['merge', 'CodeMirror-linenumbers']
 		}
 		jQuery.extend(true, this.lhs_cmsettings, this.settings.cmsettings, { gutters: lhs_gutters }, this.settings);
@@ -683,7 +683,7 @@ jQuery.extend(Mgly.CodeMirrorDiffView.prototype, {
 		}
 		else {
 			// homebrew
-			var style = 'opacity:0.4;width:10px;height:15px;background-color:#888;cursor:pointer;text-align:center;color:#eee;border:1px solid #222;margin-right:5px;margin-top: -2px;';
+			var style = 'opacity:0.6;height:16px;background-color:#bfbfbf;cursor:pointer;text-align:center;color:#eee;border:1px solid #848484;margin-right:5px;margin-top:-2px;';
 			merge_lhs_button = '<div style="' + style + '" title="Merge left">&lt;</div>';
 			merge_rhs_button = '<div style="' + style + '" title="Merge right">&gt;</div>';
 		}
--- a/tests/mergely.spec.js
+++ b/tests/mergely.spec.js
@@ -402,6 +402,7 @@ describe('mergely', function () {
 						for (let i = 0; i < opt.next; ++i) {
 							$('#mergely').mergely('scrollToDiff', 'next');
 						}
+						expect($('.merge-button').length > 0).to.be.true;
 						$('#mergely').mergely('mergeCurrentChange', opt.dir);
 						if (opt.dir === 'lhs') {
 							expect($('#mergely').mergely('get', 'lhs')).to.equal(opt.expect || opt.rhs);
Author	SHA1	Message	Date
Jamie Peabody	3d44470103	4.0.7	2018-08-06 13:01:19 +01:00
Jamie Peabody	2c8f6cd340	chore: updated docs	2018-08-06 13:01:13 +01:00
Jamie Peabody	6716096215	patch(issue #89 ): fixes missing merge buttons (#91 ) * patch(fix-89): fixes missing merge buttons * 4.0.6	2018-07-17 13:46:54 -07:00