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
Kazuhiko Shiozaki
gitlab-ce
Commits
46b56fc7
Commit
46b56fc7
authored
Jan 13, 2016
by
Jacob Schatz
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
initial fix
parent
12023557
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
5 deletions
+12
-5
app/assets/javascripts/issuable_context.js.coffee
app/assets/javascripts/issuable_context.js.coffee
+10
-1
app/assets/javascripts/issue.js.coffee
app/assets/javascripts/issue.js.coffee
+0
-1
app/assets/javascripts/merge_request.js.coffee
app/assets/javascripts/merge_request.js.coffee
+2
-3
No files found.
app/assets/javascripts/issuable_context.js.coffee
View file @
46b56fc7
...
...
@@ -15,7 +15,16 @@ class @IssuableContext
$
(
@
).
width
(
$
(
@
).
outerWidth
())
.
on
'affixed-top.bs.affix affixed-bottom.bs.affix'
,
->
$
(
@
).
width
(
''
)
$discussion
=
$
(
'.issuable-discussion'
)
$sidebar
=
$
(
'.issuable-sidebar'
)
discussionHeight
=
$discussion
.
height
()
sidebarHeight
=
$sidebar
.
height
()
console
.
log
(
sidebarHeight
,
discussionHeight
)
if
sidebarHeight
>
discussionHeight
$discussion
.
height
(
sidebarHeight
+
50
)
console
.
log
(
'fixing issues'
)
return
# No affix if discussion is smaller than sidebar
$
(
'.issuable-affix'
).
affix
offset
:
top
:
->
@
top
=
(
$
(
'.issuable-affix'
).
offset
().
top
-
70
)
...
...
app/assets/javascripts/issue.js.coffee
View file @
46b56fc7
...
...
@@ -6,7 +6,6 @@ class @Issue
constructor
:
->
# Prevent duplicate event bindings
@
disableTaskList
()
if
$
(
'a.btn-close'
).
length
@
initTaskList
()
@
initIssueBtnEventListeners
()
...
...
app/assets/javascripts/merge_request.js.coffee
View file @
46b56fc7
...
...
@@ -50,11 +50,10 @@ class @MergeRequest
$this
=
$
(
this
)
if
$this
.
data
(
'submitted'
)
return
e
.
preventDefault
()
e
.
stopImmediatePropagation
()
shouldSubmit
=
$this
.
hasClass
(
'btn-comment'
)
console
.
log
(
"shouldSubmit"
)
if
shouldSubmit
e
.
preventDefault
()
e
.
stopImmediatePropagation
()
_this
.
submitNoteForm
(
$this
.
closest
(
'form'
),
$this
)
submitNoteForm
:
(
form
,
$button
)
=>
...
...
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