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
bd411675
Commit
bd411675
authored
Mar 10, 2016
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixes issue with issue sidebar toggle button not working
Closes #14195
parent
26541240
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
8 additions
and
9 deletions
+8
-9
app/assets/javascripts/application.js.coffee
app/assets/javascripts/application.js.coffee
+4
-4
app/assets/javascripts/merge_request_tabs.js.coffee
app/assets/javascripts/merge_request_tabs.js.coffee
+1
-2
app/views/projects/issues/show.html.haml
app/views/projects/issues/show.html.haml
+1
-1
app/views/projects/merge_requests/show/_mr_title.html.haml
app/views/projects/merge_requests/show/_mr_title.html.haml
+1
-1
app/views/shared/issuable/_sidebar.html.haml
app/views/shared/issuable/_sidebar.html.haml
+1
-1
No files found.
app/assets/javascripts/application.js.coffee
View file @
bd411675
...
@@ -220,17 +220,17 @@ $ ->
...
@@ -220,17 +220,17 @@ $ ->
.
off
'breakpoint:change'
.
off
'breakpoint:change'
.
on
'breakpoint:change'
,
(
e
,
breakpoint
)
->
.
on
'breakpoint:change'
,
(
e
,
breakpoint
)
->
if
breakpoint
is
'sm'
or
breakpoint
is
'xs'
if
breakpoint
is
'sm'
or
breakpoint
is
'xs'
$gutterIcon
=
$
(
'
aside .gutte
r-toggle'
).
find
(
'i'
)
$gutterIcon
=
$
(
'
.js-sideba
r-toggle'
).
find
(
'i'
)
if
$gutterIcon
.
hasClass
(
'fa-angle-double-right'
)
if
$gutterIcon
.
hasClass
(
'fa-angle-double-right'
)
$gutterIcon
.
closest
(
'a'
).
trigger
(
'click'
)
$gutterIcon
.
closest
(
'a'
).
trigger
(
'click'
)
$
(
document
)
$
(
document
)
.
off
'click'
,
'
aside .gutte
r-toggle'
.
off
'click'
,
'
.js-sideba
r-toggle'
.
on
'click'
,
'
aside .gutte
r-toggle'
,
(
e
,
triggered
)
->
.
on
'click'
,
'
.js-sideba
r-toggle'
,
(
e
,
triggered
)
->
e
.
preventDefault
()
e
.
preventDefault
()
$this
=
$
(
this
)
$this
=
$
(
this
)
$thisIcon
=
$this
.
find
'i'
$thisIcon
=
$this
.
find
'i'
$allGutterToggleIcons
=
$
(
'.
gutte
r-toggle i'
)
$allGutterToggleIcons
=
$
(
'.
js-sideba
r-toggle i'
)
if
$thisIcon
.
hasClass
(
'fa-angle-double-right'
)
if
$thisIcon
.
hasClass
(
'fa-angle-double-right'
)
$allGutterToggleIcons
$allGutterToggleIcons
.
removeClass
(
'fa-angle-double-right'
)
.
removeClass
(
'fa-angle-double-right'
)
...
...
app/assets/javascripts/merge_request_tabs.js.coffee
View file @
bd411675
...
@@ -189,7 +189,7 @@ class @MergeRequestTabs
...
@@ -189,7 +189,7 @@ class @MergeRequestTabs
$
(
'.container-fluid'
).
removeClass
(
'container-limited'
)
$
(
'.container-fluid'
).
removeClass
(
'container-limited'
)
shrinkView
:
->
shrinkView
:
->
$gutterIcon
=
$
(
'.
gutte
r-toggle i'
)
$gutterIcon
=
$
(
'.
js-sideba
r-toggle i'
)
# Wait until listeners are set
# Wait until listeners are set
setTimeout
(
->
setTimeout
(
->
...
@@ -197,4 +197,3 @@ class @MergeRequestTabs
...
@@ -197,4 +197,3 @@ class @MergeRequestTabs
if
$gutterIcon
.
is
(
'.fa-angle-double-right'
)
if
$gutterIcon
.
is
(
'.fa-angle-double-right'
)
$gutterIcon
.
closest
(
'a'
).
trigger
(
'click'
,[
true
])
$gutterIcon
.
closest
(
'a'
).
trigger
(
'click'
,[
true
])
,
0
)
,
0
)
app/views/projects/issues/show.html.haml
View file @
bd411675
...
@@ -18,7 +18,7 @@
...
@@ -18,7 +18,7 @@
%span
.hidden-sm.hidden-md.hidden-lg
%span
.hidden-sm.hidden-md.hidden-lg
=
icon
(
'circle-o'
)
=
icon
(
'circle-o'
)
%a
.btn.btn-default.pull-right.
hidden-sm.hidden-md.hidden-lg.gutte
r-toggle
{
href:
"#"
}
%a
.btn.btn-default.pull-right.
visible-xs.gutter-toggle.js-sideba
r-toggle
{
href:
"#"
}
=
icon
(
'angle-double-left'
)
=
icon
(
'angle-double-left'
)
.issue-meta
.issue-meta
...
...
app/views/projects/merge_requests/show/_mr_title.html.haml
View file @
bd411675
...
@@ -4,7 +4,7 @@
...
@@ -4,7 +4,7 @@
=
@merge_request
.
state_human_name
=
@merge_request
.
state_human_name
%span
.hidden-sm.hidden-md.hidden-lg
%span
.hidden-sm.hidden-md.hidden-lg
=
icon
(
@merge_request
.
state_icon_name
)
=
icon
(
@merge_request
.
state_icon_name
)
%a
.btn.btn-default.pull-right.
hidden-sm.hidden-md.hidden-lg.gutte
r-toggle
{
href:
"#"
}
%a
.btn.btn-default.pull-right.
visible-xs.gutter-toggle.js-sideba
r-toggle
{
href:
"#"
}
=
icon
(
'angle-double-left'
)
=
icon
(
'angle-double-left'
)
.issue-meta
.issue-meta
%strong
.identifier
%strong
.identifier
...
...
app/views/shared/issuable/_sidebar.html.haml
View file @
bd411675
...
@@ -6,7 +6,7 @@
...
@@ -6,7 +6,7 @@
of
of
=
issuables_count
(
issuable
)
=
issuables_count
(
issuable
)
%span
.pull-right
%span
.pull-right
%a
.gutter-toggle
{
href:
'#'
}
%a
.gutter-toggle
.js-sidebar-toggle
{
href:
'#'
}
=
sidebar_gutter_toggle_icon
=
sidebar_gutter_toggle_icon
.issuable-nav.hide-collapsed.pull-right.btn-group
{
role:
'group'
,
"aria-label"
=>
'...'
}
.issuable-nav.hide-collapsed.pull-right.btn-group
{
role:
'group'
,
"aria-label"
=>
'...'
}
-
if
prev_issuable
=
prev_issuable_for
(
issuable
)
-
if
prev_issuable
=
prev_issuable_for
(
issuable
)
...
...
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