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
5256b5cc
Commit
5256b5cc
authored
Jun 05, 2015
by
Douwe Maan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Prefer jQuery on to bind, and don't use .js class.
parent
4ae67fca
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
8 deletions
+8
-8
app/assets/javascripts/dropzone_input.js.coffee
app/assets/javascripts/dropzone_input.js.coffee
+5
-5
app/assets/stylesheets/generic/markdown_area.scss
app/assets/stylesheets/generic/markdown_area.scss
+1
-1
app/assets/stylesheets/generic/mobile.scss
app/assets/stylesheets/generic/mobile.scss
+1
-1
app/views/projects/_md_preview.html.haml
app/views/projects/_md_preview.html.haml
+1
-1
No files found.
app/assets/javascripts/dropzone_input.js.coffee
View file @
5256b5cc
...
@@ -15,11 +15,11 @@ class @DropzoneInput
...
@@ -15,11 +15,11 @@ class @DropzoneInput
form_textarea
=
$
(
form
).
find
(
"textarea.markdown-area"
)
form_textarea
=
$
(
form
).
find
(
"textarea.markdown-area"
)
form_textarea
.
wrap
"<div class=
\"
div-dropzone
\"
></div>"
form_textarea
.
wrap
"<div class=
\"
div-dropzone
\"
></div>"
form_textarea
.
bind
'paste'
,
(
event
)
=>
form_textarea
.
on
'paste'
,
(
event
)
=>
handlePaste
(
event
)
handlePaste
(
event
)
form_textarea
.
bind
"input"
,
->
form_textarea
.
on
"input"
,
->
hideReferencedUsers
()
hideReferencedUsers
()
form_textarea
.
bind
"blur"
,
->
form_textarea
.
on
"blur"
,
->
renderMarkdown
()
renderMarkdown
()
form_dropzone
=
$
(
form
).
find
(
'.div-dropzone'
)
form_dropzone
=
$
(
form
).
find
(
'.div-dropzone'
)
...
@@ -130,11 +130,11 @@ class @DropzoneInput
...
@@ -130,11 +130,11 @@ class @DropzoneInput
child
=
$
(
dropzone
[
0
]).
children
(
"textarea"
)
child
=
$
(
dropzone
[
0
]).
children
(
"textarea"
)
hideReferencedUsers
=
->
hideReferencedUsers
=
->
referencedUsers
=
form
.
find
(
".
js-
referenced-users"
)
referencedUsers
=
form
.
find
(
".referenced-users"
)
referencedUsers
.
hide
()
referencedUsers
.
hide
()
renderReferencedUsers
=
(
users
)
->
renderReferencedUsers
=
(
users
)
->
referencedUsers
=
form
.
find
(
".
js-
referenced-users"
)
referencedUsers
=
form
.
find
(
".referenced-users"
)
if
referencedUsers
.
length
if
referencedUsers
.
length
if
users
.
length
>=
10
if
users
.
length
>=
10
...
...
app/assets/stylesheets/generic/markdown_area.scss
View file @
5256b5cc
...
@@ -60,7 +60,7 @@
...
@@ -60,7 +60,7 @@
float
:
left
;
float
:
left
;
}
}
.
js-
referenced-users
{
.referenced-users
{
padding
:
10px
0
;
padding
:
10px
0
;
color
:
#999
;
color
:
#999
;
margin-left
:
10px
;
margin-left
:
10px
;
...
...
app/assets/stylesheets/generic/mobile.scss
View file @
5256b5cc
...
@@ -19,7 +19,7 @@
...
@@ -19,7 +19,7 @@
}
}
}
}
.
js-
referenced-users
{
.referenced-users
{
margin-right
:
0
;
margin-right
:
0
;
}
}
...
...
app/views/projects/_md_preview.html.haml
View file @
5256b5cc
...
@@ -9,7 +9,7 @@
...
@@ -9,7 +9,7 @@
Preview
Preview
-
if
defined?
(
referenced_users
)
&&
referenced_users
-
if
defined?
(
referenced_users
)
&&
referenced_users
%span
.
js-
referenced-users.pull-left.hide
%span
.referenced-users.pull-left.hide
=
icon
(
'exclamation-triangle'
)
=
icon
(
'exclamation-triangle'
)
You are about to add
You are about to add
%strong
%strong
...
...
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