},
{
"listeners" : {
- "button_press_event" : "() => {\n _this.repo.git({ \"commit\" , \"-a\" ,\"-m\", \"Uncommited changes synced\" });\n _this.repo.push();\n _this.repo.loadStatus();\n \n _this.diff_view.el.get_buffer().set_text(_this.repo.git_diff);\n _this.status_view.el.get_buffer().set_text(_this.repo.git_status);\n \n _this.el.hide();\n Clones.singleton().reposStore.load();\n \n return false;\n}"
+ "button_press_event" : "() => {\n\n _this.el.hide();\n Clones.singleton().el.hide();\n MergeBranch.singleton().show(this.ticket, null); \n return false;\n}"
},
"label" : "Merge branch/ ticket",
"xtype" : "Button",
//listeners
this.el.button_press_event.connect( () => {
- _this.repo.git({ "commit" , "-a" ,"-m", "Uncommited changes synced" });
- _this.repo.push();
- _this.repo.loadStatus();
-
- _this.diff_view.el.get_buffer().set_text(_this.repo.git_diff);
- _this.status_view.el.get_buffer().set_text(_this.repo.git_status);
-
+
_this.el.hide();
- Clones.singleton().reposStore.load();
-
+ Clones.singleton().el.hide();
+ MergeBranch.singleton().show(this.ticket, null);
return false;
});
}