File tree Expand file tree Collapse file tree 4 files changed +12
-7
lines changed Expand file tree Collapse file tree 4 files changed +12
-7
lines changed Original file line number Diff line number Diff line change @@ -4,14 +4,19 @@ var parent = null,
4
4
view = null ;
5
5
6
6
var diff = {
7
+ colorFormat : function ( diffText ) {
8
+ return diffText
9
+ . replace ( / ( ^ \- \s [ \S \s ] + ?$ ) / gm, "{red-fg}$1{/red-fg}" )
10
+ . replace ( / ( ^ \+ \s [ \S \s ] + ?$ ) / gm, "{green-fg}$1{/green-fg}" )
11
+ . replace ( / ( ^ @ @ \s [ \S \s ] + ?@ @ ) / gm, "{cyan-fg}$1{/cyan-fg}" ) ;
12
+ } ,
7
13
show : function ( ) {
8
14
var diffText = parent . git . diff (
9
15
parent . prevFocused . name ,
10
16
parent . prevFocused . selected
11
17
) ;
12
18
13
- view . textarea . setValue ( diffText ) ;
14
- view . textarea . scrollTo ( 0 ) ;
19
+ view . textarea . setContent ( diff . colorFormat ( diffText ) ) ;
15
20
16
21
view . layout . show ( ) ;
17
22
view . textarea . focus ( ) ;
@@ -20,7 +25,7 @@ var diff = {
20
25
21
26
hide : function ( reload ) {
22
27
view . layout . hide ( ) ;
23
- view . textarea . clearValue ( ) ;
28
+ view . textarea . setContent ( "" ) ;
24
29
parent . show ( reload ) ;
25
30
} ,
26
31
Original file line number Diff line number Diff line change 1
1
{
2
2
"name" : " git-commander" ,
3
- "version" : " 0.0.7" ,
4
- "description" : " A git tool with a easy terminal interface." ,
5
- "author" : " Jin Kim" ,
3
+ "version" : " 0.0.8" ,
6
4
"license" : " MIT" ,
7
5
"repository" : {
8
6
"type" : " git" ,
Original file line number Diff line number Diff line change @@ -13,7 +13,7 @@ var init = function (screen) {
13
13
styles . textarea . parent = layout ;
14
14
styles . menubar . parent = layout ;
15
15
16
- textarea = blessed . textarea ( styles . textarea ) ;
16
+ textarea = blessed . text ( styles . textarea ) ;
17
17
menubar = blessed . listbar ( styles . menubar ) ;
18
18
19
19
return {
Original file line number Diff line number Diff line change 12
12
"width" : " 100%" ,
13
13
"height" : " 100%-3" ,
14
14
"border" : " line" ,
15
+ "tags" : true ,
16
+ "scrollable" : true ,
15
17
"mouse" : true ,
16
18
"vi" : true ,
17
19
"keys" : true ,
You can’t perform that action at this time.
0 commit comments