From d970a2e3428bdf4802fdc4ee018926981de82547 Mon Sep 17 00:00:00 2001
From: Liang Ding <dl88250@gmail.com>
Date: Fri, 5 Dec 2014 15:08:44 +0800
Subject: [PATCH] #176

---
 file/files.go     | 16 ++++++++++++++++
 static/js/tree.js |  8 +++++++-
 views/index.html  |  4 ++--
 3 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/file/files.go b/file/files.go
index e1de152..d0a7823 100644
--- a/file/files.go
+++ b/file/files.go
@@ -391,7 +391,23 @@ func SearchText(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
+	sid := args["sid"].(string)
+	wSession := session.WideSessions.Get(sid)
+	if nil == wSession {
+		data["succ"] = false
+
+		return
+	}
+
+	// XXX: just one directory
+
 	dir := args["dir"].(string)
+	if "" == dir {
+		userWorkspace := conf.Wide.GetUserWorkspace(wSession.Username)
+		workspaces := filepath.SplitList(userWorkspace)
+		dir = workspaces[0]
+	}
+
 	extension := args["extension"].(string)
 	text := args["text"].(string)
 
diff --git a/static/js/tree.js b/static/js/tree.js
index 9f43fbd..ab4feb6 100644
--- a/static/js/tree.js
+++ b/static/js/tree.js
@@ -382,7 +382,13 @@ var tree = {
             },
             "ok": function () {
                 var request = newWideRequest();
-                request.dir = wide.curNode.path;
+
+                if (!wide.curNode) {
+                    request.dir = "";
+                } else {
+                    request.dir = wide.curNode.path;
+                }
+
                 request.text = $("#dialogSearchForm > input:eq(0)").val();
                 request.extension = $("#dialogSearchForm > input:eq(1)").val();
 
diff --git a/views/index.html b/views/index.html
index 72d2253..d534d07 100644
--- a/views/index.html
+++ b/views/index.html
@@ -130,11 +130,11 @@
                     <span>{{.i18n.find}}</span>
                     <div class="frame">
                         <ul>     
-                            <li onclick="alert('Dev In Progress')">
+                            <li onclick="$('#dialogGoFilePrompt').dialog('open')">
                                 <span>{{.i18n.goto_file}}</span>
                             </li>
                             <li class="hr"></li>
-                            <li onclick="alert('Dev In Progress')">
+                            <li onclick="$('#dialogSearchForm').dialog('open')">
                                 <span>{{.i18n.find_in_files}}</span>
                             </li>
                             <li class="hr"></li>