Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
heptapod
heptapod
Commits
d363142f3b8e
Commit
3db8e452
authored
Feb 03, 2015
by
Dmitriy Zaporozhets
Browse files
Merge branch 'master' of github.com:gitlabhq/gitlabhq
parents
a66f6dc90063
a61e1174734e
Changes
2
Show whitespace changes
Inline
Side-by-side
CHANGELOG
View file @
d363142f
...
...
@@ -42,7 +42,7 @@ v 7.8.0
- Password reset token validity increased from 2 hours to 2 days since it is also send on account creation.
-
-
-
-
Enable raw image paste from clipboard, currently Chrome only (Marco Cyriacks)
-
-
- Add action property to merge request hook (Julien Bianchi)
...
...
app/assets/javascripts/dropzone_input.js.coffee
View file @
d363142f
...
...
@@ -13,6 +13,8 @@ class @DropzoneInput
form_textarea
=
$
(
form
).
find
(
"textarea.markdown-area"
)
form_textarea
.
wrap
"<div class=
\"
div-dropzone
\"
></div>"
form_textarea
.
bind
'paste'
,
(
event
)
=>
handlePaste
(
event
)
form_dropzone
=
$
(
form
).
find
(
'.div-dropzone'
)
form_dropzone
.
parent
().
addClass
"div-dropzone-wrapper"
...
...
@@ -133,25 +135,18 @@ class @DropzoneInput
formatLink
=
(
str
)
->
""
handlePaste
=
(
e
)
->
e
.
preventDefault
()
my_event
=
e
.
originalEvent
if
my_event
.
clipboardData
and
my_event
.
clipboardData
.
items
processItem
(
my_event
)
processItem
=
(
e
)
->
image
=
isImage
(
e
)
handlePaste
=
(
event
)
->
pasteEvent
=
event
.
originalEvent
if
pasteEvent
.
clipboardData
and
pasteEvent
.
clipboardData
.
items
image
=
isImage
(
pasteEvent
)
if
image
filename
=
getFilename
(
e
)
or
"image.png"
event
.
preventDefault
()
filename
=
getFilename
(
pasteEvent
)
or
"image.png"
text
=
"{{"
+
filename
+
"}}"
pasteText
(
text
)
uploadFile
image
.
getAsFile
(),
filename
else
text
=
e
.
clipboardData
.
getData
(
"text/plain"
)
pasteText
(
text
)
isImage
=
(
data
)
->
i
=
0
while
i
<
data
.
clipboardData
.
items
.
length
...
...
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