X-Git-Url: http://git.roojs.org/?p=gitlive;a=blobdiff_plain;f=NewBranch.bjs;h=b78ded868992c48e67a6e668012e923b35c3edde;hp=d37d1a9fb7888d5ac968d7ba307a353faef6efd1;hb=48f4485e50c79bf7c1db5f11f3631ac9e730251a;hpb=30454f0fc1f043702f3b6690f1062acef7034a31

diff --git a/NewBranch.bjs b/NewBranch.bjs
index d37d1a9f..b78ded86 100644
--- a/NewBranch.bjs
+++ b/NewBranch.bjs
@@ -28,27 +28,7 @@
      "xtype" : "Box",
      "$ pack" : "get_content_area().add",
      "$ xns" : "Gtk",
-     "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"
-        }
-       ]
-      }
-     ]
+     "Gtk.Orientation orientation" : "Gtk.Orientation.VERTICAL"
     },
     {
      "* pack" : "add",
@@ -255,6 +235,24 @@
            ]
           }
          ]
+        },
+        {
+         "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"
+          }
+         ]
         }
        ]
       },