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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
599e554a
Commit
599e554a
authored
Feb 02, 2016
by
Jacob Schatz
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Sidebar works after sidebar ajax calls.
parent
d87e317b
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
10 additions
and
9 deletions
+10
-9
app/assets/javascripts/application.js.coffee
app/assets/javascripts/application.js.coffee
+1
-1
app/assets/javascripts/issuable_context.js.coffee
app/assets/javascripts/issuable_context.js.coffee
+1
-1
app/assets/stylesheets/pages/issuable.scss
app/assets/stylesheets/pages/issuable.scss
+2
-1
app/views/projects/issues/update.js.haml
app/views/projects/issues/update.js.haml
+3
-3
app/views/projects/merge_requests/update.js.haml
app/views/projects/merge_requests/update.js.haml
+2
-2
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 @
599e554a
...
...
@@ -212,7 +212,7 @@ $ ->
$this
=
$
(
this
)
$this
.
attr
'value'
,
$this
.
val
()
$
(
'.right-sidebar'
).
on
'click'
,
'
.gutter-toggle'
,
(
e
)
->
$
(
document
).
on
'click'
,
'aside
.gutter-toggle'
,
(
e
)
->
e
.
preventDefault
()
$this
=
$
(
this
)
$thisIcon
=
$this
.
find
'i'
...
...
app/assets/javascripts/issuable_context.js.coffee
View file @
599e554a
...
...
@@ -10,7 +10,7 @@ class @IssuableContext
$
(
".issuable-sidebar .inline-update"
).
on
"change"
,
".js-assignee"
,
->
$
(
this
).
submit
()
$
(
".edit-link"
).
click
(
e
)
->
$
(
document
).
on
"click"
,
".edit-link"
,
(
e
)
->
block
=
$
(
@
).
parents
(
'.block'
)
block
.
find
(
'.selectbox'
).
show
()
block
.
find
(
'.value'
).
hide
()
...
...
app/assets/stylesheets/pages/issuable.scss
View file @
599e554a
...
...
@@ -97,7 +97,7 @@
.gutter-toggle
{
margin-left
:
10px
;
border-left
:
1px
solid
#F0F0F0
;
border-left
:
1px
solid
$border-gray-light
;
padding-left
:
10px
;
}
}
...
...
@@ -221,6 +221,7 @@
text-align
:
center
;
margin-left
:
-19px
;
padding-bottom
:
10px
;
color
:
#999999
;
span
{
display
:
block
;
...
...
app/views/projects/issues/update.js.haml
View file @
599e554a
$('
.issuable-sidebar'
).html("
#{
escape_javascript
(
render
'shared/issuable/sidebar'
,
issuable:
@issue
)
}
");
$('
.issuable-sidebar').parent(
).effect('highlight')
$('
aside.right-sidebar').parent(
).html("
#{
escape_javascript
(
render
'shared/issuable/sidebar'
,
issuable:
@issue
)
}
");
$('
aside.right-sidebar'
).effect('highlight')
new Issue();
\ No newline at end of file
app/views/projects/merge_requests/update.js.haml
View file @
599e554a
$('
.issuable-sidebar').html("
#{
escape_javascript
(
render
'shared/issuable/sidebar'
,
issuable:
@merge_request
)
}
")
;
$('
.issuable-sidebar').parent(
).effect('highlight')
$('
aside.right-sidebar')[0].outerHTML= "
#{
escape_javascript
(
render
'shared/issuable/sidebar'
,
issuable:
@merge_request
)
}
"
;
$('
aside.right-sidebar'
).effect('highlight')
merge_request = new MergeRequest();
app/views/shared/issuable/_sidebar.html.haml
View file @
599e554a
...
...
@@ -23,7 +23,7 @@
%a
.btn.btn-default.disabled
{
href:
'#'
}
Next
=
form_for
[
@project
.
namespace
.
becomes
(
Namespace
),
@project
,
issuable
],
remote:
true
,
html:
{
class:
'issuable-context-form inline-update js-issuable-update'
,
'data-type'
=>
'json'
}
do
|
f
|
=
form_for
[
@project
.
namespace
.
becomes
(
Namespace
),
@project
,
issuable
],
remote:
true
,
html:
{
class:
'issuable-context-form inline-update js-issuable-update'
}
do
|
f
|
.block.assignee
.sidebar-collapsed-icon
-
if
issuable
.
assignee
...
...
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