Skip to content

Commit

Permalink
Upgrade prettier and reformat files as necessary
Browse files Browse the repository at this point in the history
Upgrades prettier to 1.15.3
Runs `yarn prettier-save-all` against the codebase
Most changes are due to prettier/prettier#5519
  • Loading branch information
mikegreiling committed Jan 14, 2019
1 parent 8fecf97 commit 7ccd235
Show file tree
Hide file tree
Showing 68 changed files with 124 additions and 133 deletions.
4 changes: 2 additions & 2 deletions app/assets/javascripts/badges/components/badge_list_row.vue
Expand Up @@ -55,7 +55,7 @@ export default {
:disabled="badge.isDeleting"
class="btn btn-default append-right-8"
type="button"
@click="editBadge(badge);"
@click="editBadge(badge)"
>
<icon :size="16" :aria-label="__('Edit')" name="pencil" />
</button>
Expand All @@ -65,7 +65,7 @@ export default {
type="button"
data-toggle="modal"
data-target="#delete-badge-modal"
@click="updateBadgeInModal(badge);"
@click="updateBadgeInModal(badge)"
>
<icon :size="16" :aria-label="__('Delete')" name="remove" />
</button>
Expand Down
2 changes: 1 addition & 1 deletion app/assets/javascripts/boards/components/board_card.vue
Expand Up @@ -86,7 +86,7 @@ export default {
class="board-card"
@mousedown="mouseDown"
@mousemove="mouseMove"
@mouseup="showIssue($event);"
@mouseup="showIssue($event)"
>
<issue-card-inner
:list="list"
Expand Down
Expand Up @@ -96,7 +96,7 @@ export default {
<template>
<div class="board-new-issue-form">
<div class="board-card">
<form @submit="submit($event);">
<form @submit="submit($event)">
<div v-if="error" class="flash-container">
<div class="flash-alert">An error occurred. Please try again.</div>
</div>
Expand Down
Expand Up @@ -184,7 +184,7 @@ export default {
:title="label.description"
class="badge color-label append-right-4 prepend-top-4"
type="button"
@click="filterByLabel(label);"
@click="filterByLabel(label)"
>
{{ label.title }}
</button>
Expand Down
Expand Up @@ -58,7 +58,7 @@ export default {
v-if="activeTab === 'selected'"
class="btn btn-default"
type="button"
@click="changeTab('all');"
@click="changeTab('all')"
>
Open issues
</button>
Expand Down
2 changes: 1 addition & 1 deletion app/assets/javascripts/boards/components/modal/footer.vue
Expand Up @@ -71,7 +71,7 @@ export default {
<span class="inline add-issues-footer-to-list"> to list </span>
<lists-dropdown />
</div>
<button class="btn btn-default float-right" type="button" @click="toggleModal(false);">
<button class="btn btn-default float-right" type="button" @click="toggleModal(false)">
Cancel
</button>
</footer>
Expand Down
2 changes: 1 addition & 1 deletion app/assets/javascripts/boards/components/modal/header.vue
Expand Up @@ -58,7 +58,7 @@ export default {
class="close"
data-dismiss="modal"
aria-label="Close"
@click="toggleModal(false);"
@click="toggleModal(false)"
>
<span aria-hidden="true">×</span>
</button>
Expand Down
2 changes: 1 addition & 1 deletion app/assets/javascripts/boards/components/modal/list.vue
Expand Up @@ -130,7 +130,7 @@ export default {
<div
:class="{ 'is-active': issue.selected }"
class="board-card"
@click="toggleIssue($event, issue);"
@click="toggleIssue($event, issue)"
>
<issue-card-inner :issue="issue" :issue-link-base="issueLinkBase" :root-path="rootPath" />
<icon
Expand Down
Expand Up @@ -38,7 +38,7 @@ export default {
:class="{ 'is-active': list.id == selected.id }"
href="#"
role="button"
@click.prevent="modal.selectedList = list;"
@click.prevent="modal.selectedList = list"
>
<span :style="{ backgroundColor: list.label.color }" class="dropdown-label-box"> </span>
{{ list.title }}
Expand Down
4 changes: 2 additions & 2 deletions app/assets/javascripts/boards/components/modal/tabs.vue
Expand Up @@ -21,12 +21,12 @@ export default {
<div class="top-area prepend-top-10 append-bottom-10">
<ul class="nav-links issues-state-filters">
<li :class="{ active: activeTab == 'all' }">
<a href="#" role="button" @click.prevent="changeTab('all');">
<a href="#" role="button" @click.prevent="changeTab('all')">
Open issues <span class="badge badge-pill"> {{ issuesCount }} </span>
</a>
</li>
<li :class="{ active: activeTab == 'selected' }">
<a href="#" role="button" @click.prevent="changeTab('selected');">
<a href="#" role="button" @click.prevent="changeTab('selected')">
Selected issues <span class="badge badge-pill"> {{ selectedCount }} </span>
</a>
</li>
Expand Down
2 changes: 1 addition & 1 deletion app/assets/javascripts/diffs/components/diff_content.vue
Expand Up @@ -127,7 +127,7 @@ export default {
:save-button-title="__('Comment')"
class="diff-comment-form new-note discussion-form discussion-form-container"
@handleFormUpdate="handleSaveNote"
@cancelForm="closeDiffFileCommentForm(diffFile.file_hash);"
@cancelForm="closeDiffFileCommentForm(diffFile.file_hash)"
/>
</div>
</diff-viewer>
Expand Down
Expand Up @@ -68,7 +68,7 @@ export default {
}"
type="button"
class="js-diff-notes-toggle"
@click="toggleDiscussion({ discussionId: discussion.id });"
@click="toggleDiscussion({ discussionId: discussion.id })"
>
<icon v-if="discussion.expanded" name="collapse" class="collapse-icon" />
<template v-else>
Expand Down
Expand Up @@ -145,7 +145,7 @@ export default {
<div
ref="header"
class="js-file-title file-title file-title-flex-parent"
@click="handleToggleFile($event, true);"
@click="handleToggleFile($event, true)"
>
<div class="file-header-content">
<icon
Expand Down
Expand Up @@ -179,7 +179,7 @@ export default {
v-if="lineNumber"
:data-linenumber="lineNumber"
:href="lineHref"
@click="setHighlightedRow(lineCode);"
@click="setHighlightedRow(lineCode)"
>
</a>
<diff-gutter-avatars v-if="shouldShowAvatarsOnGutter" :discussions="line.discussions" />
Expand Down
Expand Up @@ -97,7 +97,7 @@ export default {
v-if="canComment"
type="button"
class="btn-transparent position-absolute image-diff-overlay-add-comment w-100 h-100 js-add-image-diff-note-button"
@click="clickedImage($event.offsetX, $event.offsetY);"
@click="clickedImage($event.offsetX, $event.offsetY)"
>
<span class="sr-only"> {{ __('Add image comment') }} </span>
</button>
Expand All @@ -109,7 +109,7 @@ export default {
:disabled="!shouldToggleDiscussion"
class="js-image-badge"
type="button"
@click="toggleDiscussion({ discussionId: discussion.id });"
@click="toggleDiscussion({ discussionId: discussion.id })"
>
<icon v-if="showCommentIcon" name="image-comment-dark" />
<template v-else>
Expand Down
6 changes: 3 additions & 3 deletions app/assets/javascripts/diffs/components/tree_list.vue
Expand Up @@ -81,7 +81,7 @@ export default {
:placeholder="s__('MergeRequest|Filter files')"
type="search"
class="form-control"
@focus="toggleFocusSearch(true);"
@focus="toggleFocusSearch(true)"
@blur="blurSearch"
/>
<button
Expand All @@ -104,7 +104,7 @@ export default {
}"
class="btn btn-default pt-0 pb-0 d-flex align-items-center"
type="button"
@click="toggleRenderTreeList(false);"
@click="toggleRenderTreeList(false)"
>
<icon name="hamburger" />
</button>
Expand All @@ -117,7 +117,7 @@ export default {
}"
class="btn btn-default pt-0 pb-0 d-flex align-items-center"
type="button"
@click="toggleRenderTreeList(true);"
@click="toggleRenderTreeList(true)"
>
<icon name="file-tree" />
</button>
Expand Down
Expand Up @@ -92,7 +92,7 @@ export default {
:disabled="isActionDisabled(action)"
type="button"
class="js-manual-action-link no-btn btn d-flex align-items-center"
@click="onClickAction(action);"
@click="onClickAction(action)"
>
<span class="flex-fill"> {{ action.name }} </span>
<span v-if="action.scheduledAt" class="text-secondary">
Expand Down
Expand Up @@ -66,7 +66,7 @@ export default {
<button
type="button"
class="filtered-search-history-dropdown-item"
@click="onItemActivated(item.text);"
@click="onItemActivated(item.text)"
>
<span>
<span
Expand All @@ -88,7 +88,7 @@ export default {
<button
type="button"
class="filtered-search-history-clear-button"
@click="onRequestClearRecentSearches($event);"
@click="onRequestClearRecentSearches($event)"
>
Clear recent searches
</button>
Expand Down
6 changes: 3 additions & 3 deletions app/assets/javascripts/ide/components/activity_bar.vue
Expand Up @@ -45,7 +45,7 @@ export default {
data-placement="right"
type="button"
class="ide-sidebar-link js-ide-edit-mode"
@click.prevent="changedActivityView($event, $options.activityBarViews.edit);"
@click.prevent="changedActivityView($event, $options.activityBarViews.edit)"
>
<icon name="code" />
</button>
Expand All @@ -62,7 +62,7 @@ export default {
data-placement="right"
type="button"
class="ide-sidebar-link js-ide-review-mode"
@click.prevent="changedActivityView($event, $options.activityBarViews.review);"
@click.prevent="changedActivityView($event, $options.activityBarViews.review)"
>
<icon name="file-modified" />
</button>
Expand All @@ -79,7 +79,7 @@ export default {
data-placement="right"
type="button"
class="ide-sidebar-link js-ide-commit-mode"
@click.prevent="changedActivityView($event, $options.activityBarViews.commit);"
@click.prevent="changedActivityView($event, $options.activityBarViews.commit)"
>
<icon name="commit" />
</button>
Expand Down
Expand Up @@ -111,8 +111,8 @@ export default {
name="commit-message"
@scroll="handleScroll"
@input="onInput"
@focus="updateIsFocused(true);"
@blur="updateIsFocused(false);"
@focus="updateIsFocused(true)"
@blur="updateIsFocused(false)"
@keydown.ctrl.enter="onCtrlEnter"
@keydown.meta.enter="onCtrlEnter"
>
Expand Down
Expand Up @@ -65,7 +65,7 @@ export default {
:disabled="disabled"
type="radio"
name="commit-action"
@change="updateCommitAction($event.target.value);"
@change="updateCommitAction($event.target.value)"
/>
<span class="prepend-left-10">
<span v-if="label" class="ide-radio-label"> {{ label }} </span> <slot v-else></slot>
Expand All @@ -76,7 +76,7 @@ export default {
:placeholder="newBranchName"
type="text"
class="form-control monospace"
@input="updateBranchName($event.target.value);"
@input="updateBranchName($event.target.value)"
/>
</div>
</fieldset>
Expand Down
Expand Up @@ -48,7 +48,7 @@ export default {
data-container="body"
data-boundary="viewport"
data-placement="bottom"
@click.stop.prevent="stageChange(path);"
@click.stop.prevent="stageChange(path)"
>
<icon :size="16" name="mobile-issue-close" class="ml-auto mr-auto" />
</button>
Expand All @@ -70,7 +70,7 @@ export default {
:header-title-text="modalTitle"
:footer-primary-button-text="__('Discard changes')"
footer-primary-button-variant="danger"
@submit="discardFileChanges(path);"
@submit="discardFileChanges(path)"
>
{{ __("You will loose all changes you've made to this file. This action cannot be undone.") }}
</gl-modal>
Expand Down
Expand Up @@ -33,7 +33,7 @@ export default {
data-container="body"
data-boundary="viewport"
data-placement="bottom"
@click.stop.prevent="unstageChange(path);"
@click.stop.prevent="unstageChange(path)"
>
<icon :size="16" name="redo" class="ml-auto mr-auto" />
</button>
Expand Down
Expand Up @@ -40,7 +40,7 @@ export default {
'is-active': viewer === $options.viewerTypes.mr,
}"
href="#"
@click.prevent="changeMode($options.viewerTypes.mr);"
@click.prevent="changeMode($options.viewerTypes.mr)"
>
<strong class="dropdown-menu-inner-title"> {{ mergeReviewLine }} </strong>
<span class="dropdown-menu-inner-content">
Expand All @@ -54,7 +54,7 @@ export default {
'is-active': viewer === $options.viewerTypes.diff,
}"
href="#"
@click.prevent="changeMode($options.viewerTypes.diff);"
@click.prevent="changeMode($options.viewerTypes.diff)"
>
<strong class="dropdown-menu-inner-title">{{ __('Reviewing') }}</strong>
<span class="dropdown-menu-inner-content">
Expand Down
6 changes: 3 additions & 3 deletions app/assets/javascripts/ide/components/file_finder/index.vue
Expand Up @@ -164,7 +164,7 @@ export default {
</script>

<template>
<div class="ide-file-finder-overlay" @mousedown.self="toggleFileFinder(false);">
<div class="ide-file-finder-overlay" @mousedown.self="toggleFileFinder(false)">
<div class="dropdown-menu diff-file-changes ide-file-finder show">
<div class="dropdown-input">
<input
Expand All @@ -174,8 +174,8 @@ export default {
type="search"
class="dropdown-input-field"
autocomplete="off"
@keydown="onKeydown($event);"
@keyup="onKeyup($event);"
@keydown="onKeydown($event)"
@keyup="onKeyup($event)"
/>
<i
:class="{
Expand Down
Expand Up @@ -91,7 +91,7 @@ export default {
<gl-loading-icon v-if="showLoading" :size="2" />
<ul v-else>
<li v-for="(item, index) in outputData" :key="index">
<button type="button" @click="clickItem(item);">{{ item.name }}</button>
<button type="button" @click="clickItem(item)">{{ item.name }}</button>
</li>
</ul>
</div>
Expand Down
2 changes: 1 addition & 1 deletion app/assets/javascripts/ide/components/ide_status_bar.vue
Expand Up @@ -84,7 +84,7 @@ export default {
<button
type="button"
class="p-0 border-0 h-50"
@click="openRightPane($options.rightSidebarViews.pipelines);"
@click="openRightPane($options.rightSidebarViews.pipelines)"
>
<ci-icon
v-tooltip
Expand Down
4 changes: 2 additions & 2 deletions app/assets/javascripts/ide/components/ide_tree.vue
Expand Up @@ -43,7 +43,7 @@ export default {
:show-label="false"
class="d-flex border-0 p-0 mr-3 qa-new-file"
icon="doc-new"
@click="openNewEntryModal({ type: 'blob' });"
@click="openNewEntryModal({ type: 'blob' })"
/>
<upload
:show-label="false"
Expand All @@ -56,7 +56,7 @@ export default {
:show-label="false"
class="d-flex border-0 p-0"
icon="folder-new"
@click="openNewEntryModal({ type: 'tree' });"
@click="openNewEntryModal({ type: 'tree' })"
/>
</div>
</template>
Expand Down
2 changes: 1 addition & 1 deletion app/assets/javascripts/ide/components/jobs/detail.vue
Expand Up @@ -75,7 +75,7 @@ export default {
<template>
<div class="ide-pipeline build-page d-flex flex-column flex-fill">
<header class="ide-job-header d-flex align-items-center">
<button class="btn btn-default btn-sm d-flex" @click="setDetailJob(null);">
<button class="btn btn-default btn-sm d-flex" @click="setDetailJob(null)">
<icon name="chevron-left" /> {{ __('View jobs') }}
</button>
</header>
Expand Down
4 changes: 2 additions & 2 deletions app/assets/javascripts/ide/components/merge_requests/list.vue
Expand Up @@ -84,7 +84,7 @@ export default {
:placeholder="__('Search merge requests')"
@focus="onSearchFocus"
@input="searchMergeRequests"
@removeToken="setSearchType(null);"
@removeToken="setSearchType(null)"
/>
<icon :size="18" name="search" class="input-icon" />
</div>
Expand All @@ -102,7 +102,7 @@ export default {
<button
type="button"
class="btn-link d-flex align-items-center"
@click.stop="setSearchType(searchType);"
@click.stop="setSearchType(searchType)"
>
<span class="d-flex append-right-default ide-search-list-current-icon">
<icon :size="18" name="search" />
Expand Down

0 comments on commit 7ccd235

Please sign in to comment.