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
1bba9700
Commit
1bba9700
authored
Oct 19, 2017
by
Filipa Lacerda
Committed by
Winnie Hellmann
Oct 21, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove dropzoneInput from global namespace
parent
0a7ca618
Changes
7
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
269 additions
and
309 deletions
+269
-309
app/assets/javascripts/blob/blob_file_dropzone.js
app/assets/javascripts/blob/blob_file_dropzone.js
+1
-2
app/assets/javascripts/dropzone_input.js
app/assets/javascripts/dropzone_input.js
+265
-297
app/assets/javascripts/gl_form.js
app/assets/javascripts/gl_form.js
+2
-2
app/assets/javascripts/notes.js
app/assets/javascripts/notes.js
+0
-3
app/assets/javascripts/zen_mode.js
app/assets/javascripts/zen_mode.js
+0
-2
spec/javascripts/blob/blob_file_dropzone_spec.js
spec/javascripts/blob/blob_file_dropzone_spec.js
+0
-1
spec/javascripts/zen_mode_spec.js
spec/javascripts/zen_mode_spec.js
+1
-2
No files found.
app/assets/javascripts/blob/blob_file_dropzone.js
View file @
1bba9700
/* eslint-disable func-names, object-shorthand, prefer-arrow-callback */
/* global Dropzone */
import
Dropzone
from
'
dropzone
'
;
import
'
../lib/utils/url_utility
'
;
import
{
HIDDEN_CLASS
}
from
'
../lib/utils/constants
'
;
import
csrf
from
'
../lib/utils/csrf
'
;
...
...
app/assets/javascripts/dropzone_input.js
View file @
1bba9700
This diff is collapsed.
Click to expand it.
app/assets/javascripts/gl_form.js
View file @
1bba9700
/* global DropzoneInput */
/* global autosize */
import
GfmAutoComplete
from
'
./gfm_auto_complete
'
;
import
dropzoneInput
from
'
./dropzone_input
'
;
export
default
class
GLForm
{
constructor
(
form
,
enableGFM
=
false
)
{
...
...
@@ -41,7 +41,7 @@ export default class GLForm {
mergeRequests
:
this
.
enableGFM
,
labels
:
this
.
enableGFM
,
});
new
DropzoneInput
(
this
.
form
);
// eslint-disable-line no-new
dropzoneInput
(
this
.
form
);
autosize
(
this
.
textarea
);
}
// form and textarea event listeners
...
...
app/assets/javascripts/notes.js
View file @
1bba9700
...
...
@@ -13,7 +13,6 @@ import $ from 'jquery';
import
_
from
'
underscore
'
;
import
Cookies
from
'
js-cookie
'
;
import
autosize
from
'
vendor/autosize
'
;
import
Dropzone
from
'
dropzone
'
;
import
'
vendor/jquery.caret
'
;
// required by jquery.atwho
import
'
vendor/jquery.atwho
'
;
import
AjaxCache
from
'
~/lib/utils/ajax_cache
'
;
...
...
@@ -22,13 +21,11 @@ import CommentTypeToggle from './comment_type_toggle';
import
GLForm
from
'
./gl_form
'
;
import
loadAwardsHandler
from
'
./awards_handler
'
;
import
'
./autosave
'
;
import
'
./dropzone_input
'
;
import
TaskList
from
'
./task_list
'
;
import
{
ajaxPost
,
isInViewport
,
getPagePath
,
scrollToElement
,
isMetaKey
}
from
'
./lib/utils/common_utils
'
;
import
imageDiffHelper
from
'
./image_diff/helpers/index
'
;
window
.
autosize
=
autosize
;
window
.
Dropzone
=
Dropzone
;
function
normalizeNewlines
(
str
)
{
return
str
.
replace
(
/
\r\n
/g
,
'
\n
'
);
...
...
app/assets/javascripts/zen_mode.js
View file @
1bba9700
...
...
@@ -11,8 +11,6 @@ import Dropzone from 'dropzone';
import
'
mousetrap
'
;
import
'
mousetrap/plugins/pause/mousetrap-pause
'
;
window
.
Dropzone
=
Dropzone
;
//
// ### Events
//
...
...
spec/javascripts/blob/blob_file_dropzone_spec.js
View file @
1bba9700
import
'
dropzone
'
;
import
BlobFileDropzone
from
'
~/blob/blob_file_dropzone
'
;
describe
(
'
BlobFileDropzone
'
,
()
=>
{
...
...
spec/javascripts/zen_mode_spec.js
View file @
1bba9700
/* eslint-disable space-before-function-paren, no-var, one-var, one-var-declaration-per-line, object-shorthand, comma-dangle, no-return-assign, new-cap, max-len */
/* global Dropzone */
/* global Mousetrap */
import
Dropzone
from
'
dropzone
'
;
import
ZenMode
from
'
~/zen_mode
'
;
(
function
()
{
...
...
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