File tree Expand file tree Collapse file tree 5 files changed +96
-88
lines changed Expand file tree Collapse file tree 5 files changed +96
-88
lines changed Original file line number Diff line number Diff line change 1
1
var DiffView = require ( '../view/diff' ) ;
2
+ var config = require ( '../config' ) ;
2
3
3
4
var parent = null ,
4
5
view = null ;
5
6
6
- var config = require ( '../config' ) ;
7
-
8
7
var diff = {
9
8
colorFormat : function ( diffText ) {
10
9
return diffText
Original file line number Diff line number Diff line change 1
1
var LogView = require ( '../view/log' ) ;
2
+ var config = require ( '../config' ) ;
2
3
3
4
var parent = null ,
4
5
view = null ;
@@ -88,7 +89,7 @@ var log = {
88
89
89
90
view = LogView ( parent . screen ) ;
90
91
91
- view . list . key ( [ 'C-r' ] , function ( ) {
92
+ view . list . key ( config . keys . main . reset , function ( ) {
92
93
var item = logItems [ view . list . selected ] ;
93
94
94
95
view . confirm . ask ( "Are you sure to reset? (Y/N)\n" , function ( err , value ) {
@@ -102,13 +103,24 @@ var log = {
102
103
} ) ;
103
104
} ) ;
104
105
105
- view . list . key ( [ 'escape' , 'q' ] , function ( ) {
106
+ view . list . key ( config . keys . common . quit , function ( ) {
106
107
log . hide ( ) ;
107
108
} ) ;
108
109
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 ( ) {
110
121
view . confirm . hide ( ) ;
111
122
} ) ;
123
+
112
124
}
113
125
} ;
114
126
Original file line number Diff line number Diff line change 1
1
var blessed = require ( 'blessed' ) ,
2
- styles = require ( './style/log.json' ) ;
2
+ config = require ( '../config' ) ,
3
+ styles = require ( './style/log' ) ( config ) ;
3
4
4
5
var layout = null ,
5
6
list = null ,
Original file line number Diff line number Diff line change
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
+ } ;
Load Diff This file was deleted.
You can’t perform that action at this time.
0 commit comments