projects
/
gitlive
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
RepoStatusPopover.bjs
[gitlive]
/
RepoStatusPopover.bjs
diff --git
a/RepoStatusPopover.bjs
b/RepoStatusPopover.bjs
index
deadfc2
..
79e88ca
100644
(file)
--- a/
RepoStatusPopover.bjs
+++ b/
RepoStatusPopover.bjs
@@
-148,7
+148,7
@@
},
{
"listeners" : {
},
{
"listeners" : {
- "button_press_event" : "() => {\n\n _this.el.hide();\n Clones.singleton().el.response(-1);\n
MergeBranch.singleton().show(this.ticket, null);
\n return false;\n}"
+ "button_press_event" : "() => {\n\n _this.el.hide();\n Clones.singleton().el.response(-1);\n
if (_this.repos.activeTicket != null) {\n\t MergeBranch.singleton().show(this.repo.activeTicket, null); \n }
\n return false;\n}"
},
"label" : "Merge branch/ ticket",
"xtype" : "Button",
},
"label" : "Merge branch/ ticket",
"xtype" : "Button",