mirror of
https://github.com/atom/atom.git
synced 2026-01-24 22:38:20 -05:00
Show octicon for project's that are repos
This commit is contained in:
@@ -20,8 +20,7 @@ class Git
|
||||
|
||||
getWorkingDirectory: ->
|
||||
repoPath = @getPath()
|
||||
if repoPath
|
||||
repoPath.substring(0, repoPath.length - 5)
|
||||
repoPath?.substring(0, repoPath.length - 6)
|
||||
|
||||
getHead: ->
|
||||
@repo.getHead() or ''
|
||||
@@ -48,7 +47,7 @@ class Git
|
||||
|
||||
relativize: (path) ->
|
||||
workingDirectory = @getWorkingDirectory()
|
||||
if workingDirectory and path.indexOf(workingDirectory) is 0
|
||||
if workingDirectory and path.indexOf("#{workingDirectory}/") is 0
|
||||
path.substring(workingDirectory.length)
|
||||
else
|
||||
path
|
||||
@@ -65,5 +64,4 @@ class Git
|
||||
@repo.checkoutHead(@relativize(path))
|
||||
|
||||
getDiffStats: (path) ->
|
||||
stats = @repo.getDiffStats(@relativize(path))
|
||||
stats or {'added': 0, 'deleted': 0}
|
||||
@repo.getDiffStats(@relativize(path)) or added: 0, deleted: 0
|
||||
|
||||
@@ -21,7 +21,18 @@ class DirectoryView extends View
|
||||
initialize: ({@directory, isExpanded, @project, parent} = {}) ->
|
||||
@expand() if isExpanded
|
||||
@disclosureArrow.on 'click', => @toggleExpansion()
|
||||
@directoryName.addClass('ignored') if @project.repo.isPathIgnored(@directory.getPath())
|
||||
|
||||
repo = @project.repo
|
||||
if repo?
|
||||
path = @directory.getPath()
|
||||
@directoryName.addClass('ignored') if repo.isPathIgnored(path)
|
||||
console.log path, repo.getWorkingDirectory()
|
||||
if path is repo.getWorkingDirectory()
|
||||
@directoryName.addClass('repository-icon')
|
||||
else
|
||||
@directoryName.addClass('directory-icon')
|
||||
else
|
||||
@directoryName.addClass('directory-icon')
|
||||
|
||||
getPath: ->
|
||||
@directory.path
|
||||
|
||||
@@ -128,11 +128,17 @@
|
||||
-webkit-font-smoothing: antialiased;
|
||||
}
|
||||
|
||||
.tree-view .directory .header .name:before {
|
||||
.tree-view .directory .header .directory-icon:before {
|
||||
content: "\f016";
|
||||
top: -5px;
|
||||
}
|
||||
|
||||
.tree-view .directory .header .repository-icon:before {
|
||||
content: "\f001";
|
||||
top: -4px;
|
||||
}
|
||||
|
||||
|
||||
.tree-view .file .text-name:before {
|
||||
content: "\f011";
|
||||
top: -2px;
|
||||
|
||||
Reference in New Issue
Block a user