From: Alan Knowles Date: Tue, 18 Dec 2018 04:42:05 +0000 (+0800) Subject: NewBranch.bjs X-Git-Url: http://git.roojs.org/?p=gitlive;a=commitdiff_plain;h=3d38091713a408edce219267a0d13825051010e1 NewBranch.bjs NewBranch.vala --- diff --git a/NewBranch.bjs b/NewBranch.bjs index 5b199a74..09a1195b 100644 --- a/NewBranch.bjs +++ b/NewBranch.bjs @@ -214,7 +214,7 @@ "* 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, 300);\n\t} else {\n\t\t_this.scrolled_window.el.show();\n\t\t_this.el.resize(w, 800);\n\t}\n\t this.el.load_uri(\"http://www.google.com\");\n}\n" + "| 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 this.el.load_uri(\"https://roojs.com/admin.php/MTrack/View/\" + tid);\n}\n" } ] } diff --git a/NewBranch.vala b/NewBranch.vala index 62039370..e041745d 100644 --- a/NewBranch.vala +++ b/NewBranch.vala @@ -902,12 +902,12 @@ public class NewBranch : Object if (tid == "") { _this.scrolled_window.el.hide(); - _this.el.resize(w, 300); + _this.el.resize(w, 150); } else { _this.scrolled_window.el.show(); _this.el.resize(w, 800); } - this.el.load_uri("http://www.google.com"); + this.el.load_uri("https://roojs.com/admin.php/MTrack/View/" + tid); } }