lxm_front/Mergely
1
0
Fork 1
mirror of https://github.com/wickedest/Mergely.git synced 2026-03-20 09:38:39 +08:00
Code Issues Projects Releases Wiki Activity

Morning clean up.

Browse Source 
Restrict keyboard handler for the Mergely div to play nicely with other element on the page.
Darker grey for active difference.
This commit is contained in:
Kljh
2014-08-17 08:25:16 +01:00
parent 572eb08aaa
commit 4f8c91c28a
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/mergely.js
View File

@@ -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.");