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
23cdae8e
Commit
23cdae8e
authored
Jun 16, 2018
by
gfyoung
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Enable "prefer-destructuring" in JS files
Partially addresses #47006.
parent
d38eb9bb
Changes
89
Show whitespace changes
Inline
Side-by-side
Showing
89 changed files
with
167 additions
and
161 deletions
+167
-161
.eslintrc.yml
.eslintrc.yml
+0
-2
app/assets/javascripts/ajax_loading_spinner.js
app/assets/javascripts/ajax_loading_spinner.js
+1
-1
app/assets/javascripts/behaviors/copy_to_clipboard.js
app/assets/javascripts/behaviors/copy_to_clipboard.js
+1
-1
app/assets/javascripts/behaviors/markdown/copy_as_gfm.js
app/assets/javascripts/behaviors/markdown/copy_as_gfm.js
+2
-2
app/assets/javascripts/blob/balsamiq/balsamiq_viewer.js
app/assets/javascripts/blob/balsamiq/balsamiq_viewer.js
+1
-1
app/assets/javascripts/blob/balsamiq_viewer.js
app/assets/javascripts/blob/balsamiq_viewer.js
+1
-1
app/assets/javascripts/blob/stl_viewer.js
app/assets/javascripts/blob/stl_viewer.js
+1
-1
app/assets/javascripts/boards/components/sidebar/remove_issue.vue
...ts/javascripts/boards/components/sidebar/remove_issue.vue
+1
-1
app/assets/javascripts/boards/index.js
app/assets/javascripts/boards/index.js
+2
-2
app/assets/javascripts/boards/stores/modal_store.js
app/assets/javascripts/boards/stores/modal_store.js
+1
-1
app/assets/javascripts/clusters/clusters_bundle.js
app/assets/javascripts/clusters/clusters_bundle.js
+1
-1
app/assets/javascripts/commit/image_file.js
app/assets/javascripts/commit/image_file.js
+2
-2
app/assets/javascripts/create_merge_request_dropdown.js
app/assets/javascripts/create_merge_request_dropdown.js
+1
-1
app/assets/javascripts/diff_notes/components/diff_note_avatars.js
...ts/javascripts/diff_notes/components/diff_note_avatars.js
+1
-1
app/assets/javascripts/diff_notes/components/jump_to_discussion.js
...s/javascripts/diff_notes/components/jump_to_discussion.js
+1
-1
app/assets/javascripts/diff_notes/diff_notes_bundle.js
app/assets/javascripts/diff_notes/diff_notes_bundle.js
+1
-1
app/assets/javascripts/diffs/components/diff_gutter_avatars.vue
...sets/javascripts/diffs/components/diff_gutter_avatars.vue
+1
-1
app/assets/javascripts/diffs/components/diff_line_gutter_content.vue
...javascripts/diffs/components/diff_line_gutter_content.vue
+1
-1
app/assets/javascripts/diffs/components/parallel_diff_view.vue
...ssets/javascripts/diffs/components/parallel_diff_view.vue
+1
-1
app/assets/javascripts/environments/components/environment_item.vue
.../javascripts/environments/components/environment_item.vue
+1
-1
app/assets/javascripts/environments/stores/environments_store.js
...ets/javascripts/environments/stores/environments_store.js
+2
-2
app/assets/javascripts/filtered_search/dropdown_utils.js
app/assets/javascripts/filtered_search/dropdown_utils.js
+3
-3
app/assets/javascripts/filtered_search/filtered_search_dropdown_manager.js
...ripts/filtered_search/filtered_search_dropdown_manager.js
+1
-1
app/assets/javascripts/filtered_search/filtered_search_manager.js
...ts/javascripts/filtered_search/filtered_search_manager.js
+2
-2
app/assets/javascripts/filtered_search/filtered_search_visual_tokens.js
...ascripts/filtered_search/filtered_search_visual_tokens.js
+2
-2
app/assets/javascripts/filtered_search/recent_searches_root.js
...ssets/javascripts/filtered_search/recent_searches_root.js
+1
-1
app/assets/javascripts/gfm_auto_complete.js
app/assets/javascripts/gfm_auto_complete.js
+2
-2
app/assets/javascripts/gl_dropdown.js
app/assets/javascripts/gl_dropdown.js
+6
-5
app/assets/javascripts/groups/index.js
app/assets/javascripts/groups/index.js
+2
-2
app/assets/javascripts/ide/components/file_finder/item.vue
app/assets/javascripts/ide/components/file_finder/item.vue
+1
-1
app/assets/javascripts/ide/components/new_dropdown/upload.vue
...assets/javascripts/ide/components/new_dropdown/upload.vue
+1
-0
app/assets/javascripts/ide/lib/diff/diff_worker.js
app/assets/javascripts/ide/lib/diff/diff_worker.js
+1
-1
app/assets/javascripts/ide/stores/actions/file.js
app/assets/javascripts/ide/stores/actions/file.js
+1
-1
app/assets/javascripts/image_diff/helpers/dom_helper.js
app/assets/javascripts/image_diff/helpers/dom_helper.js
+2
-1
app/assets/javascripts/image_diff/helpers/utils_helper.js
app/assets/javascripts/image_diff/helpers/utils_helper.js
+1
-2
app/assets/javascripts/issuable/auto_width_dropdown_select.js
...assets/javascripts/issuable/auto_width_dropdown_select.js
+1
-1
app/assets/javascripts/jobs/job_details_bundle.js
app/assets/javascripts/jobs/job_details_bundle.js
+1
-1
app/assets/javascripts/labels_select.js
app/assets/javascripts/labels_select.js
+5
-4
app/assets/javascripts/lib/utils/common_utils.js
app/assets/javascripts/lib/utils/common_utils.js
+6
-5
app/assets/javascripts/lib/utils/number_utils.js
app/assets/javascripts/lib/utils/number_utils.js
+1
-1
app/assets/javascripts/merge_conflicts/merge_conflict_store.js
...ssets/javascripts/merge_conflicts/merge_conflict_store.js
+2
-2
app/assets/javascripts/merge_conflicts/merge_conflicts_bundle.js
...ets/javascripts/merge_conflicts/merge_conflicts_bundle.js
+1
-1
app/assets/javascripts/merge_request_tabs.js
app/assets/javascripts/merge_request_tabs.js
+2
-2
app/assets/javascripts/monitoring/utils/multiple_time_series.js
...sets/javascripts/monitoring/utils/multiple_time_series.js
+2
-2
app/assets/javascripts/network/branch_graph.js
app/assets/javascripts/network/branch_graph.js
+25
-24
app/assets/javascripts/new_branch_form.js
app/assets/javascripts/new_branch_form.js
+1
-1
app/assets/javascripts/notes.js
app/assets/javascripts/notes.js
+1
-1
app/assets/javascripts/notes/components/notes_app.vue
app/assets/javascripts/notes/components/notes_app.vue
+1
-1
app/assets/javascripts/notes/services/notes_service.js
app/assets/javascripts/notes/services/notes_service.js
+1
-1
app/assets/javascripts/pages/admin/users/components/delete_user_modal.vue
...cripts/pages/admin/users/components/delete_user_modal.vue
+1
-1
app/assets/javascripts/pages/dashboard/todos/index/todos.js
app/assets/javascripts/pages/dashboard/todos/index/todos.js
+1
-1
app/assets/javascripts/pages/projects/graphs/show/stat_graph_contributors.js
...pts/pages/projects/graphs/show/stat_graph_contributors.js
+5
-4
app/assets/javascripts/pages/projects/settings/ci_cd/show/index.js
...s/javascripts/pages/projects/settings/ci_cd/show/index.js
+1
-1
app/assets/javascripts/pipelines/pipeline_details_bundle.js
app/assets/javascripts/pipelines/pipeline_details_bundle.js
+1
-1
app/assets/javascripts/pipelines/services/pipelines_service.js
...ssets/javascripts/pipelines/services/pipelines_service.js
+1
-1
app/assets/javascripts/preview_markdown.js
app/assets/javascripts/preview_markdown.js
+1
-1
app/assets/javascripts/profile/gl_crop.js
app/assets/javascripts/profile/gl_crop.js
+5
-6
app/assets/javascripts/project_find_file.js
app/assets/javascripts/project_find_file.js
+1
-1
app/assets/javascripts/projects/tree/components/commit_pipeline_status_component.vue
...ects/tree/components/commit_pipeline_status_component.vue
+1
-1
app/assets/javascripts/projects_dropdown/index.js
app/assets/javascripts/projects_dropdown/index.js
+1
-1
app/assets/javascripts/registry/index.js
app/assets/javascripts/registry/index.js
+1
-1
app/assets/javascripts/registry/stores/actions.js
app/assets/javascripts/registry/stores/actions.js
+1
-1
app/assets/javascripts/smart_interval.js
app/assets/javascripts/smart_interval.js
+4
-5
app/assets/javascripts/test_utils/simulate_drag.js
app/assets/javascripts/test_utils/simulate_drag.js
+2
-2
app/assets/javascripts/users_select.js
app/assets/javascripts/users_select.js
+2
-3
app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue
...avascripts/vue_merge_request_widget/mr_widget_options.vue
+2
-2
app/assets/javascripts/vue_shared/components/content_viewer/viewers/image_viewer.vue
...shared/components/content_viewer/viewers/image_viewer.vue
+1
-1
app/assets/javascripts/vue_shared/components/content_viewer/viewers/markdown_viewer.vue
...red/components/content_viewer/viewers/markdown_viewer.vue
+1
-1
app/assets/javascripts/vue_shared/components/table_pagination.vue
...ts/javascripts/vue_shared/components/table_pagination.vue
+1
-1
changelogs/unreleased/prefer-destructuring-fix.yml
changelogs/unreleased/prefer-destructuring-fix.yml
+5
-0
spec/javascripts/blob/3d_viewer/mesh_object_spec.js
spec/javascripts/blob/3d_viewer/mesh_object_spec.js
+2
-2
spec/javascripts/commit/pipelines/pipelines_spec.js
spec/javascripts/commit/pipelines/pipelines_spec.js
+1
-1
spec/javascripts/deploy_keys/components/key_spec.js
spec/javascripts/deploy_keys/components/key_spec.js
+1
-1
spec/javascripts/diffs/components/diff_line_gutter_content_spec.js
...scripts/diffs/components/diff_line_gutter_content_spec.js
+1
-1
spec/javascripts/filtered_search/components/recent_searches_dropdown_content_spec.js
...earch/components/recent_searches_dropdown_content_spec.js
+4
-4
spec/javascripts/filtered_search/recent_searches_root_spec.js
.../javascripts/filtered_search/recent_searches_root_spec.js
+1
-2
spec/javascripts/gl_field_errors_spec.js
spec/javascripts/gl_field_errors_spec.js
+1
-1
spec/javascripts/groups/components/app_spec.js
spec/javascripts/groups/components/app_spec.js
+3
-3
spec/javascripts/groups/components/group_item_spec.js
spec/javascripts/groups/components/group_item_spec.js
+1
-1
spec/javascripts/ide/lib/diff/controller_spec.js
spec/javascripts/ide/lib/diff/controller_spec.js
+1
-1
spec/javascripts/namespace_select_spec.js
spec/javascripts/namespace_select_spec.js
+2
-2
spec/javascripts/notebook/cells/markdown_spec.js
spec/javascripts/notebook/cells/markdown_spec.js
+1
-0
spec/javascripts/pipelines/pipelines_table_row_spec.js
spec/javascripts/pipelines/pipelines_table_row_spec.js
+1
-1
spec/javascripts/pipelines/pipelines_table_spec.js
spec/javascripts/pipelines/pipelines_table_spec.js
+1
-1
spec/javascripts/smart_interval_spec.js
spec/javascripts/smart_interval_spec.js
+2
-2
spec/javascripts/vue_shared/components/file_icon_spec.js
spec/javascripts/vue_shared/components/file_icon_spec.js
+1
-1
spec/javascripts/vue_shared/components/icon_spec.js
spec/javascripts/vue_shared/components/icon_spec.js
+1
-1
spec/javascripts/vue_shared/components/user_avatar/user_avatar_image_spec.js
...e_shared/components/user_avatar/user_avatar_image_spec.js
+2
-2
spec/javascripts/vue_shared/components/user_avatar/user_avatar_link_spec.js
...ue_shared/components/user_avatar/user_avatar_link_spec.js
+1
-1
No files found.
.eslintrc.yml
View file @
23cdae8e
...
@@ -69,5 +69,3 @@ rules:
...
@@ -69,5 +69,3 @@ rules:
FunctionExpression
:
FunctionExpression
:
parameters
:
1
parameters
:
1
body
:
1
body
:
1
## Destructuring: https://eslint.org/docs/rules/prefer-destructuring
prefer-destructuring
:
off
app/assets/javascripts/ajax_loading_spinner.js
View file @
23cdae8e
...
@@ -26,7 +26,7 @@ export default class AjaxLoadingSpinner {
...
@@ -26,7 +26,7 @@ export default class AjaxLoadingSpinner {
}
}
static
toggleLoadingIcon
(
iconElement
)
{
static
toggleLoadingIcon
(
iconElement
)
{
const
classList
=
iconElement
.
classLis
t
;
const
{
classList
}
=
iconElemen
t
;
classList
.
toggle
(
iconElement
.
dataset
.
icon
);
classList
.
toggle
(
iconElement
.
dataset
.
icon
);
classList
.
toggle
(
'
fa-spinner
'
);
classList
.
toggle
(
'
fa-spinner
'
);
classList
.
toggle
(
'
fa-spin
'
);
classList
.
toggle
(
'
fa-spin
'
);
...
...
app/assets/javascripts/behaviors/copy_to_clipboard.js
View file @
23cdae8e
...
@@ -52,7 +52,7 @@ export default function initCopyToClipboard() {
...
@@ -52,7 +52,7 @@ export default function initCopyToClipboard() {
* data types to the intended values.
* data types to the intended values.
*/
*/
$
(
document
).
on
(
'
copy
'
,
'
body > textarea[readonly]
'
,
(
e
)
=>
{
$
(
document
).
on
(
'
copy
'
,
'
body > textarea[readonly]
'
,
(
e
)
=>
{
const
clipboardData
=
e
.
originalEvent
.
clipboardData
;
const
{
clipboardData
}
=
e
.
originalEvent
;
if
(
!
clipboardData
)
return
;
if
(
!
clipboardData
)
return
;
const
text
=
e
.
target
.
value
;
const
text
=
e
.
target
.
value
;
...
...
app/assets/javascripts/behaviors/markdown/copy_as_gfm.js
View file @
23cdae8e
...
@@ -321,7 +321,7 @@ export class CopyAsGFM {
...
@@ -321,7 +321,7 @@ export class CopyAsGFM {
}
}
static
copyAsGFM
(
e
,
transformer
)
{
static
copyAsGFM
(
e
,
transformer
)
{
const
clipboardData
=
e
.
originalEvent
.
clipboardData
;
const
{
clipboardData
}
=
e
.
originalEvent
;
if
(
!
clipboardData
)
return
;
if
(
!
clipboardData
)
return
;
const
documentFragment
=
getSelectedFragment
();
const
documentFragment
=
getSelectedFragment
();
...
@@ -338,7 +338,7 @@ export class CopyAsGFM {
...
@@ -338,7 +338,7 @@ export class CopyAsGFM {
}
}
static
pasteGFM
(
e
)
{
static
pasteGFM
(
e
)
{
const
clipboardData
=
e
.
originalEvent
.
clipboardData
;
const
{
clipboardData
}
=
e
.
originalEvent
;
if
(
!
clipboardData
)
return
;
if
(
!
clipboardData
)
return
;
const
text
=
clipboardData
.
getData
(
'
text/plain
'
);
const
text
=
clipboardData
.
getData
(
'
text/plain
'
);
...
...
app/assets/javascripts/blob/balsamiq/balsamiq_viewer.js
View file @
23cdae8e
...
@@ -84,7 +84,7 @@ class BalsamiqViewer {
...
@@ -84,7 +84,7 @@ class BalsamiqViewer {
renderTemplate
(
preview
)
{
renderTemplate
(
preview
)
{
const
resource
=
this
.
getResource
(
preview
.
resourceID
);
const
resource
=
this
.
getResource
(
preview
.
resourceID
);
const
name
=
BalsamiqViewer
.
parseTitle
(
resource
);
const
name
=
BalsamiqViewer
.
parseTitle
(
resource
);
const
image
=
preview
.
image
;
const
{
image
}
=
preview
;
const
template
=
PREVIEW_TEMPLATE
({
const
template
=
PREVIEW_TEMPLATE
({
name
,
name
,
...
...
app/assets/javascripts/blob/balsamiq_viewer.js
View file @
23cdae8e
...
@@ -12,7 +12,7 @@ export default function loadBalsamiqFile() {
...
@@ -12,7 +12,7 @@ export default function loadBalsamiqFile() {
if
(
!
(
viewer
instanceof
Element
))
return
;
if
(
!
(
viewer
instanceof
Element
))
return
;
const
endpoint
=
viewer
.
dataset
.
endpoin
t
;
const
{
endpoint
}
=
viewer
.
datase
t
;
const
balsamiqViewer
=
new
BalsamiqViewer
(
viewer
);
const
balsamiqViewer
=
new
BalsamiqViewer
(
viewer
);
balsamiqViewer
.
loadFile
(
endpoint
).
catch
(
onError
);
balsamiqViewer
.
loadFile
(
endpoint
).
catch
(
onError
);
...
...
app/assets/javascripts/blob/stl_viewer.js
View file @
23cdae8e
...
@@ -5,7 +5,7 @@ export default () => {
...
@@ -5,7 +5,7 @@ export default () => {
[].
slice
.
call
(
document
.
querySelectorAll
(
'
.js-material-changer
'
)).
forEach
((
el
)
=>
{
[].
slice
.
call
(
document
.
querySelectorAll
(
'
.js-material-changer
'
)).
forEach
((
el
)
=>
{
el
.
addEventListener
(
'
click
'
,
(
e
)
=>
{
el
.
addEventListener
(
'
click
'
,
(
e
)
=>
{
const
target
=
e
.
target
;
const
{
target
}
=
e
;
e
.
preventDefault
();
e
.
preventDefault
();
...
...
app/assets/javascripts/boards/components/sidebar/remove_issue.vue
View file @
23cdae8e
...
@@ -23,7 +23,7 @@
...
@@ -23,7 +23,7 @@
},
},
methods
:
{
methods
:
{
removeIssue
()
{
removeIssue
()
{
const
issue
=
this
.
issue
;
const
{
issue
}
=
this
;
const
lists
=
issue
.
getLists
();
const
lists
=
issue
.
getLists
();
const
listLabelIds
=
lists
.
map
(
list
=>
list
.
label
.
id
);
const
listLabelIds
=
lists
.
map
(
list
=>
list
.
label
.
id
);
...
...
app/assets/javascripts/boards/index.js
View file @
23cdae8e
...
@@ -121,7 +121,7 @@ export default () => {
...
@@ -121,7 +121,7 @@ export default () => {
this
.
filterManager
.
updateTokens
();
this
.
filterManager
.
updateTokens
();
},
},
updateDetailIssue
(
newIssue
)
{
updateDetailIssue
(
newIssue
)
{
const
sidebarInfoEndpoint
=
newIssue
.
sidebarInfoEndpoint
;
const
{
sidebarInfoEndpoint
}
=
newIssue
;
if
(
sidebarInfoEndpoint
&&
newIssue
.
subscribed
===
undefined
)
{
if
(
sidebarInfoEndpoint
&&
newIssue
.
subscribed
===
undefined
)
{
newIssue
.
setFetchingState
(
'
subscriptions
'
,
true
);
newIssue
.
setFetchingState
(
'
subscriptions
'
,
true
);
BoardService
.
getIssueInfo
(
sidebarInfoEndpoint
)
BoardService
.
getIssueInfo
(
sidebarInfoEndpoint
)
...
@@ -144,7 +144,7 @@ export default () => {
...
@@ -144,7 +144,7 @@ export default () => {
Store
.
detail
.
issue
=
{};
Store
.
detail
.
issue
=
{};
},
},
toggleSubscription
(
id
)
{
toggleSubscription
(
id
)
{
const
issue
=
Store
.
detail
.
issue
;
const
{
issue
}
=
Store
.
detail
;
if
(
issue
.
id
===
id
&&
issue
.
toggleSubscriptionEndpoint
)
{
if
(
issue
.
id
===
id
&&
issue
.
toggleSubscriptionEndpoint
)
{
issue
.
setFetchingState
(
'
subscriptions
'
,
true
);
issue
.
setFetchingState
(
'
subscriptions
'
,
true
);
BoardService
.
toggleIssueSubscription
(
issue
.
toggleSubscriptionEndpoint
)
BoardService
.
toggleIssueSubscription
(
issue
.
toggleSubscriptionEndpoint
)
...
...
app/assets/javascripts/boards/stores/modal_store.js
View file @
23cdae8e
...
@@ -26,7 +26,7 @@ class ModalStore {
...
@@ -26,7 +26,7 @@ class ModalStore {
toggleIssue
(
issueObj
)
{
toggleIssue
(
issueObj
)
{
const
issue
=
issueObj
;
const
issue
=
issueObj
;
const
selected
=
issue
.
selected
;
const
{
selected
}
=
issue
;
issue
.
selected
=
!
selected
;
issue
.
selected
=
!
selected
;
...
...
app/assets/javascripts/clusters/clusters_bundle.js
View file @
23cdae8e
...
@@ -81,7 +81,7 @@ export default class Clusters {
...
@@ -81,7 +81,7 @@ export default class Clusters {
}
}
initApplications
()
{
initApplications
()
{
const
store
=
this
.
store
;
const
{
store
}
=
this
;
const
el
=
document
.
querySelector
(
'
#js-cluster-applications
'
);
const
el
=
document
.
querySelector
(
'
#js-cluster-applications
'
);
this
.
applications
=
new
Vue
({
this
.
applications
=
new
Vue
({
...
...
app/assets/javascripts/commit/image_file.js
View file @
23cdae8e
...
@@ -122,7 +122,7 @@ export default class ImageFile {
...
@@ -122,7 +122,7 @@ export default class ImageFile {
return
$
(
'
.swipe.view
'
,
this
.
file
).
each
((
function
(
_this
)
{
return
$
(
'
.swipe.view
'
,
this
.
file
).
each
((
function
(
_this
)
{
return
function
(
index
,
view
)
{
return
function
(
index
,
view
)
{
var
$swipeWrap
,
$swipeBar
,
$swipeFrame
,
wrapPadding
,
ref
;
var
$swipeWrap
,
$swipeBar
,
$swipeFrame
,
wrapPadding
,
ref
;
ref
=
_this
.
prepareFrames
(
view
),
maxWidth
=
ref
[
0
],
maxHeight
=
ref
[
1
]
;
ref
=
_this
.
prepareFrames
(
view
),
[
maxWidth
,
maxHeight
]
=
ref
;
$swipeFrame
=
$
(
'
.swipe-frame
'
,
view
);
$swipeFrame
=
$
(
'
.swipe-frame
'
,
view
);
$swipeWrap
=
$
(
'
.swipe-wrap
'
,
view
);
$swipeWrap
=
$
(
'
.swipe-wrap
'
,
view
);
$swipeBar
=
$
(
'
.swipe-bar
'
,
view
);
$swipeBar
=
$
(
'
.swipe-bar
'
,
view
);
...
@@ -159,7 +159,7 @@ export default class ImageFile {
...
@@ -159,7 +159,7 @@ export default class ImageFile {
return
$
(
'
.onion-skin.view
'
,
this
.
file
).
each
((
function
(
_this
)
{
return
$
(
'
.onion-skin.view
'
,
this
.
file
).
each
((
function
(
_this
)
{
return
function
(
index
,
view
)
{
return
function
(
index
,
view
)
{
var
$frame
,
$track
,
$dragger
,
$frameAdded
,
framePadding
,
ref
,
dragging
=
false
;
var
$frame
,
$track
,
$dragger
,
$frameAdded
,
framePadding
,
ref
,
dragging
=
false
;
ref
=
_this
.
prepareFrames
(
view
),
maxWidth
=
ref
[
0
],
maxHeight
=
ref
[
1
]
;
ref
=
_this
.
prepareFrames
(
view
),
[
maxWidth
,
maxHeight
]
=
ref
;
$frame
=
$
(
'
.onion-skin-frame
'
,
view
);
$frame
=
$
(
'
.onion-skin-frame
'
,
view
);
$frameAdded
=
$
(
'
.frame.added
'
,
view
);
$frameAdded
=
$
(
'
.frame.added
'
,
view
);
$track
=
$
(
'
.drag-track
'
,
view
);
$track
=
$
(
'
.drag-track
'
,
view
);
...
...
app/assets/javascripts/create_merge_request_dropdown.js
View file @
23cdae8e
...
@@ -281,7 +281,7 @@ export default class CreateMergeRequestDropdown {
...
@@ -281,7 +281,7 @@ export default class CreateMergeRequestDropdown {
if
(
event
.
target
===
this
.
branchInput
)
{
if
(
event
.
target
===
this
.
branchInput
)
{
target
=
'
branch
'
;
target
=
'
branch
'
;
value
=
this
.
branchInput
.
value
;
({
value
}
=
this
.
branchInput
)
;
}
else
if
(
event
.
target
===
this
.
refInput
)
{
}
else
if
(
event
.
target
===
this
.
refInput
)
{
target
=
'
ref
'
;
target
=
'
ref
'
;
value
=
value
=
...
...
app/assets/javascripts/diff_notes/components/diff_note_avatars.js
View file @
23cdae8e
...
@@ -111,7 +111,7 @@ const DiffNoteAvatars = Vue.extend({
...
@@ -111,7 +111,7 @@ const DiffNoteAvatars = Vue.extend({
});
});
},
},
addNoCommentClass
()
{
addNoCommentClass
()
{
const
notesCount
=
this
.
notesCount
;
const
{
notesCount
}
=
this
;
$
(
this
.
$el
).
closest
(
'
.js-avatar-container
'
)
$
(
this
.
$el
).
closest
(
'
.js-avatar-container
'
)
.
toggleClass
(
'
no-comment-btn
'
,
notesCount
>
0
)
.
toggleClass
(
'
no-comment-btn
'
,
notesCount
>
0
)
...
...
app/assets/javascripts/diff_notes/components/jump_to_discussion.js
View file @
23cdae8e
...
@@ -73,7 +73,7 @@ const JumpToDiscussion = Vue.extend({
...
@@ -73,7 +73,7 @@ const JumpToDiscussion = Vue.extend({
}).
toArray
();
}).
toArray
();
};
};
const
discussions
=
this
.
discussion
s
;
const
{
discussions
}
=
thi
s
;
if
(
activeTab
===
'
diffs
'
)
{
if
(
activeTab
===
'
diffs
'
)
{
discussionsSelector
=
'
.diffs .notes[data-discussion-id]
'
;
discussionsSelector
=
'
.diffs .notes[data-discussion-id]
'
;
...
...
app/assets/javascripts/diff_notes/diff_notes_bundle.js
View file @
23cdae8e
...
@@ -18,7 +18,7 @@ import './components/new_issue_for_discussion';
...
@@ -18,7 +18,7 @@ import './components/new_issue_for_discussion';
export
default
()
=>
{
export
default
()
=>
{
const
projectPathHolder
=
const
projectPathHolder
=
document
.
querySelector
(
'
.merge-request
'
)
||
document
.
querySelector
(
'
.commit-box
'
);
document
.
querySelector
(
'
.merge-request
'
)
||
document
.
querySelector
(
'
.commit-box
'
);
const
projectPath
=
projectPathHolder
.
dataset
.
projectPath
;
const
{
projectPath
}
=
projectPathHolder
.
dataset
;
const
COMPONENT_SELECTOR
=
const
COMPONENT_SELECTOR
=
'
resolve-btn, resolve-discussion-btn, jump-to-discussion, comment-and-resolve-btn, new-issue-for-discussion-btn
'
;
'
resolve-btn, resolve-discussion-btn, jump-to-discussion, comment-and-resolve-btn, new-issue-for-discussion-btn
'
;
...
...
app/assets/javascripts/diffs/components/diff_gutter_avatars.vue
View file @
23cdae8e
...
@@ -47,7 +47,7 @@ export default {
...
@@ -47,7 +47,7 @@ export default {
methods
:
{
methods
:
{
...
mapActions
([
'
toggleDiscussion
'
]),
...
mapActions
([
'
toggleDiscussion
'
]),
getTooltipText
(
noteData
)
{
getTooltipText
(
noteData
)
{
let
note
=
noteData
.
note
;
let
{
note
}
=
noteData
;
if
(
note
.
length
>
LENGTH_OF_AVATAR_TOOLTIP
)
{
if
(
note
.
length
>
LENGTH_OF_AVATAR_TOOLTIP
)
{
note
=
truncate
(
note
,
LENGTH_OF_AVATAR_TOOLTIP
);
note
=
truncate
(
note
,
LENGTH_OF_AVATAR_TOOLTIP
);
...
...
app/assets/javascripts/diffs/components/diff_line_gutter_content.vue
View file @
23cdae8e
...
@@ -124,7 +124,7 @@ export default {
...
@@ -124,7 +124,7 @@ export default {
const
newLineNumber
=
this
.
metaData
.
newPos
||
0
;
const
newLineNumber
=
this
.
metaData
.
newPos
||
0
;
const
offset
=
newLineNumber
-
oldLineNumber
;
const
offset
=
newLineNumber
-
oldLineNumber
;
const
bottom
=
this
.
isBottom
;
const
bottom
=
this
.
isBottom
;
const
fileHash
=
this
.
fileHash
;
const
{
fileHash
}
=
this
;
const
view
=
this
.
diffViewType
;
const
view
=
this
.
diffViewType
;
let
unfold
=
true
;
let
unfold
=
true
;
let
lineNumber
=
newLineNumber
-
1
;
let
lineNumber
=
newLineNumber
-
1
;
...
...
app/assets/javascripts/diffs/components/parallel_diff_view.vue
View file @
23cdae8e
...
@@ -89,7 +89,7 @@ export default {
...
@@ -89,7 +89,7 @@ export default {
return
isLeftExpanded
||
isRightExpanded
;
return
isLeftExpanded
||
isRightExpanded
;
},
},
getLineCode
(
line
,
side
)
{
getLineCode
(
line
,
side
)
{
const
lineCode
=
side
.
lineCo
de
;
const
{
lineCode
}
=
si
de
;
if
(
lineCode
)
{
if
(
lineCode
)
{
return
lineCode
;
return
lineCode
;
}
}
...
...
app/assets/javascripts/environments/components/environment_item.vue
View file @
23cdae8e
...
@@ -292,7 +292,7 @@
...
@@ -292,7 +292,7 @@
if
(
this
.
model
&&
if
(
this
.
model
&&
this
.
model
.
last_deployment
&&
this
.
model
.
last_deployment
&&
this
.
model
.
last_deployment
.
deployable
)
{
this
.
model
.
last_deployment
.
deployable
)
{
const
deployable
=
this
.
model
.
last_deployment
.
deployable
;
const
{
deployable
}
=
this
.
model
.
last_deployment
;
return
`
${
deployable
.
name
}
#
${
deployable
.
id
}
`
;
return
`
${
deployable
.
name
}
#
${
deployable
.
id
}
`
;
}
}
return
''
;
return
''
;
...
...
app/assets/javascripts/environments/stores/environments_store.js
View file @
23cdae8e
...
@@ -146,7 +146,7 @@ export default class EnvironmentsStore {
...
@@ -146,7 +146,7 @@ export default class EnvironmentsStore {
* @return {Array}
* @return {Array}
*/
*/
updateEnvironmentProp
(
environment
,
prop
,
newValue
)
{
updateEnvironmentProp
(
environment
,
prop
,
newValue
)
{
const
environments
=
this
.
state
.
environments
;
const
{
environments
}
=
this
.
state
;
const
updatedEnvironments
=
environments
.
map
((
env
)
=>
{
const
updatedEnvironments
=
environments
.
map
((
env
)
=>
{
const
updateEnv
=
Object
.
assign
({},
env
);
const
updateEnv
=
Object
.
assign
({},
env
);
...
@@ -161,7 +161,7 @@ export default class EnvironmentsStore {
...
@@ -161,7 +161,7 @@ export default class EnvironmentsStore {
}
}
getOpenFolders
()
{
getOpenFolders
()
{
const
environments
=
this
.
state
.
environments
;
const
{
environments
}
=
this
.
state
;
return
environments
.
filter
(
env
=>
env
.
isFolder
&&
env
.
isOpen
);
return
environments
.
filter
(
env
=>
env
.
isFolder
&&
env
.
isOpen
);
}
}
...
...
app/assets/javascripts/filtered_search/dropdown_utils.js
View file @
23cdae8e
...
@@ -35,7 +35,7 @@ export default class DropdownUtils {
...
@@ -35,7 +35,7 @@ export default class DropdownUtils {
// Remove the symbol for filter
// Remove the symbol for filter
if
(
value
[
0
]
===
filterSymbol
)
{
if
(
value
[
0
]
===
filterSymbol
)
{
symbol
=
value
[
0
]
;
[
symbol
]
=
value
;
value
=
value
.
slice
(
1
);
value
=
value
.
slice
(
1
);
}
}
...
@@ -162,7 +162,7 @@ export default class DropdownUtils {
...
@@ -162,7 +162,7 @@ export default class DropdownUtils {
// Determines the full search query (visual tokens + input)
// Determines the full search query (visual tokens + input)
static
getSearchQuery
(
untilInput
=
false
)
{
static
getSearchQuery
(
untilInput
=
false
)
{
const
container
=
FilteredSearchContainer
.
c
ontainer
;
const
{
container
}
=
FilteredSearchC
ontainer
;
const
tokens
=
[].
slice
.
call
(
container
.
querySelectorAll
(
'
.tokens-container li
'
));
const
tokens
=
[].
slice
.
call
(
container
.
querySelectorAll
(
'
.tokens-container li
'
));
const
values
=
[];
const
values
=
[];
...
@@ -220,7 +220,7 @@ export default class DropdownUtils {
...
@@ -220,7 +220,7 @@ export default class DropdownUtils {
}
}
static
getInputSelectionPosition
(
input
)
{
static
getInputSelectionPosition
(
input
)
{
const
selectionStart
=
input
.
selectionStar
t
;
const
{
selectionStart
}
=
inpu
t
;
let
inputValue
=
input
.
value
;
let
inputValue
=
input
.
value
;
// Replace all spaces inside quote marks with underscores
// Replace all spaces inside quote marks with underscores
// (will continue to match entire string until an end quote is found if any)
// (will continue to match entire string until an end quote is found if any)
...
...
app/assets/javascripts/filtered_search/filtered_search_dropdown_manager.js
View file @
23cdae8e
...
@@ -159,7 +159,7 @@ export default class FilteredSearchDropdownManager {
...
@@ -159,7 +159,7 @@ export default class FilteredSearchDropdownManager {
load
(
key
,
firstLoad
=
false
)
{
load
(
key
,
firstLoad
=
false
)
{
const
mappingKey
=
this
.
mapping
[
key
];
const
mappingKey
=
this
.
mapping
[
key
];
const
glClass
=
mappingKey
.
gl
;
const
glClass
=
mappingKey
.
gl
;
const
element
=
mappingKey
.
element
;
const
{
element
}
=
mappingKey
;
let
forceShowList
=
false
;
let
forceShowList
=
false
;
if
(
!
mappingKey
.
reference
)
{
if
(
!
mappingKey
.
reference
)
{
...
...
app/assets/javascripts/filtered_search/filtered_search_manager.js
View file @
23cdae8e
...
@@ -235,7 +235,7 @@ export default class FilteredSearchManager {
...
@@ -235,7 +235,7 @@ export default class FilteredSearchManager {
checkForEnter
(
e
)
{
checkForEnter
(
e
)
{
if
(
e
.
keyCode
===
38
||
e
.
keyCode
===
40
)
{
if
(
e
.
keyCode
===
38
||
e
.
keyCode
===
40
)
{
const
selectionStart
=
this
.
filteredSearchInput
.
selectionStar
t
;
const
{
selectionStart
}
=
this
.
filteredSearchInpu
t
;
e
.
preventDefault
();
e
.
preventDefault
();
this
.
filteredSearchInput
.
setSelectionRange
(
selectionStart
,
selectionStart
);
this
.
filteredSearchInput
.
setSelectionRange
(
selectionStart
,
selectionStart
);
...
@@ -496,7 +496,7 @@ export default class FilteredSearchManager {
...
@@ -496,7 +496,7 @@ export default class FilteredSearchManager {
// Replace underscore with hyphen in the sanitizedkey.
// Replace underscore with hyphen in the sanitizedkey.
// e.g. 'my_reaction' => 'my-reaction'
// e.g. 'my_reaction' => 'my-reaction'
sanitizedKey
=
sanitizedKey
.
replace
(
'
_
'
,
'
-
'
);
sanitizedKey
=
sanitizedKey
.
replace
(
'
_
'
,
'
-
'
);
const
symbol
=
match
.
symbol
;
const
{
symbol
}
=
match
;
let
quotationsToUse
=
''
;
let
quotationsToUse
=
''
;
if
(
sanitizedValue
.
indexOf
(
'
'
)
!==
-
1
)
{
if
(
sanitizedValue
.
indexOf
(
'
'
)
!==
-
1
)
{
...
...
app/assets/javascripts/filtered_search/filtered_search_visual_tokens.js
View file @
23cdae8e
...
@@ -101,7 +101,7 @@ export default class FilteredSearchVisualTokens {
...
@@ -101,7 +101,7 @@ export default class FilteredSearchVisualTokens {
static
updateLabelTokenColor
(
tokenValueContainer
,
tokenValue
)
{
static
updateLabelTokenColor
(
tokenValueContainer
,
tokenValue
)
{
const
filteredSearchInput
=
FilteredSearchContainer
.
container
.
querySelector
(
'
.filtered-search
'
);
const
filteredSearchInput
=
FilteredSearchContainer
.
container
.
querySelector
(
'
.filtered-search
'
);
const
baseEndpoint
=
filteredSearchInput
.
dataset
.
baseEndpoin
t
;
const
{
baseEndpoint
}
=
filteredSearchInput
.
datase
t
;
const
labelsEndpoint
=
FilteredSearchVisualTokens
.
getEndpointWithQueryParams
(
const
labelsEndpoint
=
FilteredSearchVisualTokens
.
getEndpointWithQueryParams
(
`
${
baseEndpoint
}
/labels.json`
,
`
${
baseEndpoint
}
/labels.json`
,
filteredSearchInput
.
dataset
.
endpointQueryParams
,
filteredSearchInput
.
dataset
.
endpointQueryParams
,
...
@@ -215,7 +215,7 @@ export default class FilteredSearchVisualTokens {
...
@@ -215,7 +215,7 @@ export default class FilteredSearchVisualTokens {
static
addFilterVisualToken
(
tokenName
,
tokenValue
,
canEdit
)
{
static
addFilterVisualToken
(
tokenName
,
tokenValue
,
canEdit
)
{
const
{
lastVisualToken
,
isLastVisualTokenValid
}
const
{
lastVisualToken
,
isLastVisualTokenValid
}
=
FilteredSearchVisualTokens
.
getLastVisualTokenBeforeInput
();
=
FilteredSearchVisualTokens
.
getLastVisualTokenBeforeInput
();
const
addVisualTokenElement
=
FilteredSearchVisualTokens
.
addVisualTokenElement
;
const
{
addVisualTokenElement
}
=
FilteredSearchVisualTokens
;
if
(
isLastVisualTokenValid
)
{
if
(
isLastVisualTokenValid
)
{
addVisualTokenElement
(
tokenName
,
tokenValue
,
false
,
canEdit
);
addVisualTokenElement
(
tokenName
,
tokenValue
,
false
,
canEdit
);
...
...
app/assets/javascripts/filtered_search/recent_searches_root.js
View file @
23cdae8e
...
@@ -29,7 +29,7 @@ class RecentSearchesRoot {
...
@@ -29,7 +29,7 @@ class RecentSearchesRoot {
}
}
render
()
{
render
()
{
const
state
=
this
.
store
.
stat
e
;
const
{
state
}
=
this
.
stor
e
;
this
.
vm
=
new
Vue
({
this
.
vm
=
new
Vue
({
el
:
this
.
wrapperElement
,
el
:
this
.
wrapperElement
,
components
:
{
components
:
{
...
...
app/assets/javascripts/gfm_auto_complete.js
View file @
23cdae8e
...
@@ -80,7 +80,7 @@ class GfmAutoComplete {
...
@@ -80,7 +80,7 @@ class GfmAutoComplete {
let
tpl
=
'
/${name}
'
;
let
tpl
=
'
/${name}
'
;
let
referencePrefix
=
null
;
let
referencePrefix
=
null
;
if
(
value
.
params
.
length
>
0
)
{
if
(
value
.
params
.
length
>
0
)
{
referencePrefix
=
value
.
params
[
0
][
0
]
;
[[
referencePrefix
]]
=
value
.
params
;
if
(
/^
[
@%~
]
/
.
test
(
referencePrefix
))
{
if
(
/^
[
@%~
]
/
.
test
(
referencePrefix
))
{
tpl
+=
'
<%- referencePrefix %>
'
;
tpl
+=
'
<%- referencePrefix %>
'
;
}
}
...
@@ -458,7 +458,7 @@ class GfmAutoComplete {
...
@@ -458,7 +458,7 @@ class GfmAutoComplete {
static
isLoading
(
data
)
{
static
isLoading
(
data
)
{
let
dataToInspect
=
data
;
let
dataToInspect
=
data
;
if
(
data
&&
data
.
length
>
0
)
{
if
(
data
&&
data
.
length
>
0
)
{
dataToInspect
=
data
[
0
]
;
[
dataToInspect
]
=
data
;
}
}
const
loadingState
=
GfmAutoComplete
.
defaultLoadingData
[
0
];
const
loadingState
=
GfmAutoComplete
.
defaultLoadingData
[
0
];
...
...
app/assets/javascripts/gl_dropdown.js
View file @
23cdae8e
...
@@ -613,7 +613,7 @@ GitLabDropdown = (function() {
...
@@ -613,7 +613,7 @@ GitLabDropdown = (function() {
};
};
GitLabDropdown
.
prototype
.
renderItem
=
function
(
data
,
group
,
index
)
{
GitLabDropdown
.
prototype
.
renderItem
=
function
(
data
,
group
,
index
)
{
var
field
,
fieldName
,
html
,
selected
,
text
,
url
,
value
,
rowHidden
;
var
field
,
html
,
selected
,
text
,
url
,
value
,
rowHidden
;
if
(
!
this
.
options
.
renderRow
)
{
if
(
!
this
.
options
.
renderRow
)
{
value
=
this
.
options
.
id
?
this
.
options
.
id
(
data
)
:
data
.
id
;
value
=
this
.
options
.
id
?
this
.
options
.
id
(
data
)
:
data
.
id
;
...
@@ -651,7 +651,7 @@ GitLabDropdown = (function() {
...
@@ -651,7 +651,7 @@ GitLabDropdown = (function() {
html
=
this
.
options
.
renderRow
.
call
(
this
.
options
,
data
,
this
);
html
=
this
.
options
.
renderRow
.
call
(
this
.
options
,
data
,
this
);
}
else
{
}
else
{
if
(
!
selected
)
{
if
(
!
selected
)
{
fieldName
=
this
.
options
.
fieldName
;
const
{
fieldName
}
=
this
.
options
;
if
(
value
)
{
if
(
value
)
{
field
=
this
.
dropdown
.
parent
().
find
(
`input[name='
${
fieldName
}
'][value='
${
value
}
']`
);
field
=
this
.
dropdown
.
parent
().
find
(
`input[name='
${
fieldName
}
'][value='
${
value
}
']`
);
...
@@ -705,7 +705,8 @@ GitLabDropdown = (function() {
...
@@ -705,7 +705,8 @@ GitLabDropdown = (function() {
GitLabDropdown
.
prototype
.
highlightTextMatches
=
function
(
text
,
term
)
{
GitLabDropdown
.
prototype
.
highlightTextMatches
=
function
(
text
,
term
)
{
const
occurrences
=
fuzzaldrinPlus
.
match
(
text
,
term
);
const
occurrences
=
fuzzaldrinPlus
.
match
(
text
,
term
);
const
indexOf
=
[].
indexOf
;
const
{
indexOf
}
=
[];
return
text
.
split
(
''
).
map
(
function
(
character
,
i
)
{
return
text
.
split
(
''
).
map
(
function
(
character
,
i
)
{
if
(
indexOf
.
call
(
occurrences
,
i
)
!==
-
1
)
{
if
(
indexOf
.
call
(
occurrences
,
i
)
!==
-
1
)
{
return
"
<b>
"
+
character
+
"
</b>
"
;
return
"
<b>
"
+
character
+
"
</b>
"
;
...
@@ -721,9 +722,9 @@ GitLabDropdown = (function() {
...
@@ -721,9 +722,9 @@ GitLabDropdown = (function() {
};
};
GitLabDropdown
.
prototype
.
rowClicked
=
function
(
el
)
{
GitLabDropdown
.
prototype
.
rowClicked
=
function
(
el
)
{
var
field
,
fieldName
,
groupName
,
isInput
,
selectedIndex
,
selectedObject
,
value
,
isMarking
;
var
field
,
groupName
,
isInput
,
selectedIndex
,
selectedObject
,
value
,
isMarking
;
fieldName
=
this
.
options
.
fieldName
;
const
{
fieldName
}
=
this
.
options
;
isInput
=
$
(
this
.
el
).
is
(
'
input
'
);
isInput
=
$
(
this
.
el
).
is
(
'
input
'
);
if
(
this
.
renderedData
)
{
if
(
this
.
renderedData
)
{
groupName
=
el
.
data
(
'
group
'
);
groupName
=
el
.
data
(
'
group
'
);
...
...
app/assets/javascripts/groups/index.js
View file @
23cdae8e
...
@@ -29,7 +29,7 @@ export default () => {
...
@@ -29,7 +29,7 @@ export default () => {
groupsApp
,
groupsApp
,
},
},
data
()
{
data
()
{
const
dataset
=
this
.
$options
.
el
.
dataset
;
const
{
dataset
}
=
this
.
$options
.
el
;
const
hideProjects
=
dataset
.
hideProjects
===
'
true
'
;
const
hideProjects
=
dataset
.
hideProjects
===
'
true
'
;
const
store
=
new
GroupsStore
(
hideProjects
);
const
store
=
new
GroupsStore
(
hideProjects
);
const
service
=
new
GroupsService
(
dataset
.
endpoint
);
const
service
=
new
GroupsService
(
dataset
.
endpoint
);
...
@@ -42,7 +42,7 @@ export default () => {
...
@@ -42,7 +42,7 @@ export default () => {
};
};
},
},
beforeMount
()
{
beforeMount
()
{
const
dataset
=
this
.
$options
.
el
.
dataset
;
const
{
dataset
}
=
this
.
$options
.
el
;
let
groupFilterList
=
null
;
let
groupFilterList
=
null
;
const
form
=
document
.
querySelector
(
dataset
.
formSel
);
const
form
=
document
.
querySelector
(
dataset
.
formSel
);
const
filter
=
document
.
querySelector
(
dataset
.
filterSel
);
const
filter
=
document
.
querySelector
(
dataset
.
filterSel
);
...
...
app/assets/javascripts/ide/components/file_finder/item.vue
View file @
23cdae8e
...
@@ -30,7 +30,7 @@ export default {
...
@@ -30,7 +30,7 @@ export default {
},
},
computed
:
{
computed
:
{
pathWithEllipsis
()
{
pathWithEllipsis
()
{
const
path
=
this
.
file
.
path
;
const
{
path
}
=
this
.
file
;
return
path
.
length
<
MAX_PATH_LENGTH
return
path
.
length
<
MAX_PATH_LENGTH
?
path
?
path
...
...
app/assets/javascripts/ide/components/new_dropdown/upload.vue
View file @
23cdae8e
...
@@ -23,6 +23,7 @@
...
@@ -23,6 +23,7 @@
let
{
result
}
=
target
;
let
{
result
}
=
target
;
if
(
!
isText
)
{
if
(
!
isText
)
{
// eslint-disable-next-line prefer-destructuring
result
=
result
.
split
(
'
base64,
'
)[
1
];
result
=
result
.
split
(
'
base64,
'
)[
1
];
}
}
...
...
app/assets/javascripts/ide/lib/diff/diff_worker.js
View file @
23cdae8e
...
@@ -2,7 +2,7 @@ import { computeDiff } from './diff';
...
@@ -2,7 +2,7 @@ import { computeDiff } from './diff';
// eslint-disable-next-line no-restricted-globals
// eslint-disable-next-line no-restricted-globals
self
.
addEventListener
(
'
message
'
,
(
e
)
=>
{
self
.
addEventListener
(
'
message
'
,
(
e
)
=>
{
const
data
=
e
.
data
;
const
{
data
}
=
e
;
// eslint-disable-next-line no-restricted-globals
// eslint-disable-next-line no-restricted-globals
self
.
postMessage
({
self
.
postMessage
({
...
...
app/assets/javascripts/ide/stores/actions/file.js
View file @
23cdae8e
...
@@ -8,7 +8,7 @@ import { setPageTitle } from '../utils';
...
@@ -8,7 +8,7 @@ import { setPageTitle } from '../utils';
import
{
viewerTypes
}
from
'
../../constants
'
;
import
{
viewerTypes
}
from
'
../../constants
'
;
export
const
closeFile
=
({
commit
,
state
,
dispatch
},
file
)
=>
{
export
const
closeFile
=
({
commit
,
state
,
dispatch
},
file
)
=>
{
const
path
=
file
.
path
;
const
{
path
}
=
file
;
const
indexOfClosedFile
=
state
.
openFiles
.
findIndex
(
f
=>
f
.
key
===
file
.
key
);
const
indexOfClosedFile
=
state
.
openFiles
.
findIndex
(
f
=>
f
.
key
===
file
.
key
);
const
fileWasActive
=
file
.
active
;
const
fileWasActive
=
file
.
active
;
...
...
app/assets/javascripts/image_diff/helpers/dom_helper.js
View file @
23cdae8e
...
@@ -2,7 +2,8 @@ export function setPositionDataAttribute(el, options) {
...
@@ -2,7 +2,8 @@ export function setPositionDataAttribute(el, options) {
// Update position data attribute so that the
// Update position data attribute so that the
// new comment form can use this data for ajax request
// new comment form can use this data for ajax request
const
{
x
,
y
,
width
,
height
}
=
options
;
const
{
x
,
y
,
width
,
height
}
=
options
;
const
position
=
el
.
dataset
.
position
;
const
{
position
}
=
el
.
dataset
;
const
positionObject
=
Object
.
assign
({},
JSON
.
parse
(
position
),
{
const
positionObject
=
Object
.
assign
({},
JSON
.
parse
(
position
),
{
x
,
x
,
y
,
y
,
...
...
app/assets/javascripts/image_diff/helpers/utils_helper.js
View file @
23cdae8e
...
@@ -40,8 +40,7 @@ export function getTargetSelection(event) {
...
@@ -40,8 +40,7 @@ export function getTargetSelection(event) {
const
x
=
event
.
offsetX
;
const
x
=
event
.
offsetX
;
const
y
=
event
.
offsetY
;
const
y
=
event
.
offsetY
;
const
width
=
imageEl
.
width
;
const
{
width
,
height
}
=
imageEl
;
const
height
=
imageEl
.
height
;
const
actualWidth
=
imageEl
.
naturalWidth
;
const
actualWidth
=
imageEl
.
naturalWidth
;
const
actualHeight
=
imageEl
.
naturalHeight
;
const
actualHeight
=
imageEl
.
naturalHeight
;
...
...
app/assets/javascripts/issuable/auto_width_dropdown_select.js
View file @
23cdae8e
...
@@ -10,7 +10,7 @@ class AutoWidthDropdownSelect {
...
@@ -10,7 +10,7 @@ class AutoWidthDropdownSelect {
}
}
init
()
{
init
()
{
const
dropdownClass
=
this
.
dropdownClas
s
;
const
{
dropdownClass
}
=
thi
s
;
this
.
$selectElement
.
select2
({
this
.
$selectElement
.
select2
({
dropdownCssClass
:
dropdownClass
,
dropdownCssClass
:
dropdownClass
,
...
AutoWidthDropdownSelect
.
selectOptions
(
this
.
dropdownClass
),
...
AutoWidthDropdownSelect
.
selectOptions
(
this
.
dropdownClass
),
...
...
app/assets/javascripts/jobs/job_details_bundle.js
View file @
23cdae8e
...
@@ -4,7 +4,7 @@ import jobHeader from './components/header.vue';
...
@@ -4,7 +4,7 @@ import jobHeader from './components/header.vue';
import
detailsBlock
from
'
./components/sidebar_details_block.vue
'
;
import
detailsBlock
from
'
./components/sidebar_details_block.vue
'
;
export
default
()
=>
{
export
default
()
=>
{
const
dataset
=
document
.
getElementById
(
'
js-job-details-vue
'
).
dataset
;
const
{
dataset
}
=
document
.
getElementById
(
'
js-job-details-vue
'
)
;
const
mediator
=
new
JobMediator
({
endpoint
:
dataset
.
endpoint
});
const
mediator
=
new
JobMediator
({
endpoint
:
dataset
.
endpoint
});
mediator
.
fetchJob
();
mediator
.
fetchJob
();
...
...
app/assets/javascripts/labels_select.js
View file @
23cdae8e
...
@@ -56,7 +56,7 @@ export default class LabelsSelect {
...
@@ -56,7 +56,7 @@ export default class LabelsSelect {
.
map
(
function
()
{
.
map
(
function
()
{
return
this
.
value
;
return
this
.
value
;
}).
get
();
}).
get
();
const
handleClick
=
options
.
handleClick
;
const
{
handleClick
}
=
options
;
$sidebarLabelTooltip
.
tooltip
();
$sidebarLabelTooltip
.
tooltip
();
...
@@ -215,7 +215,7 @@ export default class LabelsSelect {
...
@@ -215,7 +215,7 @@ export default class LabelsSelect {
}
}
else
{
else
{
if
(
label
.
color
!=
null
)
{
if
(
label
.
color
!=
null
)
{
color
=
label
.
color
[
0
]
;
[
color
]
=
label
.
color
;
}
}
}
}
if
(
color
)
{
if
(
color
)
{
...
@@ -243,7 +243,8 @@ export default class LabelsSelect {
...
@@ -243,7 +243,8 @@ export default class LabelsSelect {
var
$dropdownParent
=
$dropdown
.
parent
();
var
$dropdownParent
=
$dropdown
.
parent
();
var
$dropdownInputField
=
$dropdownParent
.
find
(
'
.dropdown-input-field
'
);
var
$dropdownInputField
=
$dropdownParent
.
find
(
'
.dropdown-input-field
'
);
var
isSelected
=
el
!==
null
?
el
.
hasClass
(
'
is-active
'
)
:
false
;
var
isSelected
=
el
!==
null
?
el
.
hasClass
(
'
is-active
'
)
:
false
;
var
title
=
selected
.
title
;
var
{
title
}
=
selected
;
var
selectedLabels
=
this
.
selected
;
var
selectedLabels
=
this
.
selected
;
if
(
$dropdownInputField
.
length
&&
$dropdownInputField
.
val
().
length
)
{
if
(
$dropdownInputField
.
length
&&
$dropdownInputField
.
val
().
length
)
{
...
@@ -382,7 +383,7 @@ export default class LabelsSelect {
...
@@ -382,7 +383,7 @@ export default class LabelsSelect {
}));
}));
}
}
else
{
else
{
var
labels
=
gl
.
issueBoards
.
BoardsStore
.
detail
.
issue
.
labels
;
var
{
labels
}
=
gl
.
issueBoards
.
BoardsStore
.
detail
.
issue
;
labels
=
labels
.
filter
(
function
(
selectedLabel
)
{
labels
=
labels
.
filter
(
function
(
selectedLabel
)
{
return
selectedLabel
.
id
!==
label
.
id
;
return
selectedLabel
.
id
!==
label
.
id
;
});
});
...
...
app/assets/javascripts/lib/utils/common_utils.js
View file @
23cdae8e
...
@@ -164,7 +164,7 @@ export const scrollToElement = element => {
...
@@ -164,7 +164,7 @@ export const scrollToElement = element => {
if
(
!
(
element
instanceof
$
))
{
if
(
!
(
element
instanceof
$
))
{
$el
=
$
(
element
);
$el
=
$
(
element
);
}
}
const
top
=
$el
.
offset
().
top
;
const
{
top
}
=
$el
.
offset
()
;
return
$
(
'
body, html
'
).
animate
(
return
$
(
'
body, html
'
).
animate
(
{
{
...
@@ -203,9 +203,7 @@ export const getSelectedFragment = () => {
...
@@ -203,9 +203,7 @@ export const getSelectedFragment = () => {
export
const
insertText
=
(
target
,
text
)
=>
{
export
const
insertText
=
(
target
,
text
)
=>
{
// Firefox doesn't support `document.execCommand('insertText', false, text)` on textareas
// Firefox doesn't support `document.execCommand('insertText', false, text)` on textareas
const
selectionStart
=
target
.
selectionStart
;
const
{
selectionStart
,
selectionEnd
,
value
}
=
target
;
const
selectionEnd
=
target
.
selectionEnd
;
const
value
=
target
.
value
;
const
textBefore
=
value
.
substring
(
0
,
selectionStart
);
const
textBefore
=
value
.
substring
(
0
,
selectionStart
);
const
textAfter
=
value
.
substring
(
selectionEnd
,
value
.
length
);
const
textAfter
=
value
.
substring
(
selectionEnd
,
value
.
length
);
...
@@ -245,7 +243,8 @@ export const nodeMatchesSelector = (node, selector) => {
...
@@ -245,7 +243,8 @@ export const nodeMatchesSelector = (node, selector) => {
// IE11 doesn't support `node.matches(selector)`
// IE11 doesn't support `node.matches(selector)`
let
parentNode
=
node
.
parentNode
;
let
{
parentNode
}
=
node
;
if
(
!
parentNode
)
{
if
(
!
parentNode
)
{
parentNode
=
document
.
createElement
(
'
div
'
);
parentNode
=
document
.
createElement
(
'
div
'
);
// eslint-disable-next-line no-param-reassign
// eslint-disable-next-line no-param-reassign
...
@@ -281,6 +280,8 @@ export const normalizeCRLFHeaders = headers => {
...
@@ -281,6 +280,8 @@ export const normalizeCRLFHeaders = headers => {
headersArray
.
forEach
(
header
=>
{
headersArray
.
forEach
(
header
=>
{
const
keyValue
=
header
.
split
(
'
:
'
);
const
keyValue
=
header
.
split
(
'
:
'
);
// eslint-disable-next-line prefer-destructuring
headersObject
[
keyValue
[
0
]]
=
keyValue
[
1
];
headersObject
[
keyValue
[
0
]]
=
keyValue
[
1
];
});
});
...
...
app/assets/javascripts/lib/utils/number_utils.js
View file @
23cdae8e
...
@@ -13,7 +13,7 @@ export function formatRelevantDigits(number) {
...
@@ -13,7 +13,7 @@ export function formatRelevantDigits(number) {
let
relevantDigits
=
0
;
let
relevantDigits
=
0
;
let
formattedNumber
=
''
;
let
formattedNumber
=
''
;
if
(
!
Number
.
isNaN
(
Number
(
number
)))
{
if
(
!
Number
.
isNaN
(
Number
(
number
)))
{
digitsLeft
=
number
.
toString
().
split
(
'
.
'
)[
0
]
;
[
digitsLeft
]
=
number
.
toString
().
split
(
'
.
'
)
;
switch
(
digitsLeft
.
length
)
{
switch
(
digitsLeft
.
length
)
{
case
1
:
case
1
:
relevantDigits
=
3
;
relevantDigits
=
3
;
...
...
app/assets/javascripts/merge_conflicts/merge_conflict_store.js
View file @
23cdae8e
...
@@ -156,7 +156,7 @@ import Cookies from 'js-cookie';
...
@@ -156,7 +156,7 @@ import Cookies from 'js-cookie';
return
0
;
return
0
;
}
}
const
files
=
this
.
state
.
conflictsData
.
files
;
const
{
files
}
=
this
.
state
.
conflictsData
;
let
count
=
0
;
let
count
=
0
;
files
.
forEach
((
file
)
=>
{
files
.
forEach
((
file
)
=>
{
...
@@ -313,7 +313,7 @@ import Cookies from 'js-cookie';
...
@@ -313,7 +313,7 @@ import Cookies from 'js-cookie';
},
},
isReadyToCommit
()
{
isReadyToCommit
()
{
const
files
=
this
.
state
.
conflictsData
.
files
;
const
{
files
}
=
this
.
state
.
conflictsData
;
const
hasCommitMessage
=
$
.
trim
(
this
.
state
.
conflictsData
.
commitMessage
).
length
;
const
hasCommitMessage
=
$
.
trim
(
this
.
state
.
conflictsData
.
commitMessage
).
length
;
let
unresolved
=
0
;
let
unresolved
=
0
;
...
...
app/assets/javascripts/merge_conflicts/merge_conflicts_bundle.js
View file @
23cdae8e
...
@@ -12,7 +12,7 @@ import syntaxHighlight from '../syntax_highlight';
...
@@ -12,7 +12,7 @@ import syntaxHighlight from '../syntax_highlight';
export
default
function
initMergeConflicts
()
{
export
default
function
initMergeConflicts
()
{
const
INTERACTIVE_RESOLVE_MODE
=
'
interactive
'
;
const
INTERACTIVE_RESOLVE_MODE
=
'
interactive
'
;
const
conflictsEl
=
document
.
querySelector
(
'
#conflicts
'
);
const
conflictsEl
=
document
.
querySelector
(
'
#conflicts
'
);
const
mergeConflictsStore
=
gl
.
mergeConflicts
.
mergeConflictsStore
;
const
{
mergeConflictsStore
}
=
gl
.
mergeConflicts
;
const
mergeConflictsService
=
new
MergeConflictsService
({
const
mergeConflictsService
=
new
MergeConflictsService
({
conflictsPath
:
conflictsEl
.
dataset
.
conflictsPath
,
conflictsPath
:
conflictsEl
.
dataset
.
conflictsPath
,
resolveConflictsPath
:
conflictsEl
.
dataset
.
resolveConflictsPath
,
resolveConflictsPath
:
conflictsEl
.
dataset
.
resolveConflictsPath
,
...
...
app/assets/javascripts/merge_request_tabs.js
View file @
23cdae8e
...
@@ -64,7 +64,7 @@ import Notes from './notes';
...
@@ -64,7 +64,7 @@ import Notes from './notes';
/* eslint-enable max-len */
/* eslint-enable max-len */
// Store the `location` object, allowing for easier stubbing in tests
// Store the `location` object, allowing for easier stubbing in tests
let
location
=
window
.
location
;
let
{
location
}
=
window
;
export
default
class
MergeRequestTabs
{
export
default
class
MergeRequestTabs
{
constructor
({
action
,
setUrl
,
stubLocation
}
=
{})
{
constructor
({
action
,
setUrl
,
stubLocation
}
=
{})
{
...
@@ -279,7 +279,7 @@ export default class MergeRequestTabs {
...
@@ -279,7 +279,7 @@ export default class MergeRequestTabs {
mountPipelinesView
()
{
mountPipelinesView
()
{
const
pipelineTableViewEl
=
document
.
querySelector
(
'
#commit-pipeline-table-view
'
);
const
pipelineTableViewEl
=
document
.
querySelector
(
'
#commit-pipeline-table-view
'
);
const
CommitPipelinesTable
=
gl
.
CommitPipelinesTable
;
const
{
CommitPipelinesTable
}
=
gl
;
this
.
commitPipelinesTable
=
new
CommitPipelinesTable
({
this
.
commitPipelinesTable
=
new
CommitPipelinesTable
({
propsData
:
{
propsData
:
{
endpoint
:
pipelineTableViewEl
.
dataset
.
endpoint
,
endpoint
:
pipelineTableViewEl
.
dataset
.
endpoint
,
...
...
app/assets/javascripts/monitoring/utils/multiple_time_series.js
View file @
23cdae8e
...
@@ -41,10 +41,10 @@ function queryTimeSeries(query, graphWidth, graphHeight, graphHeightOffset, xDom
...
@@ -41,10 +41,10 @@ function queryTimeSeries(query, graphWidth, graphHeight, graphHeightOffset, xDom
}
else
{
}
else
{
const
unusedColors
=
_
.
difference
(
defaultColorOrder
,
usedColors
);
const
unusedColors
=
_
.
difference
(
defaultColorOrder
,
usedColors
);
if
(
unusedColors
.
length
>
0
)
{
if
(
unusedColors
.
length
>
0
)
{
pick
=
unusedColors
[
0
]
;
[
pick
]
=
unusedColors
;
}
else
{
}
else
{
usedColors
=
[];
usedColors
=
[];
pick
=
defaultColorOrder
[
0
]
;
[
pick
]
=
defaultColorOrder
;
}
}
}
}
usedColors
.
push
(
pick
);
usedColors
.
push
(
pick
);
...
...
app/assets/javascripts/network/branch_graph.js
View file @
23cdae8e
...
@@ -101,8 +101,8 @@ export default (function() {
...
@@ -101,8 +101,8 @@ export default (function() {
};
};
BranchGraph
.
prototype
.
buildGraph
=
function
()
{
BranchGraph
.
prototype
.
buildGraph
=
function
()
{
var
cuday
,
cumonth
,
day
,
j
,
len
,
mm
,
r
,
r
ef
;
var
cuday
,
cumonth
,
day
,
j
,
len
,
mm
,
ref
;
r
=
this
.
r
;
const
{
r
}
=
this
;
cuday
=
0
;
cuday
=
0
;
cumonth
=
""
;
cumonth
=
""
;
r
.
rect
(
0
,
0
,
40
,
this
.
barHeight
).
attr
({
r
.
rect
(
0
,
0
,
40
,
this
.
barHeight
).
attr
({
...
@@ -121,7 +121,7 @@ export default (function() {
...
@@ -121,7 +121,7 @@ export default (function() {
font
:
"
12px Monaco, monospace
"
,
font
:
"
12px Monaco, monospace
"
,
fill
:
"
#BBB
"
fill
:
"
#BBB
"
});
});
cuday
=
day
[
0
]
;
[
cuday
]
=
day
;
}
}
if
(
cumonth
!==
day
[
1
])
{
if
(
cumonth
!==
day
[
1
])
{
// Months
// Months
...
@@ -129,6 +129,8 @@ export default (function() {
...
@@ -129,6 +129,8 @@ export default (function() {
font
:
"
12px Monaco, monospace
"
,
font
:
"
12px Monaco, monospace
"
,
fill
:
"
#EEE
"
fill
:
"
#EEE
"
});
});
// eslint-disable-next-line prefer-destructuring
cumonth
=
day
[
1
];
cumonth
=
day
[
1
];
}
}
}
}
...
@@ -169,8 +171,8 @@ export default (function() {
...
@@ -169,8 +171,8 @@ export default (function() {
};
};
BranchGraph
.
prototype
.
bindEvents
=
function
()
{
BranchGraph
.
prototype
.
bindEvents
=
function
()
{
var
element
;
const
{
element
}
=
this
;
element
=
this
.
element
;
return
$
(
element
).
scroll
((
function
(
_this
)
{
return
$
(
element
).
scroll
((
function
(
_this
)
{
return
function
(
event
)
{
return
function
(
event
)
{
return
_this
.
renderPartialGraph
();
return
_this
.
renderPartialGraph
();
...
@@ -207,11 +209,13 @@ export default (function() {
...
@@ -207,11 +209,13 @@ export default (function() {
};
};
BranchGraph
.
prototype
.
appendLabel
=
function
(
x
,
y
,
commit
)
{
BranchGraph
.
prototype
.
appendLabel
=
function
(
x
,
y
,
commit
)
{
var
label
,
r
,
rect
,
shortrefs
,
text
,
textbox
,
triangle
;
var
label
,
rect
,
shortrefs
,
text
,
textbox
,
triangle
;
if
(
!
commit
.
refs
)
{
if
(
!
commit
.
refs
)
{
return
;
return
;
}
}
r
=
this
.
r
;
const
{
r
}
=
this
;
shortrefs
=
commit
.
refs
;
shortrefs
=
commit
.
refs
;
// Truncate if longer than 15 chars
// Truncate if longer than 15 chars
if
(
shortrefs
.
length
>
17
)
{
if
(
shortrefs
.
length
>
17
)
{
...
@@ -242,11 +246,8 @@ export default (function() {
...
@@ -242,11 +246,8 @@ export default (function() {
};
};
BranchGraph
.
prototype
.
appendAnchor
=
function
(
x
,
y
,
commit
)
{
BranchGraph
.
prototype
.
appendAnchor
=
function
(
x
,
y
,
commit
)
{
var
anchor
,
options
,
r
,
top
;
const
{
r
,
top
,
options
}
=
this
;
r
=
this
.
r
;
const
anchor
=
r
.
circle
(
x
,
y
,
10
).
attr
({
top
=
this
.
top
;
options
=
this
.
options
;
anchor
=
r
.
circle
(
x
,
y
,
10
).
attr
({
fill
:
"
#000
"
,
fill
:
"
#000
"
,
opacity
:
0
,
opacity
:
0
,
cursor
:
"
pointer
"
cursor
:
"
pointer
"
...
@@ -262,14 +263,15 @@ export default (function() {
...
@@ -262,14 +263,15 @@ export default (function() {
};
};
BranchGraph
.
prototype
.
drawDot
=
function
(
x
,
y
,
commit
)
{
BranchGraph
.
prototype
.
drawDot
=
function
(
x
,
y
,
commit
)
{
var
avatar_box_x
,
avatar_box_y
,
r
;
const
{
r
}
=
this
;
r
=
this
.
r
;
r
.
circle
(
x
,
y
,
3
).
attr
({
r
.
circle
(
x
,
y
,
3
).
attr
({
fill
:
this
.
colors
[
commit
.
space
],
fill
:
this
.
colors
[
commit
.
space
],
stroke
:
"
none
"
stroke
:
"
none
"
});
});
avatar_box_x
=
this
.
offsetX
+
this
.
unitSpace
*
this
.
mspace
+
10
;
avatar_box_y
=
y
-
10
;
const
avatar_box_x
=
this
.
offsetX
+
this
.
unitSpace
*
this
.
mspace
+
10
;
const
avatar_box_y
=
y
-
10
;
r
.
rect
(
avatar_box_x
,
avatar_box_y
,
20
,
20
).
attr
({
r
.
rect
(
avatar_box_x
,
avatar_box_y
,
20
,
20
).
attr
({
stroke
:
this
.
colors
[
commit
.
space
],
stroke
:
this
.
colors
[
commit
.
space
],
"
stroke-width
"
:
2
"
stroke-width
"
:
2
...
@@ -282,10 +284,10 @@ export default (function() {
...
@@ -282,10 +284,10 @@ export default (function() {
};
};
BranchGraph
.
prototype
.
drawLines
=
function
(
x
,
y
,
commit
)
{
BranchGraph
.
prototype
.
drawLines
=
function
(
x
,
y
,
commit
)
{
var
arrow
,
color
,
i
,
j
,
len
,
offset
,
parent
,
parentCommit
,
parentX1
,
parentX2
,
parentY
,
r
,
ref
,
results
,
route
;
var
arrow
,
color
,
i
,
len
,
offset
,
parent
,
parentCommit
,
parentX1
,
parentX2
,
parentY
,
route
;
r
=
this
.
r
;
const
{
r
}
=
this
;
ref
=
commit
.
parents
;
const
ref
=
commit
.
parents
;
results
=
[];
const
results
=
[];
for
(
i
=
0
,
len
=
ref
.
length
;
i
<
len
;
i
+=
1
)
{
for
(
i
=
0
,
len
=
ref
.
length
;
i
<
len
;
i
+=
1
)
{
parent
=
ref
[
i
];
parent
=
ref
[
i
];
...
@@ -331,11 +333,10 @@ export default (function() {
...
@@ -331,11 +333,10 @@ export default (function() {
};
};
BranchGraph
.
prototype
.
markCommit
=
function
(
commit
)
{
BranchGraph
.
prototype
.
markCommit
=
function
(
commit
)
{
var
r
,
x
,
y
;
if
(
commit
.
id
===
this
.
options
.
commit_id
)
{
if
(
commit
.
id
===
this
.
options
.
commit_id
)
{
r
=
this
.
r
;
const
{
r
}
=
this
;
x
=
this
.
offsetX
+
this
.
unitSpace
*
(
this
.
mspace
-
commit
.
space
);
const
x
=
this
.
offsetX
+
this
.
unitSpace
*
(
this
.
mspace
-
commit
.
space
);
y
=
this
.
offsetY
+
this
.
unitTime
*
commit
.
time
;
const
y
=
this
.
offsetY
+
this
.
unitTime
*
commit
.
time
;
r
.
path
([
"
M
"
,
x
+
5
,
y
,
"
L
"
,
x
+
15
,
y
+
4
,
"
L
"
,
x
+
15
,
y
-
4
,
"
Z
"
]).
attr
({
r
.
path
([
"
M
"
,
x
+
5
,
y
,
"
L
"
,
x
+
15
,
y
+
4
,
"
L
"
,
x
+
15
,
y
-
4
,
"
Z
"
]).
attr
({
fill
:
"
#000
"
,
fill
:
"
#000
"
,
"
fill-opacity
"
:
.
5
,
"
fill-opacity
"
:
.
5
,
...
...
app/assets/javascripts/new_branch_form.js
View file @
23cdae8e
...
@@ -52,7 +52,7 @@ export default class NewBranchForm {
...
@@ -52,7 +52,7 @@ export default class NewBranchForm {
validate
()
{
validate
()
{
var
errorMessage
,
errors
,
formatter
,
unique
,
validator
;
var
errorMessage
,
errors
,
formatter
,
unique
,
validator
;
const
indexOf
=
[].
indexOf
;
const
{
indexOf
}
=
[]
;
this
.
branchNameError
.
empty
();
this
.
branchNameError
.
empty
();
unique
=
function
(
values
,
value
)
{
unique
=
function
(
values
,
value
)
{
...
...
app/assets/javascripts/notes.js
View file @
23cdae8e
...
@@ -311,7 +311,7 @@ export default class Notes {
...
@@ -311,7 +311,7 @@ export default class Notes {
},
},
})
})
.
then
(({
data
})
=>
{
.
then
(({
data
})
=>
{
const
notes
=
data
.
notes
;
const
{
notes
}
=
data
;
this
.
last_fetched_at
=
data
.
last_fetched_at
;
this
.
last_fetched_at
=
data
.
last_fetched_at
;
this
.
setPollingInterval
(
data
.
notes
.
length
);
this
.
setPollingInterval
(
data
.
notes
.
length
);
$
.
each
(
notes
,
(
i
,
note
)
=>
this
.
renderNote
(
note
));
$
.
each
(
notes
,
(
i
,
note
)
=>
this
.
renderNote
(
note
));
...
...
app/assets/javascripts/notes/components/notes_app.vue
View file @
23cdae8e
...
@@ -72,7 +72,7 @@ export default {
...
@@ -72,7 +72,7 @@ export default {
},
},
mounted
()
{
mounted
()
{
this
.
fetchNotes
();
this
.
fetchNotes
();
const
parentElement
=
this
.
$el
.
parentElement
;
const
{
parentElement
}
=
this
.
$el
;
if
(
parentElement
&&
parentElement
.
classList
.
contains
(
'
js-vue-notes-event
'
))
{
if
(
parentElement
&&
parentElement
.
classList
.
contains
(
'
js-vue-notes-event
'
))
{
parentElement
.
addEventListener
(
'
toggleAward
'
,
event
=>
{
parentElement
.
addEventListener
(
'
toggleAward
'
,
event
=>
{
...
...
app/assets/javascripts/notes/services/notes_service.js
View file @
23cdae8e
...
@@ -28,7 +28,7 @@ export default {
...
@@ -28,7 +28,7 @@ export default {
},
},
poll
(
data
=
{})
{
poll
(
data
=
{})
{
const
endpoint
=
data
.
notesData
.
notesPath
;
const
endpoint
=
data
.
notesData
.
notesPath
;
const
lastFetchedAt
=
data
.
lastFetchedAt
;
const
{
lastFetchedAt
}
=
data
;
const
options
=
{
const
options
=
{
headers
:
{
headers
:
{
'
X-Last-Fetched-At
'
:
lastFetchedAt
?
`
${
lastFetchedAt
}
`
:
undefined
,
'
X-Last-Fetched-At
'
:
lastFetchedAt
?
`
${
lastFetchedAt
}
`
:
undefined
,
...
...
app/assets/javascripts/pages/admin/users/components/delete_user_modal.vue
View file @
23cdae8e
...
@@ -96,7 +96,7 @@
...
@@ -96,7 +96,7 @@
this
.
enteredUsername
=
''
;
this
.
enteredUsername
=
''
;
},
},
onSecondaryAction
()
{
onSecondaryAction
()
{
const
form
=
this
.
$refs
.
form
;
const
{
form
}
=
this
.
$refs
;
form
.
action
=
this
.
blockUserUrl
;
form
.
action
=
this
.
blockUserUrl
;
this
.
$refs
.
method
.
value
=
'
put
'
;
this
.
$refs
.
method
.
value
=
'
put
'
;
...
...
app/assets/javascripts/pages/dashboard/todos/index/todos.js
View file @
23cdae8e
...
@@ -61,7 +61,7 @@ export default class Todos {
...
@@ -61,7 +61,7 @@ export default class Todos {
e
.
stopPropagation
();
e
.
stopPropagation
();
e
.
preventDefault
();
e
.
preventDefault
();
const
target
=
e
.
target
;
const
{
target
}
=
e
;
target
.
setAttribute
(
'
disabled
'
,
true
);
target
.
setAttribute
(
'
disabled
'
,
true
);
target
.
classList
.
add
(
'
disabled
'
);
target
.
classList
.
add
(
'
disabled
'
);
...
...
app/assets/javascripts/pages/projects/graphs/show/stat_graph_contributors.js
View file @
23cdae8e
...
@@ -80,10 +80,11 @@ export default (function() {
...
@@ -80,10 +80,11 @@ export default (function() {
};
};
ContributorsStatGraph
.
prototype
.
redraw_authors
=
function
()
{
ContributorsStatGraph
.
prototype
.
redraw_authors
=
function
()
{
var
author_commits
,
x_domain
;
$
(
"
ol
"
).
html
(
""
);
$
(
"
ol
"
).
html
(
""
);
x_domain
=
ContributorsGraph
.
prototype
.
x_domain
;
author_commits
=
ContributorsStatGraphUtil
.
get_author_data
(
this
.
parsed_log
,
this
.
field
,
x_domain
);
const
{
x_domain
}
=
ContributorsGraph
.
prototype
;
const
author_commits
=
ContributorsStatGraphUtil
.
get_author_data
(
this
.
parsed_log
,
this
.
field
,
x_domain
);
return
_
.
each
(
author_commits
,
(
function
(
_this
)
{
return
_
.
each
(
author_commits
,
(
function
(
_this
)
{
return
function
(
d
)
{
return
function
(
d
)
{
_this
.
redraw_author_commit_info
(
d
);
_this
.
redraw_author_commit_info
(
d
);
...
@@ -102,7 +103,7 @@ export default (function() {
...
@@ -102,7 +103,7 @@ export default (function() {
};
};
ContributorsStatGraph
.
prototype
.
change_date_header
=
function
()
{
ContributorsStatGraph
.
prototype
.
change_date_header
=
function
()
{
const
x_domain
=
ContributorsGraph
.
prototype
.
x_domain
;
const
{
x_domain
}
=
ContributorsGraph
.
prototype
;
const
formattedDateRange
=
sprintf
(
const
formattedDateRange
=
sprintf
(
s__
(
'
ContributorsPage|%{startDate} – %{endDate}
'
),
s__
(
'
ContributorsPage|%{startDate} – %{endDate}
'
),
{
{
...
...
app/assets/javascripts/pages/projects/settings/ci_cd/show/index.js
View file @
23cdae8e
...
@@ -28,7 +28,7 @@ document.addEventListener('DOMContentLoaded', () => {
...
@@ -28,7 +28,7 @@ document.addEventListener('DOMContentLoaded', () => {
const
autoDevOpsExtraSettings
=
document
.
querySelector
(
'
.js-extra-settings
'
);
const
autoDevOpsExtraSettings
=
document
.
querySelector
(
'
.js-extra-settings
'
);
autoDevOpsSettings
.
addEventListener
(
'
click
'
,
event
=>
{
autoDevOpsSettings
.
addEventListener
(
'
click
'
,
event
=>
{
const
target
=
event
.
targe
t
;
const
{
target
}
=
even
t
;
if
(
target
.
classList
.
contains
(
'
js-toggle-extra-settings
'
))
{
if
(
target
.
classList
.
contains
(
'
js-toggle-extra-settings
'
))
{
autoDevOpsExtraSettings
.
classList
.
toggle
(
autoDevOpsExtraSettings
.
classList
.
toggle
(
'
hidden
'
,
'
hidden
'
,
...
...
app/assets/javascripts/pipelines/pipeline_details_bundle.js
View file @
23cdae8e
...
@@ -10,7 +10,7 @@ import eventHub from './event_hub';
...
@@ -10,7 +10,7 @@ import eventHub from './event_hub';
Vue
.
use
(
Translate
);
Vue
.
use
(
Translate
);
export
default
()
=>
{
export
default
()
=>
{
const
dataset
=
document
.
querySelector
(
'
.js-pipeline-details-vue
'
).
dataset
;
const
{
dataset
}
=
document
.
querySelector
(
'
.js-pipeline-details-vue
'
)
;
const
mediator
=
new
PipelinesMediator
({
endpoint
:
dataset
.
endpoint
});
const
mediator
=
new
PipelinesMediator
({
endpoint
:
dataset
.
endpoint
});
...
...
app/assets/javascripts/pipelines/services/pipelines_service.js
View file @
23cdae8e
...
@@ -19,7 +19,7 @@ export default class PipelinesService {
...
@@ -19,7 +19,7 @@ export default class PipelinesService {
getPipelines
(
data
=
{})
{
getPipelines
(
data
=
{})
{
const
{
scope
,
page
}
=
data
;
const
{
scope
,
page
}
=
data
;
const
CancelToken
=
axios
.
CancelToken
;
const
{
CancelToken
}
=
axios
;
this
.
cancelationSource
=
CancelToken
.
source
();
this
.
cancelationSource
=
CancelToken
.
source
();
...
...
app/assets/javascripts/preview_markdown.js
View file @
23cdae8e
...
@@ -43,7 +43,7 @@ MarkdownPreview.prototype.showPreview = function ($form) {
...
@@ -43,7 +43,7 @@ MarkdownPreview.prototype.showPreview = function ($form) {
this
.
fetchMarkdownPreview
(
mdText
,
url
,
(
function
(
response
)
{
this
.
fetchMarkdownPreview
(
mdText
,
url
,
(
function
(
response
)
{
var
body
;
var
body
;
if
(
response
.
body
.
length
>
0
)
{
if
(
response
.
body
.
length
>
0
)
{
body
=
response
.
body
;
({
body
}
=
response
)
;
}
else
{
}
else
{
body
=
this
.
emptyMessage
;
body
=
this
.
emptyMessage
;
}
}
...
...
app/assets/javascripts/profile/gl_crop.js
View file @
23cdae8e
...
@@ -85,11 +85,10 @@ import _ from 'underscore';
...
@@ -85,11 +85,10 @@ import _ from 'underscore';
cropBoxResizable
:
false
,
cropBoxResizable
:
false
,
toggleDragModeOnDblclick
:
false
,
toggleDragModeOnDblclick
:
false
,
built
:
function
()
{
built
:
function
()
{
var
$image
,
container
,
cropBoxHeight
,
cropBoxWidth
;
const
$image
=
$
(
this
);
$image
=
$
(
this
);
const
container
=
$image
.
cropper
(
'
getContainerData
'
);
container
=
$image
.
cropper
(
'
getContainerData
'
);
const
{
cropBoxWidth
,
cropBoxHeight
}
=
_this
;
cropBoxWidth
=
_this
.
cropBoxWidth
;
cropBoxHeight
=
_this
.
cropBoxHeight
;
return
$image
.
cropper
(
'
setCropBoxData
'
,
{
return
$image
.
cropper
(
'
setCropBoxData
'
,
{
width
:
cropBoxWidth
,
width
:
cropBoxWidth
,
height
:
cropBoxHeight
,
height
:
cropBoxHeight
,
...
@@ -136,7 +135,7 @@ import _ from 'underscore';
...
@@ -136,7 +135,7 @@ import _ from 'underscore';
}
}
dataURLtoBlob
(
dataURL
)
{
dataURLtoBlob
(
dataURL
)
{
var
array
,
binary
,
i
,
k
,
len
,
v
;
var
array
,
binary
,
i
,
len
,
v
;
binary
=
atob
(
dataURL
.
split
(
'
,
'
)[
1
]);
binary
=
atob
(
dataURL
.
split
(
'
,
'
)[
1
]);
array
=
[];
array
=
[];
...
...
app/assets/javascripts/project_find_file.js
View file @
23cdae8e
...
@@ -88,7 +88,7 @@ export default class ProjectFindFile {
...
@@ -88,7 +88,7 @@ export default class ProjectFindFile {
// render result
// render result
renderList
(
filePaths
,
searchText
)
{
renderList
(
filePaths
,
searchText
)
{
var
blobItemUrl
,
filePath
,
html
,
i
,
j
,
len
,
matches
,
results
;
var
blobItemUrl
,
filePath
,
html
,
i
,
len
,
matches
,
results
;
this
.
element
.
find
(
"
.tree-table > tbody
"
).
empty
();
this
.
element
.
find
(
"
.tree-table > tbody
"
).
empty
();
results
=
[];
results
=
[];
...
...
app/assets/javascripts/projects/tree/components/commit_pipeline_status_component.vue
View file @
23cdae8e
...
@@ -47,7 +47,7 @@
...
@@ -47,7 +47,7 @@
},
},
methods
:
{
methods
:
{
successCallback
(
res
)
{
successCallback
(
res
)
{
const
pipelines
=
res
.
data
.
pipelines
;
const
{
pipelines
}
=
res
.
data
;
if
(
pipelines
.
length
>
0
)
{
if
(
pipelines
.
length
>
0
)
{
// The pipeline entity always keeps the latest pipeline info on the `details.status`
// The pipeline entity always keeps the latest pipeline info on the `details.status`
this
.
ciStatus
=
pipelines
[
0
].
details
.
status
;
this
.
ciStatus
=
pipelines
[
0
].
details
.
status
;
...
...
app/assets/javascripts/projects_dropdown/index.js
View file @
23cdae8e
...
@@ -31,7 +31,7 @@ document.addEventListener('DOMContentLoaded', () => {
...
@@ -31,7 +31,7 @@ document.addEventListener('DOMContentLoaded', () => {
projectsDropdownApp
,
projectsDropdownApp
,
},
},
data
()
{
data
()
{
const
dataset
=
this
.
$options
.
el
.
dataset
;
const
{
dataset
}
=
this
.
$options
.
el
;
const
store
=
new
ProjectsStore
();
const
store
=
new
ProjectsStore
();
const
service
=
new
ProjectsService
(
dataset
.
userName
);
const
service
=
new
ProjectsService
(
dataset
.
userName
);
...
...
app/assets/javascripts/registry/index.js
View file @
23cdae8e
...
@@ -10,7 +10,7 @@ export default () => new Vue({
...
@@ -10,7 +10,7 @@ export default () => new Vue({
registryApp
,
registryApp
,
},
},
data
()
{
data
()
{
const
dataset
=
document
.
querySelector
(
this
.
$options
.
el
).
dataset
;
const
{
dataset
}
=
document
.
querySelector
(
this
.
$options
.
el
)
;
return
{
return
{
endpoint
:
dataset
.
endpoint
,
endpoint
:
dataset
.
endpoint
,
};
};
...
...
app/assets/javascripts/registry/stores/actions.js
View file @
23cdae8e
...
@@ -20,7 +20,7 @@ export const fetchList = ({ commit }, { repo, page }) => {
...
@@ -20,7 +20,7 @@ export const fetchList = ({ commit }, { repo, page }) => {
commit
(
types
.
TOGGLE_REGISTRY_LIST_LOADING
,
repo
);
commit
(
types
.
TOGGLE_REGISTRY_LIST_LOADING
,
repo
);
return
Vue
.
http
.
get
(
repo
.
tagsPath
,
{
params
:
{
page
}
}).
then
(
response
=>
{
return
Vue
.
http
.
get
(
repo
.
tagsPath
,
{
params
:
{
page
}
}).
then
(
response
=>
{
const
headers
=
response
.
headers
;
const
{
headers
}
=
response
;
return
response
.
json
().
then
(
resp
=>
{
return
response
.
json
().
then
(
resp
=>
{
commit
(
types
.
TOGGLE_REGISTRY_LIST_LOADING
,
repo
);
commit
(
types
.
TOGGLE_REGISTRY_LIST_LOADING
,
repo
);
...
...
app/assets/javascripts/smart_interval.js
View file @
23cdae8e
...
@@ -42,8 +42,7 @@ export default class SmartInterval {
...
@@ -42,8 +42,7 @@ export default class SmartInterval {
/* public */
/* public */
start
()
{
start
()
{
const
cfg
=
this
.
cfg
;
const
{
cfg
,
state
}
=
this
;
const
state
=
this
.
state
;
if
(
cfg
.
immediateExecution
&&
!
this
.
isLoading
)
{
if
(
cfg
.
immediateExecution
&&
!
this
.
isLoading
)
{
cfg
.
immediateExecution
=
false
;
cfg
.
immediateExecution
=
false
;
...
@@ -100,7 +99,7 @@ export default class SmartInterval {
...
@@ -100,7 +99,7 @@ export default class SmartInterval {
/* private */
/* private */
initInterval
()
{
initInterval
()
{
const
cfg
=
this
.
cfg
;
const
{
cfg
}
=
this
;
if
(
!
cfg
.
lazyStart
)
{
if
(
!
cfg
.
lazyStart
)
{
this
.
start
();
this
.
start
();
...
@@ -151,7 +150,7 @@ export default class SmartInterval {
...
@@ -151,7 +150,7 @@ export default class SmartInterval {
}
}
incrementInterval
()
{
incrementInterval
()
{
const
cfg
=
this
.
cfg
;
const
{
cfg
}
=
this
;
const
currentInterval
=
this
.
getCurrentInterval
();
const
currentInterval
=
this
.
getCurrentInterval
();
if
(
cfg
.
hiddenInterval
&&
!
this
.
isPageVisible
())
return
;
if
(
cfg
.
hiddenInterval
&&
!
this
.
isPageVisible
())
return
;
let
nextInterval
=
currentInterval
*
cfg
.
incrementByFactorOf
;
let
nextInterval
=
currentInterval
*
cfg
.
incrementByFactorOf
;
...
@@ -166,7 +165,7 @@ export default class SmartInterval {
...
@@ -166,7 +165,7 @@ export default class SmartInterval {
isPageVisible
()
{
return
this
.
state
.
pageVisibility
===
'
visible
'
;
}
isPageVisible
()
{
return
this
.
state
.
pageVisibility
===
'
visible
'
;
}
stopTimer
()
{
stopTimer
()
{
const
state
=
this
.
state
;
const
{
state
}
=
this
;
state
.
intervalId
=
window
.
clearInterval
(
state
.
intervalId
);
state
.
intervalId
=
window
.
clearInterval
(
state
.
intervalId
);
}
}
...
...
app/assets/javascripts/test_utils/simulate_drag.js
View file @
23cdae8e
...
@@ -38,14 +38,14 @@ function simulateEvent(el, type, options = {}) {
...
@@ -38,14 +38,14 @@ function simulateEvent(el, type, options = {}) {
function
isLast
(
target
)
{
function
isLast
(
target
)
{
const
el
=
typeof
target
.
el
===
'
string
'
?
document
.
getElementById
(
target
.
el
.
substr
(
1
))
:
target
.
el
;
const
el
=
typeof
target
.
el
===
'
string
'
?
document
.
getElementById
(
target
.
el
.
substr
(
1
))
:
target
.
el
;
const
children
=
el
.
children
;
const
{
children
}
=
el
;
return
children
.
length
-
1
===
target
.
index
;
return
children
.
length
-
1
===
target
.
index
;
}
}
function
getTarget
(
target
)
{
function
getTarget
(
target
)
{
const
el
=
typeof
target
.
el
===
'
string
'
?
document
.
getElementById
(
target
.
el
.
substr
(
1
))
:
target
.
el
;
const
el
=
typeof
target
.
el
===
'
string
'
?
document
.
getElementById
(
target
.
el
.
substr
(
1
))
:
target
.
el
;
const
children
=
el
.
children
;
const
{
children
}
=
el
;
return
(
return
(
children
[
target
.
index
]
||
children
[
target
.
index
]
||
...
...
app/assets/javascripts/users_select.js
View file @
23cdae8e
...
@@ -250,7 +250,6 @@ function UsersSelect(currentUser, els, options = {}) {
...
@@ -250,7 +250,6 @@ function UsersSelect(currentUser, els, options = {}) {
let
anyUser
;
let
anyUser
;
let
index
;
let
index
;
let
j
;
let
len
;
let
len
;
let
name
;
let
name
;
let
obj
;
let
obj
;
...
@@ -501,7 +500,7 @@ function UsersSelect(currentUser, els, options = {}) {
...
@@ -501,7 +500,7 @@ function UsersSelect(currentUser, els, options = {}) {
if
(
this
.
multiSelect
)
{
if
(
this
.
multiSelect
)
{
selected
=
getSelected
().
find
(
u
=>
user
.
id
===
u
);
selected
=
getSelected
().
find
(
u
=>
user
.
id
===
u
);
const
fieldName
=
this
.
fieldName
;
const
{
fieldName
}
=
this
;
const
field
=
$dropdown
.
closest
(
'
.selectbox
'
).
find
(
"
input[name='
"
+
fieldName
+
"
'][value='
"
+
user
.
id
+
"
']
"
);
const
field
=
$dropdown
.
closest
(
'
.selectbox
'
).
find
(
"
input[name='
"
+
fieldName
+
"
'][value='
"
+
user
.
id
+
"
']
"
);
if
(
field
.
length
)
{
if
(
field
.
length
)
{
...
@@ -553,7 +552,7 @@ function UsersSelect(currentUser, els, options = {}) {
...
@@ -553,7 +552,7 @@ function UsersSelect(currentUser, els, options = {}) {
minimumInputLength
:
0
,
minimumInputLength
:
0
,
query
:
function
(
query
)
{
query
:
function
(
query
)
{
return
_this
.
users
(
query
.
term
,
options
,
function
(
users
)
{
return
_this
.
users
(
query
.
term
,
options
,
function
(
users
)
{
var
anyUser
,
data
,
emailUser
,
index
,
j
,
len
,
name
,
nullUser
,
obj
,
ref
;
var
anyUser
,
data
,
emailUser
,
index
,
len
,
name
,
nullUser
,
obj
,
ref
;
data
=
{
data
=
{
results
:
users
results
:
users
};
};
...
...
app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue
View file @
23cdae8e
...
@@ -191,7 +191,7 @@ export default {
...
@@ -191,7 +191,7 @@ export default {
if
(
data
.
ci_status
===
this
.
mr
.
ciStatus
)
return
;
if
(
data
.
ci_status
===
this
.
mr
.
ciStatus
)
return
;
if
(
!
data
.
pipeline
)
return
;
if
(
!
data
.
pipeline
)
return
;
const
label
=
data
.
pipeline
.
details
.
status
.
label
;
const
{
label
}
=
data
.
pipeline
.
details
.
status
;
const
title
=
`Pipeline
${
label
}
`
;
const
title
=
`Pipeline
${
label
}
`
;
const
message
=
`Pipeline
${
label
}
for "
${
data
.
title
}
"`
;
const
message
=
`Pipeline
${
label
}
for "
${
data
.
title
}
"`
;
...
@@ -211,7 +211,7 @@ export default {
...
@@ -211,7 +211,7 @@ export default {
// `params` should be an Array contains a Boolean, like `[true]`
// `params` should be an Array contains a Boolean, like `[true]`
// Passing parameter as Boolean didn't work.
// Passing parameter as Boolean didn't work.
eventHub
.
$on
(
'
SetBranchRemoveFlag
'
,
(
params
)
=>
{
eventHub
.
$on
(
'
SetBranchRemoveFlag
'
,
(
params
)
=>
{
this
.
mr
.
isRemovingSourceBranch
=
params
[
0
]
;
[
this
.
mr
.
isRemovingSourceBranch
]
=
params
;
});
});
eventHub
.
$on
(
'
FailedToMerge
'
,
(
mergeError
)
=>
{
eventHub
.
$on
(
'
FailedToMerge
'
,
(
mergeError
)
=>
{
...
...
app/assets/javascripts/vue_shared/components/content_viewer/viewers/image_viewer.vue
View file @
23cdae8e
...
@@ -42,7 +42,7 @@ export default {
...
@@ -42,7 +42,7 @@ export default {
},
},
methods
:
{
methods
:
{
onImgLoad
()
{
onImgLoad
()
{
const
contentImg
=
this
.
$refs
.
contentImg
;
const
{
contentImg
}
=
this
.
$refs
;
if
(
contentImg
)
{
if
(
contentImg
)
{
this
.
isZoomable
=
this
.
isZoomable
=
...
...
app/assets/javascripts/vue_shared/components/content_viewer/viewers/markdown_viewer.vue
View file @
23cdae8e
...
@@ -4,7 +4,7 @@ import { __ } from '~/locale';
...
@@ -4,7 +4,7 @@ import { __ } from '~/locale';
import
$
from
'
jquery
'
;
import
$
from
'
jquery
'
;
import
SkeletonLoadingContainer
from
'
~/vue_shared/components/skeleton_loading_container.vue
'
;
import
SkeletonLoadingContainer
from
'
~/vue_shared/components/skeleton_loading_container.vue
'
;
const
CancelToken
=
axios
.
CancelToken
;
const
{
CancelToken
}
=
axios
;
let
axiosSource
;
let
axiosSource
;
export
default
{
export
default
{
...
...
app/assets/javascripts/vue_shared/components/table_pagination.vue
View file @
23cdae8e
...
@@ -55,7 +55,7 @@
...
@@ -55,7 +55,7 @@
},
},
getItems
()
{
getItems
()
{
const
total
=
this
.
pageInfo
.
totalPages
;
const
total
=
this
.
pageInfo
.
totalPages
;
const
page
=
this
.
pageInfo
.
page
;
const
{
page
}
=
this
.
pageInfo
;
const
items
=
[];
const
items
=
[];
if
(
page
>
1
)
{
if
(
page
>
1
)
{
...
...
changelogs/unreleased/prefer-destructuring-fix.yml
0 → 100644
View file @
23cdae8e
---
title
:
Enable prefer-structuring in JS files
merge_request
:
19943
author
:
gfyoung
type
:
other
spec/javascripts/blob/3d_viewer/mesh_object_spec.js
View file @
23cdae8e
...
@@ -26,7 +26,7 @@ describe('Mesh object', () => {
...
@@ -26,7 +26,7 @@ describe('Mesh object', () => {
const
object
=
new
MeshObject
(
const
object
=
new
MeshObject
(
new
BoxGeometry
(
10
,
10
,
10
),
new
BoxGeometry
(
10
,
10
,
10
),
);
);
const
radius
=
object
.
geometry
.
boundingSphere
.
radius
;
const
{
radius
}
=
object
.
geometry
.
boundingSphere
;
expect
(
radius
).
not
.
toBeGreaterThan
(
4
);
expect
(
radius
).
not
.
toBeGreaterThan
(
4
);
});
});
...
@@ -35,7 +35,7 @@ describe('Mesh object', () => {
...
@@ -35,7 +35,7 @@ describe('Mesh object', () => {
const
object
=
new
MeshObject
(
const
object
=
new
MeshObject
(
new
BoxGeometry
(
1
,
1
,
1
),
new
BoxGeometry
(
1
,
1
,
1
),
);
);
const
radius
=
object
.
geometry
.
boundingSphere
.
radius
;
const
{
radius
}
=
object
.
geometry
.
boundingSphere
;
expect
(
radius
).
toBeLessThan
(
1
);
expect
(
radius
).
toBeLessThan
(
1
);
});
});
...
...
spec/javascripts/commit/pipelines/pipelines_spec.js
View file @
23cdae8e
...
@@ -16,7 +16,7 @@ describe('Pipelines table in Commits and Merge requests', function () {
...
@@ -16,7 +16,7 @@ describe('Pipelines table in Commits and Merge requests', function () {
beforeEach
(()
=>
{
beforeEach
(()
=>
{
mock
=
new
MockAdapter
(
axios
);
mock
=
new
MockAdapter
(
axios
);
const
pipelines
=
getJSONFixture
(
jsonFixtureName
).
pipelines
;
const
{
pipelines
}
=
getJSONFixture
(
jsonFixtureName
)
;
PipelinesTable
=
Vue
.
extend
(
pipelinesTable
);
PipelinesTable
=
Vue
.
extend
(
pipelinesTable
);
pipeline
=
pipelines
.
find
(
p
=>
p
.
user
!==
null
&&
p
.
commit
!==
null
);
pipeline
=
pipelines
.
find
(
p
=>
p
.
user
!==
null
&&
p
.
commit
!==
null
);
...
...
spec/javascripts/deploy_keys/components/key_spec.js
View file @
23cdae8e
...
@@ -88,7 +88,7 @@ describe('Deploy keys key', () => {
...
@@ -88,7 +88,7 @@ describe('Deploy keys key', () => {
});
});
it
(
'
expands all project labels after click
'
,
done
=>
{
it
(
'
expands all project labels after click
'
,
done
=>
{
const
length
=
vm
.
deployKey
.
deploy_keys_projects
.
length
;
const
{
length
}
=
vm
.
deployKey
.
deploy_keys_projects
;
vm
.
$el
.
querySelectorAll
(
'
.deploy-project-label
'
)[
1
].
click
();
vm
.
$el
.
querySelectorAll
(
'
.deploy-project-label
'
)[
1
].
click
();
Vue
.
nextTick
(()
=>
{
Vue
.
nextTick
(()
=>
{
...
...
spec/javascripts/diffs/components/diff_line_gutter_content_spec.js
View file @
23cdae8e
...
@@ -92,7 +92,7 @@ describe('DiffLineGutterContent', () => {
...
@@ -92,7 +92,7 @@ describe('DiffLineGutterContent', () => {
});
});
it
(
'
should return discussions for the given lineCode
'
,
()
=>
{
it
(
'
should return discussions for the given lineCode
'
,
()
=>
{
const
lineCode
=
getDiffFileMock
().
highlightedDiffLines
[
1
].
lineCode
;
const
{
lineCode
}
=
getDiffFileMock
().
highlightedDiffLines
[
1
]
;
const
component
=
createComponent
({
lineCode
,
showCommentButton
:
true
});
const
component
=
createComponent
({
lineCode
,
showCommentButton
:
true
});
setDiscussions
(
component
);
setDiscussions
(
component
);
...
...
spec/javascripts/filtered_search/components/recent_searches_dropdown_content_spec.js
View file @
23cdae8e
...
@@ -103,7 +103,7 @@ describe('RecentSearchesDropdownContent', () => {
...
@@ -103,7 +103,7 @@ describe('RecentSearchesDropdownContent', () => {
describe
(
'
processedItems
'
,
()
=>
{
describe
(
'
processedItems
'
,
()
=>
{
it
(
'
with items
'
,
()
=>
{
it
(
'
with items
'
,
()
=>
{
vm
=
createComponent
(
propsDataWithItems
);
vm
=
createComponent
(
propsDataWithItems
);
const
processedItems
=
vm
.
processedItems
;
const
{
processedItems
}
=
vm
;
expect
(
processedItems
.
length
).
toEqual
(
2
);
expect
(
processedItems
.
length
).
toEqual
(
2
);
...
@@ -122,7 +122,7 @@ describe('RecentSearchesDropdownContent', () => {
...
@@ -122,7 +122,7 @@ describe('RecentSearchesDropdownContent', () => {
it
(
'
with no items
'
,
()
=>
{
it
(
'
with no items
'
,
()
=>
{
vm
=
createComponent
(
propsDataWithoutItems
);
vm
=
createComponent
(
propsDataWithoutItems
);
const
processedItems
=
vm
.
processedItems
;
const
{
processedItems
}
=
vm
;
expect
(
processedItems
.
length
).
toEqual
(
0
);
expect
(
processedItems
.
length
).
toEqual
(
0
);
});
});
...
@@ -131,13 +131,13 @@ describe('RecentSearchesDropdownContent', () => {
...
@@ -131,13 +131,13 @@ describe('RecentSearchesDropdownContent', () => {
describe
(
'
hasItems
'
,
()
=>
{
describe
(
'
hasItems
'
,
()
=>
{
it
(
'
with items
'
,
()
=>
{
it
(
'
with items
'
,
()
=>
{
vm
=
createComponent
(
propsDataWithItems
);
vm
=
createComponent
(
propsDataWithItems
);
const
hasItems
=
vm
.
hasItems
;
const
{
hasItems
}
=
vm
;
expect
(
hasItems
).
toEqual
(
true
);
expect
(
hasItems
).
toEqual
(
true
);
});
});
it
(
'
with no items
'
,
()
=>
{
it
(
'
with no items
'
,
()
=>
{
vm
=
createComponent
(
propsDataWithoutItems
);
vm
=
createComponent
(
propsDataWithoutItems
);
const
hasItems
=
vm
.
hasItems
;
const
{
hasItems
}
=
vm
;
expect
(
hasItems
).
toEqual
(
false
);
expect
(
hasItems
).
toEqual
(
false
);
});
});
});
});
...
...
spec/javascripts/filtered_search/recent_searches_root_spec.js
View file @
23cdae8e
...
@@ -15,8 +15,7 @@ describe('RecentSearchesRoot', () => {
...
@@ -15,8 +15,7 @@ describe('RecentSearchesRoot', () => {
};
};
VueSpy
=
spyOnDependency
(
RecentSearchesRoot
,
'
Vue
'
).
and
.
callFake
((
options
)
=>
{
VueSpy
=
spyOnDependency
(
RecentSearchesRoot
,
'
Vue
'
).
and
.
callFake
((
options
)
=>
{
data
=
options
.
data
;
({
data
,
template
}
=
options
);
template
=
options
.
template
;
});
});
RecentSearchesRoot
.
prototype
.
render
.
call
(
recentSearchesRoot
);
RecentSearchesRoot
.
prototype
.
render
.
call
(
recentSearchesRoot
);
...
...
spec/javascripts/gl_field_errors_spec.js
View file @
23cdae8e
...
@@ -18,7 +18,7 @@ describe('GL Style Field Errors', function() {
...
@@ -18,7 +18,7 @@ describe('GL Style Field Errors', function() {
expect
(
this
.
$form
).
toBeDefined
();
expect
(
this
.
$form
).
toBeDefined
();
expect
(
this
.
$form
.
length
).
toBe
(
1
);
expect
(
this
.
$form
.
length
).
toBe
(
1
);
expect
(
this
.
fieldErrors
).
toBeDefined
();
expect
(
this
.
fieldErrors
).
toBeDefined
();
const
inputs
=
this
.
fieldErrors
.
state
.
inputs
;
const
{
inputs
}
=
this
.
fieldErrors
.
state
;
expect
(
inputs
.
length
).
toBe
(
4
);
expect
(
inputs
.
length
).
toBe
(
4
);
});
});
...
...
spec/javascripts/groups/components/app_spec.js
View file @
23cdae8e
...
@@ -67,7 +67,7 @@ describe('AppComponent', () => {
...
@@ -67,7 +67,7 @@ describe('AppComponent', () => {
it
(
'
should return list of groups from store
'
,
()
=>
{
it
(
'
should return list of groups from store
'
,
()
=>
{
spyOn
(
vm
.
store
,
'
getGroups
'
);
spyOn
(
vm
.
store
,
'
getGroups
'
);
const
groups
=
vm
.
groups
;
const
{
groups
}
=
vm
;
expect
(
vm
.
store
.
getGroups
).
toHaveBeenCalled
();
expect
(
vm
.
store
.
getGroups
).
toHaveBeenCalled
();
expect
(
groups
).
not
.
toBeDefined
();
expect
(
groups
).
not
.
toBeDefined
();
});
});
...
@@ -77,7 +77,7 @@ describe('AppComponent', () => {
...
@@ -77,7 +77,7 @@ describe('AppComponent', () => {
it
(
'
should return pagination info from store
'
,
()
=>
{
it
(
'
should return pagination info from store
'
,
()
=>
{
spyOn
(
vm
.
store
,
'
getPaginationInfo
'
);
spyOn
(
vm
.
store
,
'
getPaginationInfo
'
);
const
pageInfo
=
vm
.
pageInfo
;
const
{
pageInfo
}
=
vm
;
expect
(
vm
.
store
.
getPaginationInfo
).
toHaveBeenCalled
();
expect
(
vm
.
store
.
getPaginationInfo
).
toHaveBeenCalled
();
expect
(
pageInfo
).
not
.
toBeDefined
();
expect
(
pageInfo
).
not
.
toBeDefined
();
});
});
...
@@ -293,7 +293,7 @@ describe('AppComponent', () => {
...
@@ -293,7 +293,7 @@ describe('AppComponent', () => {
beforeEach
(()
=>
{
beforeEach
(()
=>
{
groupItem
=
Object
.
assign
({},
mockParentGroupItem
);
groupItem
=
Object
.
assign
({},
mockParentGroupItem
);
groupItem
.
children
=
mockChildren
;
groupItem
.
children
=
mockChildren
;
childGroupItem
=
groupItem
.
children
[
0
]
;
[
childGroupItem
]
=
groupItem
.
children
;
groupItem
.
isChildrenLoading
=
false
;
groupItem
.
isChildrenLoading
=
false
;
vm
.
targetGroup
=
childGroupItem
;
vm
.
targetGroup
=
childGroupItem
;
vm
.
targetParentGroup
=
groupItem
;
vm
.
targetParentGroup
=
groupItem
;
...
...
spec/javascripts/groups/components/group_item_spec.js
View file @
23cdae8e
...
@@ -41,7 +41,7 @@ describe('GroupItemComponent', () => {
...
@@ -41,7 +41,7 @@ describe('GroupItemComponent', () => {
describe
(
'
rowClass
'
,
()
=>
{
describe
(
'
rowClass
'
,
()
=>
{
it
(
'
should return map of classes based on group details
'
,
()
=>
{
it
(
'
should return map of classes based on group details
'
,
()
=>
{
const
classes
=
[
'
is-open
'
,
'
has-children
'
,
'
has-description
'
,
'
being-removed
'
];
const
classes
=
[
'
is-open
'
,
'
has-children
'
,
'
has-description
'
,
'
being-removed
'
];
const
rowClass
=
vm
.
rowClass
;
const
{
rowClass
}
=
vm
;
expect
(
Object
.
keys
(
rowClass
).
length
).
toBe
(
classes
.
length
);
expect
(
Object
.
keys
(
rowClass
).
length
).
toBe
(
classes
.
length
);
Object
.
keys
(
rowClass
).
forEach
((
className
)
=>
{
Object
.
keys
(
rowClass
).
forEach
((
className
)
=>
{
...
...
spec/javascripts/ide/lib/diff/controller_spec.js
View file @
23cdae8e
...
@@ -63,7 +63,7 @@ describe('Multi-file editor library dirty diff controller', () => {
...
@@ -63,7 +63,7 @@ describe('Multi-file editor library dirty diff controller', () => {
[
type
]:
true
,
[
type
]:
true
,
};
};
const
range
=
getDecorator
(
change
).
range
;
const
{
range
}
=
getDecorator
(
change
)
;
expect
(
range
.
startLineNumber
).
toBe
(
1
);
expect
(
range
.
startLineNumber
).
toBe
(
1
);
expect
(
range
.
endLineNumber
).
toBe
(
2
);
expect
(
range
.
endLineNumber
).
toBe
(
2
);
...
...
spec/javascripts/namespace_select_spec.js
View file @
23cdae8e
...
@@ -22,7 +22,7 @@ describe('NamespaceSelect', () => {
...
@@ -22,7 +22,7 @@ describe('NamespaceSelect', () => {
const
dropdown
=
document
.
createElement
(
'
div
'
);
const
dropdown
=
document
.
createElement
(
'
div
'
);
// eslint-disable-next-line no-new
// eslint-disable-next-line no-new
new
NamespaceSelect
({
dropdown
});
new
NamespaceSelect
({
dropdown
});
glDropdownOptions
=
$
.
fn
.
glDropdown
.
calls
.
argsFor
(
0
)[
0
]
;
[
glDropdownOptions
]
=
$
.
fn
.
glDropdown
.
calls
.
argsFor
(
0
)
;
});
});
it
(
'
prevents click events
'
,
()
=>
{
it
(
'
prevents click events
'
,
()
=>
{
...
@@ -43,7 +43,7 @@ describe('NamespaceSelect', () => {
...
@@ -43,7 +43,7 @@ describe('NamespaceSelect', () => {
dropdown
.
dataset
.
isFilter
=
'
true
'
;
dropdown
.
dataset
.
isFilter
=
'
true
'
;
// eslint-disable-next-line no-new
// eslint-disable-next-line no-new
new
NamespaceSelect
({
dropdown
});
new
NamespaceSelect
({
dropdown
});
glDropdownOptions
=
$
.
fn
.
glDropdown
.
calls
.
argsFor
(
0
)[
0
]
;
[
glDropdownOptions
]
=
$
.
fn
.
glDropdown
.
calls
.
argsFor
(
0
)
;
});
});
it
(
'
does not prevent click events
'
,
()
=>
{
it
(
'
does not prevent click events
'
,
()
=>
{
...
...
spec/javascripts/notebook/cells/markdown_spec.js
View file @
23cdae8e
...
@@ -14,6 +14,7 @@ describe('Markdown component', () => {
...
@@ -14,6 +14,7 @@ describe('Markdown component', () => {
beforeEach
((
done
)
=>
{
beforeEach
((
done
)
=>
{
json
=
getJSONFixture
(
'
blob/notebook/basic.json
'
);
json
=
getJSONFixture
(
'
blob/notebook/basic.json
'
);
// eslint-disable-next-line prefer-destructuring
cell
=
json
.
cells
[
1
];
cell
=
json
.
cells
[
1
];
vm
=
new
Component
({
vm
=
new
Component
({
...
...
spec/javascripts/pipelines/pipelines_table_row_spec.js
View file @
23cdae8e
...
@@ -24,7 +24,7 @@ describe('Pipelines Table Row', () => {
...
@@ -24,7 +24,7 @@ describe('Pipelines Table Row', () => {
preloadFixtures
(
jsonFixtureName
);
preloadFixtures
(
jsonFixtureName
);
beforeEach
(()
=>
{
beforeEach
(()
=>
{
const
pipelines
=
getJSONFixture
(
jsonFixtureName
).
pipelines
;
const
{
pipelines
}
=
getJSONFixture
(
jsonFixtureName
)
;
pipeline
=
pipelines
.
find
(
p
=>
p
.
user
!==
null
&&
p
.
commit
!==
null
);
pipeline
=
pipelines
.
find
(
p
=>
p
.
user
!==
null
&&
p
.
commit
!==
null
);
pipelineWithoutAuthor
=
pipelines
.
find
(
p
=>
p
.
user
===
null
&&
p
.
commit
!==
null
);
pipelineWithoutAuthor
=
pipelines
.
find
(
p
=>
p
.
user
===
null
&&
p
.
commit
!==
null
);
...
...
spec/javascripts/pipelines/pipelines_table_spec.js
View file @
23cdae8e
...
@@ -11,7 +11,7 @@ describe('Pipelines Table', () => {
...
@@ -11,7 +11,7 @@ describe('Pipelines Table', () => {
preloadFixtures
(
jsonFixtureName
);
preloadFixtures
(
jsonFixtureName
);
beforeEach
(()
=>
{
beforeEach
(()
=>
{
const
pipelines
=
getJSONFixture
(
jsonFixtureName
).
pipelines
;
const
{
pipelines
}
=
getJSONFixture
(
jsonFixtureName
)
;
PipelinesTableComponent
=
Vue
.
extend
(
pipelinesTableComp
);
PipelinesTableComponent
=
Vue
.
extend
(
pipelinesTableComp
);
pipeline
=
pipelines
.
find
(
p
=>
p
.
user
!==
null
&&
p
.
commit
!==
null
);
pipeline
=
pipelines
.
find
(
p
=>
p
.
user
!==
null
&&
p
.
commit
!==
null
);
...
...
spec/javascripts/smart_interval_spec.js
View file @
23cdae8e
...
@@ -87,7 +87,7 @@ describe('SmartInterval', function () {
...
@@ -87,7 +87,7 @@ describe('SmartInterval', function () {
setTimeout
(()
=>
{
setTimeout
(()
=>
{
interval
.
cancel
();
interval
.
cancel
();
const
intervalId
=
interval
.
state
.
intervalId
;
const
{
intervalId
}
=
interval
.
state
;
const
currentInterval
=
interval
.
getCurrentInterval
();
const
currentInterval
=
interval
.
getCurrentInterval
();
const
intervalLowerLimit
=
interval
.
cfg
.
startingInterval
;
const
intervalLowerLimit
=
interval
.
cfg
.
startingInterval
;
...
@@ -106,7 +106,7 @@ describe('SmartInterval', function () {
...
@@ -106,7 +106,7 @@ describe('SmartInterval', function () {
interval
.
resume
();
interval
.
resume
();
const
intervalId
=
interval
.
state
.
intervalId
;
const
{
intervalId
}
=
interval
.
state
;
expect
(
intervalId
).
toBeTruthy
();
expect
(
intervalId
).
toBeTruthy
();
...
...
spec/javascripts/vue_shared/components/file_icon_spec.js
View file @
23cdae8e
...
@@ -74,7 +74,7 @@ describe('File Icon component', () => {
...
@@ -74,7 +74,7 @@ describe('File Icon component', () => {
size
:
120
,
size
:
120
,
});
});
const
classList
=
vm
.
$el
.
firstChild
.
classList
;
const
{
classList
}
=
vm
.
$el
.
firstChild
;
const
containsSizeClass
=
classList
.
contains
(
'
s120
'
);
const
containsSizeClass
=
classList
.
contains
(
'
s120
'
);
const
containsCustomClass
=
classList
.
contains
(
'
extraclasses
'
);
const
containsCustomClass
=
classList
.
contains
(
'
extraclasses
'
);
expect
(
containsSizeClass
).
toBe
(
true
);
expect
(
containsSizeClass
).
toBe
(
true
);
...
...
spec/javascripts/vue_shared/components/icon_spec.js
View file @
23cdae8e
...
@@ -44,7 +44,7 @@ describe('Sprite Icon Component', function () {
...
@@ -44,7 +44,7 @@ describe('Sprite Icon Component', function () {
});
});
it
(
'
should properly render img css
'
,
function
()
{
it
(
'
should properly render img css
'
,
function
()
{
const
classList
=
icon
.
$el
.
classList
;
const
{
classList
}
=
icon
.
$el
;
const
containsSizeClass
=
classList
.
contains
(
'
s32
'
);
const
containsSizeClass
=
classList
.
contains
(
'
s32
'
);
const
containsCustomClass
=
classList
.
contains
(
'
extraclasses
'
);
const
containsCustomClass
=
classList
.
contains
(
'
extraclasses
'
);
expect
(
containsSizeClass
).
toBe
(
true
);
expect
(
containsSizeClass
).
toBe
(
true
);
...
...
spec/javascripts/vue_shared/components/user_avatar/user_avatar_image_spec.js
View file @
23cdae8e
...
@@ -51,7 +51,7 @@ describe('User Avatar Image Component', function () {
...
@@ -51,7 +51,7 @@ describe('User Avatar Image Component', function () {
});
});
it
(
'
should properly render img css
'
,
function
()
{
it
(
'
should properly render img css
'
,
function
()
{
const
classList
=
vm
.
$el
.
classList
;
const
{
classList
}
=
vm
.
$el
;
const
containsAvatar
=
classList
.
contains
(
'
avatar
'
);
const
containsAvatar
=
classList
.
contains
(
'
avatar
'
);
const
containsSizeClass
=
classList
.
contains
(
'
s99
'
);
const
containsSizeClass
=
classList
.
contains
(
'
s99
'
);
const
containsCustomClass
=
classList
.
contains
(
DEFAULT_PROPS
.
cssClasses
);
const
containsCustomClass
=
classList
.
contains
(
DEFAULT_PROPS
.
cssClasses
);
...
@@ -73,7 +73,7 @@ describe('User Avatar Image Component', function () {
...
@@ -73,7 +73,7 @@ describe('User Avatar Image Component', function () {
});
});
it
(
'
should add lazy attributes
'
,
function
()
{
it
(
'
should add lazy attributes
'
,
function
()
{
const
classList
=
vm
.
$el
.
classList
;
const
{
classList
}
=
vm
.
$el
;
const
lazyClass
=
classList
.
contains
(
'
lazy
'
);
const
lazyClass
=
classList
.
contains
(
'
lazy
'
);
expect
(
lazyClass
).
toBe
(
true
);
expect
(
lazyClass
).
toBe
(
true
);
...
...
spec/javascripts/vue_shared/components/user_avatar/user_avatar_link_spec.js
View file @
23cdae8e
...
@@ -21,7 +21,7 @@ describe('User Avatar Link Component', function () {
...
@@ -21,7 +21,7 @@ describe('User Avatar Link Component', function () {
propsData
:
this
.
propsData
,
propsData
:
this
.
propsData
,
}).
$mount
();
}).
$mount
();
this
.
userAvatarImage
=
this
.
userAvatarLink
.
$children
[
0
]
;
[
this
.
userAvatarImage
]
=
this
.
userAvatarLink
.
$children
;
});
});
it
(
'
should return a defined Vue component
'
,
function
()
{
it
(
'
should return a defined Vue component
'
,
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