Merger.bjs

diff --git a/Merger.bjs b/Merger.bjs
index 07ec8ef..54623ef 100644 (file)
--- a/Merger.bjs
+++ b/Merger.bjs
@@ -231,7 +231,7 @@
                                             "items": [
                                                 {
                                                     "listeners": {
-                                                        "clicked": "function (self) {\n    \n     \n     var model = this.get('/historyTreeStore');\n    \n    if (model.release === false) {\n        return;\n    }\n    \n \n    var files = this.get('/changedFilesView').files();\n    \n    \n    var diff = Merger.repo.diff(files, model.release, model.rev);\n   \n    if (!files.length) {\n        return; // error.!\n    }\n    print(\"Files: \" + JSON.stringify(files));\n    return;\n    \n    var log =  Merger.repo.history(files, 1, 'rev', model.rev + '..' + model.release);\n    \n    print(JSON.stringify(log));\n    \n    Commit = imports.Commit.Commit;\n    Commit.repo = Merger.repo;\n    Commit.el.set_modal(true);\n    Commit.el.set_transient_for(Merger.el);\n\n    Commit.show({\n        files : files,\n        release : model.release,\n        rev : model.rev\n    \n    });\n\n\n\n}"
+                                                        "clicked": "function (self) {\n    \n     \n     var model = this.get('/historyTreeStore');\n    \n    if (model.release === false) {\n        return;\n    }\n    \n \n    var files = this.get('/changedFilesView').files();\n    \n     if (!files.length) {\n        return; // error.!\n    }\n    var diff = Merger.repo.diff(files, model.release, model.rev);\n   \n   \n \n    \n    var log =  Merger.repo.history(files, 1, 'rev', model.rev + '..' + model.release);\n    \n    print(JSON.stringify(log));\n    \n    Commit = imports.Commit.Commit;\n    Commit.repo = Merger.repo;\n    Commit.el.set_modal(true);\n    Commit.el.set_transient_for(Merger.el);\n\n    Commit.show({\n        files : files,\n        release : model.release,\n        rev : model.rev\n    \n    });\n\n\n\n}"
                                                     },
                                                     "label": "Commit diff (no merge)",
                                                     "xtype": "Button",