From 4f8c91c28a8ed764a3ee8d1193fd37561ccd4175 Mon Sep 17 00:00:00 2001 From: Kljh Date: Sun, 17 Aug 2014 08:25:16 +0100 Subject: [PATCH] Morning clean up. Restrict keyboard handler for the Mergely div to play nicely with other element on the page. Darker grey for active difference. --- lib/mergely.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/mergely.js b/lib/mergely.js index af35d56..56ff7ec 100644 --- a/lib/mergely.js +++ b/lib/mergely.js @@ -391,7 +391,7 @@ jQuery.extend(Mgly.CodeMirrorDiffView.prototype, { resize_timeout: 500, change_timeout: 150, fgcolor: {a:'#4ba3fa',c:'#a3a3a3',d:'#ff7f7f', // color for differences (soft color) - ca:'#4b73ff',cc:'#737373',cd:'#ff4f4f'}, // color for currently active difference (bright color) + ca:'#4b73ff',cc:'#434343',cd:'#ff4f4f'}, // color for currently active difference (bright color) bgcolor: '#eee', vpcolor: 'rgba(0, 0, 200, 0.5)', lhs: function(setValue) { }, @@ -691,7 +691,7 @@ jQuery.extend(Mgly.CodeMirrorDiffView.prototype, { // kljh: register WinMerge style key bindings var self = this; - document.body.addEventListener("keydown", function(evt) { + document.getElementById(this.id).addEventListener("keydown", function(evt) { if (evt.defaultPrevented) { //return; // Should do nothing if the key event was already consumed. //console.warn("Should do nothing if the key event was already consumed.");