Skip to content

Commit c859f35

Browse files
committed
#35 log also using key config
1 parent 23649e5 commit c859f35

File tree

5 files changed

+96
-88
lines changed

5 files changed

+96
-88
lines changed

controller/diff.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
var DiffView = require('../view/diff');
2+
var config = require('../config');
23

34
var parent = null,
45
view = null;
56

6-
var config = require('../config');
7-
87
var diff = {
98
colorFormat: function (diffText) {
109
return diffText

controller/log.js

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
var LogView = require('../view/log');
2+
var config = require('../config');
23

34
var parent = null,
45
view = null;
@@ -88,7 +89,7 @@ var log = {
8889

8990
view = LogView(parent.screen);
9091

91-
view.list.key(['C-r'], function () {
92+
view.list.key(config.keys.main.reset, function () {
9293
var item = logItems[view.list.selected];
9394

9495
view.confirm.ask("Are you sure to reset? (Y/N)\n", function (err, value) {
@@ -102,13 +103,24 @@ var log = {
102103
});
103104
});
104105

105-
view.list.key(['escape', 'q'], function () {
106+
view.list.key(config.keys.common.quit, function () {
106107
log.hide();
107108
});
108109

109-
view.confirm.key(['escape'], function () {
110+
view.list.key(config.keys.common.pageUp, function () {
111+
view.list.scroll(-view.list.height || -1);
112+
redraw();
113+
});
114+
115+
view.list.key(config.keys.common.pageDown, function () {
116+
view.list.scroll(view.list.height || 1);
117+
redraw();
118+
});
119+
120+
view.confirm.key(config.keys.common.quit, function () {
110121
view.confirm.hide();
111122
});
123+
112124
}
113125
};
114126

view/log.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
var blessed = require('blessed'),
2-
styles = require('./style/log.json');
2+
config = require('../config'),
3+
styles = require('./style/log')(config);
34

45
var layout = null,
56
list = null,

view/style/log.js

Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
'use strict';
2+
3+
module.exports = function (config) {
4+
return {
5+
"layout": {
6+
"hidden": true,
7+
"top": "center",
8+
"left": "center",
9+
"width": "100%",
10+
"height": "100%"
11+
},
12+
"list": {
13+
"top": "top",
14+
"left": "left",
15+
"data": null,
16+
"border": "line",
17+
"align": "left",
18+
"tags": true,
19+
"width": "100%",
20+
"height": "100%-3",
21+
"mouse": true,
22+
"vi": true,
23+
"keys": true,
24+
"style": {
25+
"border": {
26+
"fg": "white"
27+
},
28+
"selected": {
29+
"bg": "blue"
30+
}
31+
}
32+
},
33+
"confirm": {
34+
"border": "line",
35+
"height": "shrink",
36+
"width": "half",
37+
"top": "center",
38+
"left": "center",
39+
"keys": true,
40+
"vi": true
41+
},
42+
"menubar": {
43+
"align": "center",
44+
"bottom": 0,
45+
"width": "100%",
46+
"height": 3,
47+
"mouse": true,
48+
"border": "line",
49+
"vi": true,
50+
"keys": true,
51+
"style": {
52+
"prefix": {
53+
"fg": "white"
54+
},
55+
"item": {
56+
"fg": "cyan"
57+
},
58+
"selected": {
59+
"fg": "cyan"
60+
}
61+
},
62+
"commands": {
63+
"RESET COMMIT": {
64+
"keys": config.keys.main.reset
65+
},
66+
"CANCEL": {
67+
"keys": config.keys.common.quit
68+
},
69+
"PAGE DOWN": {
70+
"keys": config.keys.common.pageDown
71+
},
72+
"PAGE UP": {
73+
"keys": config.keys.common.pageUp
74+
}
75+
}
76+
}
77+
};
78+
};

view/style/log.json

Lines changed: 0 additions & 82 deletions
This file was deleted.

0 commit comments

Comments
 (0)