RepoStatusPopover.bjs

[gitlive] / RepoStatusPopover.bjs

diff --git a/RepoStatusPopover.bjs b/RepoStatusPopover.bjs
index 4ad631b..95f0e43 100644 (file)
--- a/RepoStatusPopover.bjs
+++ b/RepoStatusPopover.bjs
@@ -148,7 +148,7 @@
         },
         {
          "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",