Merge pull request #1926 from jeffslofish/issue-1508

RaymondLim · RaymondLim · commit 23c03af4e72c · 2012-10-25T11:16:12.000-07:00
Issue 1508
diff --git a/src/extensions/default/RecentProjects/main.js b/src/extensions/default/RecentProjects/main.js
@@ -86,15 +86,15 @@ define(function (require, exports, module) {
             lastSlash = path.slice(0, path.length - 1).lastIndexOf("/");
         }
         if (lastSlash >= 0) {
-            rest = path.slice(0, lastSlash);
+            rest = rest = " - " + (lastSlash ? path.slice(0, lastSlash) : "/");
             folder = path.slice(lastSlash + 1);
         } else {
-            rest = "";
+            rest = "/";
             folder = path;
         }
         
         var folderSpan = $("<span></span>").addClass("recent-folder").text(folder),
-            restSpan = $("<span></span>").addClass("recent-folder-path").text(" - " + rest);
+            restSpan = $("<span></span>").addClass("recent-folder-path").text(rest);
         return $("<a></a>").addClass("recent-folder-link").append(folderSpan).append(restSpan).data("path", path);
     }
   
diff --git a/src/project/SidebarView.js b/src/project/SidebarView.js
@@ -57,8 +57,15 @@ define(function (require, exports, module) {
      * Update project title when the project root changes
      */
     function _updateProjectTitle() {
-        $projectTitle.html(ProjectManager.getProjectRoot().name);
-        $projectTitle.attr("title", ProjectManager.getProjectRoot().fullPath);
+        var displayName = ProjectManager.getProjectRoot().name;
+        var fullPath = ProjectManager.getProjectRoot().fullPath;
+        
+        if (displayName === "" && fullPath === "/") {
+            displayName = "/";
+        }
+        
+        $projectTitle.html(displayName);
+        $projectTitle.attr("title", fullPath);
     }
     
     /**

Original file line number	Diff line number	Diff line change
`@@ -86,15 +86,15 @@ define(function (require, exports, module) {`
`86`	`86`	`lastSlash = path.slice(0, path.length - 1).lastIndexOf("/");`
`87`	`87`	`}`
`88`	`88`	`if (lastSlash >= 0) {`
`89`		`- rest = path.slice(0, lastSlash);`
	`89`	`+ rest = rest = " - " + (lastSlash ? path.slice(0, lastSlash) : "/");`
`90`	`90`	`folder = path.slice(lastSlash + 1);`
`91`	`91`	`} else {`
`92`		`- rest = "";`
	`92`	`+ rest = "/";`
`93`	`93`	`folder = path;`
`94`	`94`	`}`
`95`	`95`
`96`	`96`	`var folderSpan = $("<span></span>").addClass("recent-folder").text(folder),`
`97`		`- restSpan = $("<span></span>").addClass("recent-folder-path").text(" - " + rest);`
	`97`	`+ restSpan = $("<span></span>").addClass("recent-folder-path").text(rest);`
`98`	`98`	`return $("<a></a>").addClass("recent-folder-link").append(folderSpan).append(restSpan).data("path", path);`
`99`	`99`	`}`
`100`	`100`