Skip to content

Commit f6b0260

Browse files
committed
Add and use redraw function instead of screen.render()
1 parent d4f1191 commit f6b0260

File tree

2 files changed

+17
-11
lines changed

2 files changed

+17
-11
lines changed

controller/log.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ var log = {
9797

9898
log.hide(true);
9999
} else {
100-
parent.screen.render();
100+
redraw();
101101
}
102102
});
103103
});

controller/main.js

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,12 @@ var editor = require('./editor'),
1010
// model control
1111
var git = new Git(__dirname);
1212

13+
// for convenience.
14+
// use just call redraw() anywhere if need screen.render()
15+
global.redraw = function () {
16+
view.screen.render();
17+
};
18+
1319
var main = {
1420
git : git,
1521
screen: view.screen,
@@ -19,20 +25,20 @@ var main = {
1925
view.list.unstaged.interactive = false;
2026
view.list.staged.select(index !== undefined ? index : view.list.unstaged.selected);
2127
view.list.staged.focus();
22-
view.screen.render();
28+
redraw();
2329
},
2430

2531
moveToUnstaged: function (index) {
2632
view.list.staged.interactive = false;
2733
view.list.unstaged.interactive = true;
2834
view.list.unstaged.select(index !== undefined ? index : view.list.staged.selected);
2935
view.list.unstaged.focus();
30-
view.screen.render();
36+
redraw();
3137
},
3238

3339
next: function () {
3440
this.move(1);
35-
view.screen.render();
41+
redraw();
3642
},
3743

3844
// TODO: Fix crash if there is no item
@@ -47,7 +53,7 @@ var main = {
4753
main.mark.call(this);
4854
}
4955

50-
view.screen.render();
56+
redraw();
5157
},
5258

5359
selectAll: function () {
@@ -63,7 +69,7 @@ var main = {
6369
main.setItems(git);
6470
}
6571

66-
view.screen.render();
72+
redraw();
6773
},
6874

6975
lockScreen: function () {
@@ -79,13 +85,13 @@ var main = {
7985
show: function (controller) {
8086
if (_.isBoolean(controller) && controller === true) {
8187
main.reload();
82-
view.screen.render();
88+
redraw();
8389
} else if (_.isObject(controller)) {
8490
main.lockScreen();
8591
controller.show();
8692
} else {
8793
main.unlockScreen();
88-
view.screen.render();
94+
redraw();
8995
}
9096
},
9197

@@ -99,7 +105,7 @@ var main = {
99105

100106
view.loading.stop();
101107

102-
view.screen.render();
108+
redraw();
103109
},
104110

105111
// utility functions
@@ -143,14 +149,14 @@ var main = {
143149
showPopup: function (msg) {
144150
view.popup.content = "{center}" + msg + "{/center}";
145151
view.popup.hidden = false;
146-
main.reload();
152+
redraw();
147153

148154
setTimeout(main.hidePopup, 1000);
149155
},
150156

151157
hidePopup: function () {
152158
view.popup.hidden = true;
153-
main.reload();
159+
redraw();
154160
}
155161
};
156162

0 commit comments

Comments
 (0)