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
Boxiang Sun
gitlab-ce
Commits
6fd00826
Commit
6fd00826
authored
Sep 30, 2014
by
Marin Jankovski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix attachment upload link bug caused by introduction of zen mode.
parent
2b88c9cd
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
11 deletions
+11
-11
app/assets/javascripts/markdown_area.js.coffee
app/assets/javascripts/markdown_area.js.coffee
+11
-11
No files found.
app/assets/javascripts/markdown_area.js.coffee
View file @
6fd00826
...
@@ -12,13 +12,13 @@ $(document).ready ->
...
@@ -12,13 +12,13 @@ $(document).ready ->
btnAlert
=
"<button type=
\"
button
\"
"
+
alertAttr
+
">×</button>"
btnAlert
=
"<button type=
\"
button
\"
"
+
alertAttr
+
">×</button>"
project_image_path_upload
=
window
.
project_image_path_upload
or
null
project_image_path_upload
=
window
.
project_image_path_upload
or
null
$
(
"textarea.markdown-area"
).
wrap
"<div class=
\"
div-dropzone
\"
></div>"
$
(
"textarea.markdown-area"
).
wrap
"<div class=
\"
div-dropzone
\"
></div>"
$
(
".div-dropzone"
).
parent
().
addClass
"div-dropzone-wrapper"
$
(
".div-dropzone"
).
parent
().
addClass
"div-dropzone-wrapper"
$
(
".div-dropzone"
).
append
divHover
$
(
".div-dropzone"
).
append
divHover
$
(
".div-dropzone-hover"
).
append
iconPicture
$
(
".div-dropzone-hover"
).
append
iconPicture
$
(
".div-dropzone"
).
append
divSpinner
$
(
".div-dropzone"
).
append
divSpinner
$
(
".div-dropzone-spinner"
).
append
iconSpinner
$
(
".div-dropzone-spinner"
).
append
iconSpinner
$
(
".div-dropzone-spinner"
).
css
$
(
".div-dropzone-spinner"
).
css
"opacity"
:
0
"opacity"
:
0
...
@@ -27,12 +27,12 @@ $(document).ready ->
...
@@ -27,12 +27,12 @@ $(document).ready ->
dropzone
=
$
(
".div-dropzone"
).
dropzone
(
dropzone
=
$
(
".div-dropzone"
).
dropzone
(
url
:
project_image_path_upload
url
:
project_image_path_upload
dictDefaultMessage
:
""
dictDefaultMessage
:
""
clickable
:
fals
e
clickable
:
tru
e
paramName
:
"markdown_img"
paramName
:
"markdown_img"
maxFilesize
:
10
maxFilesize
:
10
uploadMultiple
:
false
uploadMultiple
:
false
acceptedFiles
:
"image/jpg,image/jpeg,image/gif,image/png"
acceptedFiles
:
"image/jpg,image/jpeg,image/gif,image/png"
headers
:
headers
:
"X-CSRF-Token"
:
$
(
"meta[name=
\"
csrf-token
\"
]"
).
attr
(
"content"
)
"X-CSRF-Token"
:
$
(
"meta[name=
\"
csrf-token
\"
]"
).
attr
(
"content"
)
previewContainer
:
false
previewContainer
:
false
...
@@ -91,7 +91,7 @@ $(document).ready ->
...
@@ -91,7 +91,7 @@ $(document).ready ->
handlePaste
=
(
e
)
->
handlePaste
=
(
e
)
->
e
.
preventDefault
()
e
.
preventDefault
()
my_event
=
e
.
originalEvent
my_event
=
e
.
originalEvent
if
my_event
.
clipboardData
and
my_event
.
clipboardData
.
items
if
my_event
.
clipboardData
and
my_event
.
clipboardData
.
items
processItem
(
my_event
)
processItem
(
my_event
)
...
@@ -115,7 +115,7 @@ $(document).ready ->
...
@@ -115,7 +115,7 @@ $(document).ready ->
return
item
return
item
i
++
i
++
return
false
return
false
pasteText
=
(
text
)
->
pasteText
=
(
text
)
->
caretStart
=
$
(
child
)[
0
].
selectionStart
caretStart
=
$
(
child
)[
0
].
selectionStart
caretEnd
=
$
(
child
)[
0
].
selectionEnd
caretEnd
=
$
(
child
)[
0
].
selectionEnd
...
@@ -126,12 +126,12 @@ $(document).ready ->
...
@@ -126,12 +126,12 @@ $(document).ready ->
$
(
child
).
val
beforeSelection
+
text
+
afterSelection
$
(
child
).
val
beforeSelection
+
text
+
afterSelection
$
(
".markdown-area"
).
trigger
"input"
$
(
".markdown-area"
).
trigger
"input"
getFilename
=
(
e
)
->
getFilename
=
(
e
)
->
if
window
.
clipboardData
and
window
.
clipboardData
.
getData
if
window
.
clipboardData
and
window
.
clipboardData
.
getData
value
=
window
.
clipboardData
.
getData
(
"Text"
)
value
=
window
.
clipboardData
.
getData
(
"Text"
)
else
if
e
.
clipboardData
and
e
.
clipboardData
.
getData
else
if
e
.
clipboardData
and
e
.
clipboardData
.
getData
value
=
e
.
clipboardData
.
getData
(
"text/plain"
)
value
=
e
.
clipboardData
.
getData
(
"text/plain"
)
value
=
value
.
split
(
"
\r
"
)
value
=
value
.
split
(
"
\r
"
)
value
.
first
()
value
.
first
()
...
@@ -154,7 +154,7 @@ $(document).ready ->
...
@@ -154,7 +154,7 @@ $(document).ready ->
success
:
(
e
,
textStatus
,
response
)
->
success
:
(
e
,
textStatus
,
response
)
->
insertToTextArea
(
filename
,
formatLink
(
response
.
responseJSON
.
link
))
insertToTextArea
(
filename
,
formatLink
(
response
.
responseJSON
.
link
))
error
:
(
response
)
->
error
:
(
response
)
->
showError
(
response
.
responseJSON
.
message
)
showError
(
response
.
responseJSON
.
message
)
...
@@ -190,7 +190,7 @@ $(document).ready ->
...
@@ -190,7 +190,7 @@ $(document).ready ->
$
(
".markdown-selector"
).
click
(
e
)
->
$
(
".markdown-selector"
).
click
(
e
)
->
e
.
preventDefault
()
e
.
preventDefault
()
$
(
@
).
closest
(
".
div-dropzone-wrapp
er"
).
find
(
".div-dropzone"
).
click
()
$
(
@
).
closest
(
".
note-write-hold
er"
).
find
(
".div-dropzone"
).
click
()
return
return
return
return
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