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
iv
gitlab-ce
Commits
c254cb03
Commit
c254cb03
authored
Feb 25, 2015
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix affix for issue and merge request with image in description
parent
e993b59b
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
10 deletions
+12
-10
app/assets/javascripts/issue.js.coffee
app/assets/javascripts/issue.js.coffee
+6
-5
app/assets/javascripts/merge_request.js.coffee
app/assets/javascripts/merge_request.js.coffee
+6
-5
No files found.
app/assets/javascripts/issue.js.coffee
View file @
c254cb03
...
@@ -16,6 +16,7 @@ class @Issue
...
@@ -16,6 +16,7 @@ class @Issue
updateTaskState
updateTaskState
)
)
$
(
'.issue-details'
).
waitForImages
->
$
(
'.issuable-affix'
).
affix
offset
:
$
(
'.issuable-affix'
).
affix
offset
:
top
:
->
top
:
->
@
top
=
$
(
'.issue-details'
).
outerHeight
(
true
)
+
25
@
top
=
$
(
'.issue-details'
).
outerHeight
(
true
)
+
25
...
...
app/assets/javascripts/merge_request.js.coffee
View file @
c254cb03
...
@@ -20,9 +20,10 @@ class @MergeRequest
...
@@ -20,9 +20,10 @@ class @MergeRequest
if
$
(
"a.btn-close"
).
length
if
$
(
"a.btn-close"
).
length
$
(
"li.task-list-item input:checkbox"
).
prop
(
"disabled"
,
false
)
$
(
"li.task-list-item input:checkbox"
).
prop
(
"disabled"
,
false
)
$
(
'.merge-request-details'
).
waitForImages
->
$
(
'.issuable-affix'
).
affix
offset
:
$
(
'.issuable-affix'
).
affix
offset
:
top
:
->
top
:
->
@
top
=
$
(
'.merge-request-details'
).
outerHeight
(
true
)
+
70
@
top
=
$
(
'.merge-request-details'
).
outerHeight
(
true
)
+
91
bottom
:
->
bottom
:
->
@
bottom
=
$
(
'.footer'
).
outerHeight
(
true
)
@
bottom
=
$
(
'.footer'
).
outerHeight
(
true
)
...
...
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