Merge branch 'master' into alpha

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "mergely",
-  "version": "5.0.0-rc0",
+  "version": "5.0.0-alpha.2",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "mergely",
-      "version": "5.0.0-rc0",
+      "version": "5.0.0-alpha.2",
       "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.0-rc0",
+  "version": "5.0.0-alpha.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": {

src/diff-view.js

@@ -44,7 +44,7 @@ CodeMirrorDiffView.prototype.init = function(el, options = {}) {
 		lineNumbers: this.settings.line_numbers,
 		gutters: (this.settings.line_numbers && [ 'merge', 'CodeMirror-linenumbers' ]) || [],
 	};
-	this._vdoc = new VDoc();
+	this._vdoc = new VDoc({ _debug: this.settings._debug });
 };
 
 CodeMirrorDiffView.prototype.unbind = function() {
@@ -561,7 +561,7 @@ CodeMirrorDiffView.prototype._clearMarkup = function () {
 		traceTimeStart('draw#_clearMarkup');
 	}
 	this._vdoc.clear();
-	this._vdoc = new VDoc();
+	this._vdoc = new VDoc({ _debug: this.settings._debug });
 	if (this.settings._debug) {
 		traceTimeEnd('draw#_clearMarkup');
 	}
@@ -995,14 +995,10 @@ CodeMirrorDiffView.prototype._markupLineChanges = function (changes) {
 		}
 	}
 	led.operation(() => {
-		for (let i = 0; i < changes.length; ++i) {
-			vdoc.update('lhs', i, led, lhsvp);
-		}
+		vdoc.update('lhs', led, lhsvp);
 	});
 	red.operation(() => {
-		for (let i = 0; i < changes.length; ++i) {
-			vdoc.update('rhs', i, red, rhsvp);
-		}
+		vdoc.update('rhs', red, rhsvp);
 	});
 	if (this.settings._debug) {
 		traceTimeEnd('draw#_markupLineChanges');

src/mergely.css

@@ -17,7 +17,7 @@
 }
 
 .mergely-editor .CodeMirror-selected {
-    background: #ffcb0f;
+	background: #0f73ff47;
 }
 
 .mergely-splash {
@@ -52,8 +52,6 @@
 .mergely-editor .merge-button {
 	height: 18px;
 	cursor: pointer;
-	width: 26px;
-	padding-left: 3px;
 }
 
 /* common stles */

src/mergely.js

@@ -114,7 +114,7 @@ class Mergely {
 
 	_setOptions(options) {
 		if (this._options && this._options._debug) {
-			trace('api#options', opts);
+			trace('api#options');
 		}
 		const colors = dom.getColors(this.el);
 		this._options = {

src/vdoc.js

@@ -1,7 +1,10 @@
 const diff = require('./diff');
 
+const trace = console.log;
+
 class VDoc {
-	constructor() {
+	constructor(options) {
+		this.options = options;
 		this._lines = {
 			lhs: {},
 			rhs: {}
@@ -13,6 +16,9 @@ class VDoc {
 	}
 
 	addRender(side, change, changeId, options) {
+		if (this.options._debug) {
+			trace('vdoc#addRender', side, changeId, change);
+		}
 		const {
 			isCurrent,
 			lineDiff,
@@ -23,6 +29,9 @@ class VDoc {
 		const alreadyRendered = !!this._rendered[side][changeId];
 
 		if (alreadyRendered) {
+			if (this.options._debug) {
+				trace('vdoc#addRender (already rendered)', side, changeId, change);
+			}
 			return;
 		}
 
@@ -116,6 +125,9 @@ class VDoc {
 	}
 
 	addInlineDiff(change, changeId, { getText, ignorews, ignoreaccents, ignorecase }) {
+		if (this.options._debug) {
+			trace('vdoc#addInlineDiff', changeId, change);
+		}
 		const { lf, lt, olf, olt } = getExtents('lhs', change);
 		const vdoc = this;
 
@@ -169,6 +181,9 @@ class VDoc {
 	}
 
 	_setRenderedChange(side, changeId) {
+		if (this.options._debug) {
+			trace('vdoc#_setRenderedChange', side, changeId);
+		}
 		return this._rendered[side][changeId] = true;
 	}
 
@@ -182,8 +197,10 @@ class VDoc {
 		return line;
 	}
 
-	update(side, changeId, editor, viewport) {
-		this._setRenderedChange(side, changeId);
+	update(side, editor, viewport) {
+		if (this.options._debug) {
+			trace('vdoc#update', side, editor, viewport);
+		}
 		const lines = Object.keys(this._lines[side]);
 		for (let i = 0; i < lines.length; ++i) {
 			const id = lines[i];
@@ -200,6 +217,9 @@ class VDoc {
 	}
 
 	clear() {
+		if (this.options._debug) {
+			trace('vdoc#clear');
+		}
 		for (const lineId in this._lines.lhs) {
 			this._lines.lhs[lineId].clear();
 		}