From: Alan Knowles <alan@roojs.com>
Date: Tue, 30 Oct 2018 04:40:10 +0000 (+0800)
Subject: Clones.bjs
X-Git-Url: http://git.roojs.org/?p=gitlive;a=commitdiff_plain;h=1cfb5497fdc1fdf03d52fcd17f9ba069160c5b52

Clones.bjs
Clones.vala
---

diff --git a/Clones.bjs b/Clones.bjs
index 90ae67eb..822b6a6f 100644
--- a/Clones.bjs
+++ b/Clones.bjs
@@ -35,7 +35,7 @@
        "items" : [
         {
          "listeners" : {
-          "clicked" : "function (self) {\n\n    var rv = this.get('/reposView');\n    var rs = this.get('/reposStore');\n    if (rv.el.get_selection().count_selected_rows() != 1) {\n        //nothing?\n        // error condition.\n        return;\n    }\n    var Remotes =     imports.Remotes.Remotes;\n    \n \n    var ret = {};       \n    var s = rv.el.get_selection();\n    var path = '';\n    s.selected_foreach(function(model,p,iter) {\n                                                    \n       path = model.get_value(iter, 6).value.get_string();\n     \n    }); \n\n    var repo = false;\n    rs.repos.forEach(function(r) {\n        if (r.repopath == path) {\n            repo = r;\n        \n        }\n    \n    });\n    Remotes.repo = repo;\n    Remotes.el.set_transient_for(Clones.el);\n    Clones.el.set_title(\"Manage Clones - \" + repo.repopath);\n    Remotes.show();\n    Clones.el.set_title(\"Manage Clones\");\n\n     \n    \n    \n    \n\n       \n    \n    \n}"
+          "clicked" : "() => {\n\n/*    var rv = this.get('/reposView');\n    var rs = this.get('/reposStore');\n    if (rv.el.get_selection().count_selected_rows() != 1) {\n        //nothing?\n        // error condition.\n        return;\n    }\n    var Remotes =     imports.Remotes.Remotes;\n    \n \n    var ret = {};       \n    var s = rv.el.get_selection();\n    var path = '';\n    s.selected_foreach(function(model,p,iter) {\n                                                    \n       path = model.get_value(iter, 6).value.get_string();\n     \n    }); \n\n    var repo = false;\n    rs.repos.forEach(function(r) {\n        if (r.repopath == path) {\n            repo = r;\n        \n        }\n    \n    });\n    Remotes.repo = repo;\n    Remotes.el.set_transient_for(Clones.el);\n    Clones.el.set_title(\"Manage Clones - \" + repo.repopath);\n    Remotes.show();\n    Clones.el.set_title(\"Manage Clones\");\n\n  */   \n    \n    \n    \n\n       \n    \n    \n}"
          },
          "label" : "Remotes / Clones",
          "* pack" : "add",
@@ -44,7 +44,7 @@
         },
         {
          "listeners" : {
-          "clicked" : "function (self) {\n\n    var rv = this.get('/reposView');\n    var rs = this.get('/reposStore');\n    if (rv.el.get_selection().count_selected_rows() != 1) {\n        //nothing?\n        // error condition.\n        return;\n    }\n    var Branches =     imports.Branches.Branches;\n    \n \n    var ret = {};       \n    var s = rv.el.get_selection();\n    var path = '';\n    s.selected_foreach(function(model,p,iter) {\n                                                    \n       path = model.get_value(iter, 6).value.get_string();\n     \n    }); \n\n    var repo = false;\n    rs.repos.forEach(function(r) {\n        if (r.repopath == path) {\n            repo = r;\n        \n        }\n    \n    });\n    Branches.repo = repo;\n    Branches.el.set_transient_for(Clones.el);\n    Clones.el.set_title(\"Manage Clones - \" + repo.repopath);\n    Branches.show();\n    Clones.el.set_title(\"Manage Clones\");\n\n     \n    \n    \n    \n\n       \n    \n    \n}"
+          "clicked" : "() => {\n/*\n    var rv = this.get('/reposView');\n    var rs = this.get('/reposStore');\n    if (rv.el.get_selection().count_selected_rows() != 1) {\n        //nothing?\n        // error condition.\n        return;\n    }\n    var Branches =     imports.Branches.Branches;\n    \n \n    var ret = {};       \n    var s = rv.el.get_selection();\n    var path = '';\n    s.selected_foreach(function(model,p,iter) {\n                                                    \n       path = model.get_value(iter, 6).value.get_string();\n     \n    }); \n\n    var repo = false;\n    rs.repos.forEach(function(r) {\n        if (r.repopath == path) {\n            repo = r;\n        \n        }\n    \n    });\n    Branches.repo = repo;\n    Branches.el.set_transient_for(Clones.el);\n    Clones.el.set_title(\"Manage Clones - \" + repo.repopath);\n    Branches.show();\n    Clones.el.set_title(\"Manage Clones\");\n\n     \n    \n    \n    \n\n       \n */   \n    \n}"
          },
          "label" : "Branches",
          "* pack" : "add",
@@ -53,7 +53,7 @@
         },
         {
          "listeners" : {
-          "clicked" : "function (self) {\n\n    var rv = this.get('/reposView');\n    var rs = this.get('/reposStore');\n    if (rv.el.get_selection().count_selected_rows() != 1) {\n        //nothing?\n        // error condition.\n        return;\n    }\n    var Merger =     imports.Merger.Merger;\n    \n \n    var ret = {};       \n    var s = rv.el.get_selection();\n    var path = '';\n    s.selected_foreach(function(model,p,iter) {\n                                                    \n       path = model.get_value(iter, 6).value.get_string();\n     \n    }); \n\n    var repo = false;\n    rs.repos.forEach(function(r) {\n        if (r.repopath == path) {\n            repo = r;\n        \n        }\n    \n    });\n    Merger.repo = repo;\n    Merger.el.set_transient_for(Clones.el);\n    Clones.el.set_title(\"Manage Clones - \" + repo.repopath);\n    Merger.show();\n    Clones.el.set_title(\"Manage Clones\");\n\n    \n    \n\n    \n\n    \n    \n    \n    \n\n       \n    \n    \n}"
+          "clicked" : "() {\n/*\n    var rv = this.get('/reposView');\n    var rs = this.get('/reposStore');\n    if (rv.el.get_selection().count_selected_rows() != 1) {\n        //nothing?\n        // error condition.\n        return;\n    }\n    var Merger =     imports.Merger.Merger;\n    \n \n    var ret = {};       \n    var s = rv.el.get_selection();\n    var path = '';\n    s.selected_foreach(function(model,p,iter) {\n                                                    \n       path = model.get_value(iter, 6).value.get_string();\n     \n    }); \n\n    var repo = false;\n    rs.repos.forEach(function(r) {\n        if (r.repopath == path) {\n            repo = r;\n        \n        }\n    \n    });\n    Merger.repo = repo;\n    Merger.el.set_transient_for(Clones.el);\n    Clones.el.set_title(\"Manage Clones - \" + repo.repopath);\n    Merger.show();\n    Clones.el.set_title(\"Manage Clones\");\n\n    \n    \n\n    \n\n    \n    \n    \n    \n\n */      \n    \n    \n}"
          },
          "label" : "Merge",
          "* pack" : "add",
@@ -62,7 +62,7 @@
         },
         {
          "listeners" : {
-          "clicked" : "function (self) {\n    \n    \n \n       \n    \n    \n}"
+          "clicked" : "() => {\n    \n    \n \n       \n    \n    \n}"
          },
          "label" : "Switch Branch",
          "* pack" : "add",
@@ -71,7 +71,7 @@
         },
         {
          "listeners" : {
-          "clicked" : "function (self) {\n    \n    \n \n       \n    \n    \n}"
+          "clicked" : "() => {\n    \n    \n \n       \n    \n    \n}"
          },
          "label" : "Pull",
          "* pack" : "add",
@@ -81,7 +81,7 @@
        ]
       },
       {
-       "* init" : "function() {\n    XObject.prototype.init.call(this);\n      this.el.set_policy (Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC)\n}\n",
+       "* init" : "() => {\n    XObject.prototype.init.call(this);\n      this.el.set_policy (Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC)\n}\n",
        "xtype" : "ScrolledWindow",
        "$ xns" : "Gtk",
        "items" : [
diff --git a/Clones.vala b/Clones.vala
index 72361442..782b61c4 100644
--- a/Clones.vala
+++ b/Clones.vala
@@ -162,9 +162,9 @@ public class Clones : Object
             this.el.label = "Remotes / Clones";
 
             //listeners
-            this.el.clicked.connect( function (self) {
+            this.el.clicked.connect( () => {
             
-                var rv = this.get('/reposView');
+            /*    var rv = this.get('/reposView');
                 var rs = this.get('/reposStore');
                 if (rv.el.get_selection().count_selected_rows() != 1) {
                     //nothing?
@@ -197,7 +197,7 @@ public class Clones : Object
                 Remotes.show();
                 Clones.el.set_title("Manage Clones");
             
-                 
+              */   
                 
                 
                 
@@ -231,8 +231,8 @@ public class Clones : Object
             this.el.label = "Branches";
 
             //listeners
-            this.el.clicked.connect( function (self) {
-            
+            this.el.clicked.connect( () => {
+            /*
                 var rv = this.get('/reposView');
                 var rs = this.get('/reposStore');
                 if (rv.el.get_selection().count_selected_rows() != 1) {
@@ -272,7 +272,7 @@ public class Clones : Object
                 
             
                    
-                
+             */   
                 
             });
         }
@@ -300,8 +300,8 @@ public class Clones : Object
             this.el.label = "Merge";
 
             //listeners
-            this.el.clicked.connect( function (self) {
-            
+            this.el.clicked.connect( () {
+            /*
                 var rv = this.get('/reposView');
                 var rs = this.get('/reposStore');
                 if (rv.el.get_selection().count_selected_rows() != 1) {
@@ -345,7 +345,7 @@ public class Clones : Object
                 
                 
             
-                   
+             */      
                 
                 
             });
@@ -374,7 +374,7 @@ public class Clones : Object
             this.el.label = "Switch Branch";
 
             //listeners
-            this.el.clicked.connect( function (self) {
+            this.el.clicked.connect( () => {
                 
                 
              
@@ -407,7 +407,7 @@ public class Clones : Object
             this.el.label = "Pull";
 
             //listeners
-            this.el.clicked.connect( function (self) {
+            this.el.clicked.connect( () => {
                 
                 
              
@@ -446,7 +446,7 @@ public class Clones : Object
 
             // init method
 
-            function() {
+            () => {
                 XObject.prototype.init.call(this);
                   this.el.set_policy (Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC)
             }