summaryrefslogtreecommitdiff
path: root/app/assets
diff options
context:
space:
mode:
authorFilipa Lacerda <filipa@gitlab.com>2018-06-13 11:58:51 +0100
committerFilipa Lacerda <filipa@gitlab.com>2018-06-13 11:58:51 +0100
commite29c0da8c567fa884d8ceca05346fa7635e1eb8d (patch)
tree91d94e396c6abe018934eb494694ccb3ea970f43 /app/assets
parent26137130d903353c4a20b2c64acdabdc7f7b5af2 (diff)
downloadgitlab-ce-e29c0da8c567fa884d8ceca05346fa7635e1eb8d.tar.gz
Updates eslint rules
Diffstat (limited to 'app/assets')
-rw-r--r--app/assets/javascripts/ide/components/commit_sidebar/list_item.vue2
-rw-r--r--app/assets/javascripts/ide/components/repo_commit_section.vue4
-rw-r--r--app/assets/javascripts/vue_shared/components/diff_viewer/diff_viewer.vue4
-rw-r--r--app/assets/javascripts/vue_shared/components/diff_viewer/viewers/image_diff/onion_skin_viewer.vue18
-rw-r--r--app/assets/javascripts/vue_shared/components/diff_viewer/viewers/image_diff/swipe_viewer.vue14
-rw-r--r--app/assets/javascripts/vue_shared/components/diff_viewer/viewers/image_diff_viewer.vue4
6 files changed, 23 insertions, 23 deletions
diff --git a/app/assets/javascripts/ide/components/commit_sidebar/list_item.vue b/app/assets/javascripts/ide/components/commit_sidebar/list_item.vue
index 6c30b2a721d..2ecf9af4bf0 100644
--- a/app/assets/javascripts/ide/components/commit_sidebar/list_item.vue
+++ b/app/assets/javascripts/ide/components/commit_sidebar/list_item.vue
@@ -82,10 +82,10 @@ export default {
<template>
<div
- class="multi-file-commit-list-item"
:class="{
'is-active': isActive
}"
+ class="multi-file-commit-list-item"
>
<button
type="button"
diff --git a/app/assets/javascripts/ide/components/repo_commit_section.vue b/app/assets/javascripts/ide/components/repo_commit_section.vue
index 7f1ac63d543..01df0019fd4 100644
--- a/app/assets/javascripts/ide/components/repo_commit_section.vue
+++ b/app/assets/javascripts/ide/components/repo_commit_section.vue
@@ -94,11 +94,11 @@ export default {
:key-prefix="$options.stageKeys.unstaged"
:file-list="changedFiles"
:action-btn-text="__('Stage all')"
+ :active-file-key="activeFileKey"
class="is-first"
icon-name="unstaged"
action="stageAllChanges"
item-action-component="stage-button"
- :active-file-key="activeFileKey"
/>
<commit-files-list
:title="__('Staged')"
@@ -106,10 +106,10 @@ export default {
:file-list="stagedFiles"
:action-btn-text="__('Unstage all')"
:staged-list="true"
+ :active-file-key="activeFileKey"
icon-name="staged"
action="unstageAllChanges"
item-action-component="unstage-button"
- :active-file-key="activeFileKey"
/>
</template>
<empty-state
diff --git a/app/assets/javascripts/vue_shared/components/diff_viewer/diff_viewer.vue b/app/assets/javascripts/vue_shared/components/diff_viewer/diff_viewer.vue
index 4eca3fd4e97..2c47f5b9b35 100644
--- a/app/assets/javascripts/vue_shared/components/diff_viewer/diff_viewer.vue
+++ b/app/assets/javascripts/vue_shared/components/diff_viewer/diff_viewer.vue
@@ -57,8 +57,8 @@ export default {
<template>
<div
- class="diff-file preview-container"
- v-if="viewer">
+ v-if="viewer"
+ class="diff-file preview-container">
<component
:is="viewer"
:diff-mode="diffMode"
diff --git a/app/assets/javascripts/vue_shared/components/diff_viewer/viewers/image_diff/onion_skin_viewer.vue b/app/assets/javascripts/vue_shared/components/diff_viewer/viewers/image_diff/onion_skin_viewer.vue
index efcc39197b0..38e881d17a2 100644
--- a/app/assets/javascripts/vue_shared/components/diff_viewer/viewers/image_diff/onion_skin_viewer.vue
+++ b/app/assets/javascripts/vue_shared/components/diff_viewer/viewers/image_diff/onion_skin_viewer.vue
@@ -104,18 +104,18 @@ export default {
<template>
<div class="onion-skin view">
<div
- class="onion-skin-frame"
:style="{
'width': onionMaxPixelWidth,
'height': onionMaxPixelHeight,
'user-select': dragging === true ? 'none' : '',
- }">
+ }"
+ class="onion-skin-frame">
<div
- class="frame deleted"
:style="{
'width': onionMaxPixelWidth,
'height': onionMaxPixelHeight,
- }">
+ }"
+ class="frame deleted">
<image-viewer
key="onionOldImg"
:render-info="false"
@@ -125,13 +125,13 @@ export default {
/>
</div>
<div
- class="added frame"
ref="addedFrame"
:style="{
'opacity': onionOpacity,
'width': onionMaxPixelWidth,
'height': onionMaxPixelHeight,
- }">
+ }"
+ class="added frame">
<image-viewer
key="onionNewImg"
:render-info="false"
@@ -143,14 +143,14 @@ export default {
<div class="controls">
<div class="transparent"></div>
<div
- class="drag-track"
ref="dragTrack"
+ class="drag-track"
@mousedown="startDrag"
@mouseup="stopDrag">
<div
- class="dragger"
ref="dragger"
- :style="{ 'left': onionDraggerPixelPos }">
+ :style="{ 'left': onionDraggerPixelPos }"
+ class="dragger">
</div>
</div>
<div class="opaque"></div>
diff --git a/app/assets/javascripts/vue_shared/components/diff_viewer/viewers/image_diff/swipe_viewer.vue b/app/assets/javascripts/vue_shared/components/diff_viewer/viewers/image_diff/swipe_viewer.vue
index fc513ebfce1..86366c799a2 100644
--- a/app/assets/javascripts/vue_shared/components/diff_viewer/viewers/image_diff/swipe_viewer.vue
+++ b/app/assets/javascripts/vue_shared/components/diff_viewer/viewers/image_diff/swipe_viewer.vue
@@ -111,12 +111,12 @@ export default {
<template>
<div class="swipe view">
<div
- class="swipe-frame"
ref="swipeFrame"
:style="{
'width': swipeMaxPixelWidth,
'height': swipeMaxPixelHeight,
- }">
+ }"
+ class="swipe-frame">
<div class="frame deleted">
<image-viewer
key="swipeOldImg"
@@ -128,12 +128,12 @@ export default {
/>
</div>
<div
- class="swipe-wrap"
ref="swipeWrap"
:style="{
'width': swipeWrapPixelWidth,
'height': swipeMaxPixelHeight,
- }">
+ }"
+ class="swipe-wrap">
<div class="frame added">
<image-viewer
key="swipeNewImg"
@@ -145,11 +145,11 @@ export default {
</div>
</div>
<span
- class="swipe-bar"
ref="swipeBar"
+ :style="{ 'left': swipeBarPixelPos }"
+ class="swipe-bar"
@mousedown="startDrag"
- @mouseup="stopDrag"
- :style="{ 'left': swipeBarPixelPos }">
+ @mouseup="stopDrag">
<span class="top-handle"></span>
<span class="bottom-handle"></span>
</span>
diff --git a/app/assets/javascripts/vue_shared/components/diff_viewer/viewers/image_diff_viewer.vue b/app/assets/javascripts/vue_shared/components/diff_viewer/viewers/image_diff_viewer.vue
index 43b28f96a06..1af85283277 100644
--- a/app/assets/javascripts/vue_shared/components/diff_viewer/viewers/image_diff_viewer.vue
+++ b/app/assets/javascripts/vue_shared/components/diff_viewer/viewers/image_diff_viewer.vue
@@ -49,8 +49,8 @@ export default {
<template>
<div class="diff-file-container">
<div
- class="diff-viewer"
- v-if="diffMode === $options.diffModes.replaced">
+ v-if="diffMode === $options.diffModes.replaced"
+ class="diff-viewer">
<div class="image js-replaced-image">
<two-up-viewer
v-if="mode === $options.imageViewMode.twoup"