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
Jérome Perrin
gitlab-ce
Commits
62ef763a
Commit
62ef763a
authored
Mar 26, 2013
by
Sato Hiroyuki
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Refector: clean up code.
parent
6e152848
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
13 deletions
+9
-13
app/assets/javascripts/branch-graph.js.coffee
app/assets/javascripts/branch-graph.js.coffee
+9
-13
No files found.
app/assets/javascripts/branch-graph.js.coffee
View file @
62ef763a
...
@@ -131,7 +131,7 @@ class BranchGraph
...
@@ -131,7 +131,7 @@ class BranchGraph
shortrefs
=
refs
shortrefs
=
refs
# Truncate if longer than 15 chars
# Truncate if longer than 15 chars
shortrefs
=
shortrefs
.
substr
(
0
,
15
)
+
"…"
if
shortrefs
.
length
>
17
shortrefs
=
shortrefs
.
substr
(
0
,
15
)
+
"…"
if
shortrefs
.
length
>
17
text
=
r
.
text
(
x
+
8
,
y
,
shortrefs
).
attr
(
text
=
r
.
text
(
x
+
4
,
y
,
shortrefs
).
attr
(
"text-anchor"
:
"start"
"text-anchor"
:
"start"
font
:
"10px Monaco, monospace"
font
:
"10px Monaco, monospace"
fill
:
"#FFF"
fill
:
"#FFF"
...
@@ -139,7 +139,7 @@ class BranchGraph
...
@@ -139,7 +139,7 @@ class BranchGraph
)
)
textbox
=
text
.
getBBox
()
textbox
=
text
.
getBBox
()
# Create rectangle based on the size of the textbox
# Create rectangle based on the size of the textbox
rect
=
r
.
rect
(
x
,
y
-
7
,
textbox
.
width
+
1
5
,
textbox
.
height
+
5
,
4
).
attr
(
rect
=
r
.
rect
(
x
,
y
-
7
,
textbox
.
width
+
5
,
textbox
.
height
+
5
,
4
).
attr
(
fill
:
"#000"
fill
:
"#000"
"fill-opacity"
:
.
5
"fill-opacity"
:
.
5
stroke
:
"none"
stroke
:
"none"
...
@@ -206,22 +206,19 @@ class BranchGraph
...
@@ -206,22 +206,19 @@ class BranchGraph
# Build line shape
# Build line shape
if
parent
[
1
]
is
commit
.
space
if
parent
[
1
]
is
commit
.
space
d1
=
[
0
,
5
]
offset
=
[
0
,
5
]
d2
=
[
0
,
10
]
arrow
=
"l-2,5,4,0,-2,-5,0,5"
arrow
=
"l-2,5,4,0,-2,-5"
else
if
parent
[
1
]
<
commit
.
space
else
if
parent
[
1
]
<
commit
.
space
d1
=
[
3
,
3
]
offset
=
[
3
,
3
]
d2
=
[
7
,
5
]
arrow
=
"l5,0,-2,4,-3,-4,4,2"
arrow
=
"l5,0,-2,4,-3,-4"
else
else
d1
=
[
-
3
,
3
]
offset
=
[
-
3
,
3
]
d2
=
[
-
7
,
5
]
arrow
=
"l-5,0,2,4,3,-4,-4,2"
arrow
=
"l-5,0,2,4,3,-4"
# Start point
# Start point
route
=
[
"M"
,
x
+
d1
[
0
],
y
+
d1
[
1
]]
route
=
[
"M"
,
x
+
offset
[
0
],
y
+
offset
[
1
]]
# Add arrow if not first parent
# Add arrow if not first parent
if
i
>
0
if
i
>
0
...
@@ -230,7 +227,6 @@ class BranchGraph
...
@@ -230,7 +227,6 @@ class BranchGraph
# Circumvent if overlap
# Circumvent if overlap
if
commit
.
space
isnt
parentCommit
.
space
or
commit
.
space
isnt
parent
[
1
]
if
commit
.
space
isnt
parentCommit
.
space
or
commit
.
space
isnt
parent
[
1
]
route
.
push
(
route
.
push
(
"L"
,
x
+
d2
[
0
],
y
+
d2
[
1
],
"L"
,
parentX2
,
y
+
10
,
"L"
,
parentX2
,
y
+
10
,
"L"
,
parentX2
,
parentY
-
5
,
"L"
,
parentX2
,
parentY
-
5
,
)
)
...
...
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