MergeBranch.bjs

[gitlive] / MergeBranch.bjs

diff --git a/MergeBranch.bjs b/MergeBranch.bjs
index 802da43..9282dcf 100644 (file)
--- a/MergeBranch.bjs
+++ b/MergeBranch.bjs
@@ -163,10 +163,30 @@
          "xtype" : "Box",
          "gboolean homogeneous" : false,
          "$ xns" : "Gtk",
-         "Gtk.Orientation orientation" : "Gtk.Orientation.VERTICAL"
+         "Gtk.Orientation orientation" : "Gtk.Orientation.VERTICAL",
+         "items" : [
+          {
+           "int height_request" : 500,
+           "id" : "scrolled_window",
+           "* init" : "{\n\tthis.el.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC);\n}\n",
+           "* pack" : "add",
+           "xtype" : "ScrolledWindow",
+           "$ xns" : "Gtk",
+           "bool vexpand" : true,
+           "items" : [
+            {
+             "id" : "view",
+             "* pack" : "add",
+             "xtype" : "WebView",
+             "$ xns" : "WebKit",
+             "| void loadTicket" : "(string tid) {\n\tint h,w;\n\t_this.el.get_size(out w, out h);\n\t\n\tif (tid == \"\") {\n\t\t_this.scrolled_window.el.hide();\n\t\t_this.el.resize(w, 150);\n\t} else {\n\t\t_this.scrolled_window.el.show();\n\t\t_this.el.resize(w, 800);\n\t}\n\t\n\tvar rs =  RooTicket.singleton();\t\t\n\tvar uri = new WebKit.URIRequest(\"https://roojs.com/admin.php/MTrack/View/\" + tid);\n\tvar hd = uri.get_http_headers();\n\tvar authCode = Base64.encode (\"%s:%s\".printf(rs.username, rs.password).data);\n\thd.append(\"Authorization\", \"Basic %s\".printf(authCode));\n\t\n\t this.el.load_request(uri);\n}\n"
+            }
+           ]
+          }
+         ]
         },
         {
-         "* pack" : "append_page,_this.label_status.el",
+         "* pack" : "append_page,_this.label_ticket.el",
          "xtype" : "Box",
          "gboolean homogeneous" : false,
          "$ xns" : "Gtk",
@@ -174,24 +194,6 @@
         }
        ]
       },
-      {
-       "int height_request" : 500,
-       "id" : "scrolled_window",
-       "* init" : "{\n\tthis.el.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC);\n}\n",
-       "* pack" : "add",
-       "xtype" : "ScrolledWindow",
-       "$ xns" : "Gtk",
-       "bool vexpand" : true,
-       "items" : [
-        {
-         "id" : "view",
-         "* pack" : "add",
-         "xtype" : "WebView",
-         "$ xns" : "WebKit",
-         "| void loadTicket" : "(string tid) {\n\tint h,w;\n\t_this.el.get_size(out w, out h);\n\t\n\tif (tid == \"\") {\n\t\t_this.scrolled_window.el.hide();\n\t\t_this.el.resize(w, 150);\n\t} else {\n\t\t_this.scrolled_window.el.show();\n\t\t_this.el.resize(w, 800);\n\t}\n\t\n\tvar rs =  RooTicket.singleton();\t\t\n\tvar uri = new WebKit.URIRequest(\"https://roojs.com/admin.php/MTrack/View/\" + tid);\n\tvar hd = uri.get_http_headers();\n\tvar authCode = Base64.encode (\"%s:%s\".printf(rs.username, rs.password).data);\n\thd.append(\"Authorization\", \"Basic %s\".printf(authCode));\n\t\n\t this.el.load_request(uri);\n}\n"
-        }
-       ]
-      },
       {
        "id" : "spinner",
        "bool hexpand" : true,