Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Tatuya Kamada
gitlab-ce
Commits
f50cb7fc
Commit
f50cb7fc
authored
11 years ago
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add keyboard nav for tree view. Refactor tree-view coffee
parent
1dd80d22
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
75 additions
and
25 deletions
+75
-25
app/assets/javascripts/blob.js.coffee
app/assets/javascripts/blob.js.coffee
+24
-0
app/assets/javascripts/dispatcher.js.coffee
app/assets/javascripts/dispatcher.js.coffee
+4
-0
app/assets/javascripts/tree.js.coffee
app/assets/javascripts/tree.js.coffee
+39
-25
app/assets/stylesheets/sections/tree.scss
app/assets/stylesheets/sections/tree.scss
+8
-0
No files found.
app/assets/javascripts/blob.js.coffee
0 → 100644
View file @
f50cb7fc
class
BlobView
constructor
:
->
# See if there are lines selected
# "#L12" and "#L34-56" supported
highlightBlobLines
=
->
if
window
.
location
.
hash
isnt
""
matches
=
window
.
location
.
hash
.
match
(
/\#L(\d+)(\-(\d+))?/
)
first_line
=
parseInt
(
matches
?
[
1
])
last_line
=
parseInt
(
matches
?
[
3
])
unless
isNaN
first_line
last_line
=
first_line
if
isNaN
(
last_line
)
$
(
"#tree-content-holder .highlight .line"
).
removeClass
(
"hll"
)
$
(
"#LC
#{
line
}
"
).
addClass
(
"hll"
)
for
line
in
[
first_line
..
last_line
]
$
(
"#L
#{
first_line
}
"
).
ScrollTo
()
# Highlight the correct lines on load
highlightBlobLines
()
# Highlight the correct lines when the hash part of the URL changes
$
(
window
).
on
'hashchange'
,
highlightBlobLines
@
BlobView
=
BlobView
This diff is collapsed.
Click to expand it.
app/assets/javascripts/dispatcher.js.coffee
View file @
f50cb7fc
...
...
@@ -32,6 +32,10 @@ class Dispatcher
new
TeamMembers
()
when
'groups:people'
new
GroupMembers
()
when
'projects:tree:show'
new
TreeView
()
when
'projects:blob:show'
new
BlobView
()
switch
path
.
first
()
when
'admin'
then
new
Admin
()
...
...
This diff is collapsed.
Click to expand it.
app/assets/javascripts/tree.js.coffee
View file @
f50cb7fc
# Code browser tree slider
# Make the entire tree-item row clickable, but not if clicking another link (like a commit message)
$
(
".tree-content-holder .tree-item"
).
live
'click'
,
(
e
)
->
if
(
e
.
target
.
nodeName
!=
"A"
)
path
=
$
(
'.tree-item-file-name a'
,
this
).
attr
(
'href'
)
Turbolinks
.
visit
(
path
)
class
TreeView
constructor
:
->
@
initKeyNav
()
$
->
# Show the "Loading commit data" for only the first element
$
(
'span.log_loading:first'
).
removeClass
(
'hide'
)
# Code browser tree slider
# Make the entire tree-item row clickable, but not if clicking another link (like a commit message)
$
(
".tree-content-holder .tree-item"
).
on
'click'
,
(
e
)
->
if
(
e
.
target
.
nodeName
!=
"A"
)
path
=
$
(
'.tree-item-file-name a'
,
this
).
attr
(
'href'
)
Turbolinks
.
visit
(
path
)
# See if there are lines selected
# "#L12" and "#L34-56" supported
highlightBlobLines
=
->
if
window
.
location
.
hash
isnt
""
matches
=
window
.
location
.
hash
.
match
(
/\#L(\d+)(\-(\d+))?/
)
first_line
=
parseInt
(
matches
?
[
1
])
last_line
=
parseInt
(
matches
?
[
3
])
# Show the "Loading commit data" for only the first element
$
(
'span.log_loading:first'
).
removeClass
(
'hide'
)
unless
isNaN
first_line
last_line
=
first_line
if
isNaN
(
last_line
)
$
(
"#tree-content-holder .highlight .line"
).
removeClass
(
"hll"
)
$
(
"#LC
#{
line
}
"
).
addClass
(
"hll"
)
for
line
in
[
first_line
..
last_line
]
$
(
"#L
#{
first_line
}
"
).
ScrollTo
()
initKeyNav
:
->
li
=
$
(
"tr.tree-item"
)
liSelected
=
null
$
(
'body'
).
keydown
(
e
)
->
if
e
.
which
is
40
if
liSelected
next
=
liSelected
.
next
()
if
next
.
length
>
0
liSelected
.
removeClass
"selected"
liSelected
=
next
.
addClass
(
"selected"
)
else
liSelected
=
li
.
eq
(
0
).
addClass
(
"selected"
)
# Highlight the correct lines on load
highlightBlobLines
()
# Highlight the correct lines when the hash part of the URL changes
$
(
window
).
on
'hashchange'
,
highlightBlobLines
$
(
liSelected
).
focus
()
else
if
e
.
which
is
38
if
liSelected
next
=
liSelected
.
prev
()
if
next
.
length
>
0
liSelected
.
removeClass
"selected"
liSelected
=
next
.
addClass
(
"selected"
)
else
liSelected
=
li
.
last
().
addClass
(
"selected"
)
$
(
liSelected
).
focus
()
else
if
e
.
which
is
13
path
=
$
(
'.tree-item.selected .tree-item-file-name a'
).
attr
(
'href'
)
Turbolinks
.
visit
(
path
)
@
TreeView
=
TreeView
This diff is collapsed.
Click to expand it.
app/assets/stylesheets/sections/tree.scss
View file @
f50cb7fc
...
...
@@ -23,6 +23,14 @@
}
cursor
:
pointer
;
}
&
.selected
{
td
{
background
:
$hover
;
border-top
:
1px
solid
#ADF
;
border-bottom
:
1px
solid
#ADF
;
}
}
}
}
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment