Skip to content

Commit

Permalink
adds vue/html-indent to eslint
Browse files Browse the repository at this point in the history
  • Loading branch information
@aocneanu
aocneanu committed Apr 23, 2018
1 parent ea56285 commit bf7d157
Show file tree
Hide file tree
Showing 12 changed files with 45 additions and 61 deletions.
2 changes: 1 addition & 1 deletion src/resources/assets/js/components/enso/vuedatatable/Modal.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
</h5>
<hr>
<div class="level">
<div class="level-left"></div>
<div class="level-left"/>
<div class="level-right">
<div class="level-item">
<button class="button is-success"
Expand Down
2 changes: 1 addition & 1 deletion src/resources/assets/js/components/enso/vuedatatable/Overlay.vue
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<template>

<div class="overlay is-overlay">
<div class="overlay-loader"></div>
<div class="overlay-loader"/>
</div>

</template>
Expand Down
21 changes: 8 additions & 13 deletions src/resources/assets/js/components/enso/vuedatatable/TableBody.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
v-if="hiddenCount"
@click="toggleExpand(row, index)">
<span class="icon is-small">
<fa :icon="isExpanded(row) ? 'minus-square' : 'plus-square'"></fa>
<fa :icon="isExpanded(row) ? 'minus-square' : 'plus-square'"/>
</span>
</span>
</div>
Expand All @@ -35,19 +35,17 @@
v-if="cascadesHiddenControls && idx === 0"
@click="toggleExpand(row, index)">
<span class="icon is-small">
<fa :icon="isExpanded(row) ? 'minus-square' : 'plus-square'"></fa>
<fa :icon="isExpanded(row) ? 'minus-square' : 'plus-square'"/>
</span>
</span>
<span slot="custom-render"
v-if="column.meta.render"
v-html="customRender(row, column)">
</span>
v-html="customRender(row, column)"/>
<span :slot="column.name"
v-if="column.meta.slot">
<slot :name="column.name"
:row="row"
:column="column">
</slot>
:column="column"/>
</span>
</table-cell>
</td>
Expand All @@ -62,7 +60,7 @@
:href="button.action === 'href' ? getPath(button, row.dtRowId) : null"
@click="button.confirmation ? showModal(button, row) : doAction(button, row)">
<span class="icon is-small">
<fa :icon="button.icon"></fa>
<fa :icon="button.icon"/>
</span>
</a>
</span>
Expand All @@ -82,14 +80,12 @@
@clicked="clicked(body.data[item.index], item.column)">
<span slot="custom-render"
v-if="item.column.meta.render"
v-html="customRender(body.data[item.index], item.column)">
</span>
v-html="customRender(body.data[item.index], item.column)"/>
<span :slot="item.column.name"
v-if="item.column.meta.slot">
<slot :name="item.column.name"
:row="row"
:column="item.column">
</slot>
:column="item.column"/>
</span>
</table-cell>
</li>
Expand All @@ -101,8 +97,7 @@
:i18n="i18n"
:message="button.message"
@close="closeModal()"
@commit="doAction(button, row)">
</modal>
@commit="doAction(button, row)"/>
</tbody>

</template>
Expand Down
10 changes: 5 additions & 5 deletions src/resources/assets/js/components/enso/vuedatatable/TableCell.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,22 @@

<span :class="{ 'is-clickable': column.meta.clickable }"
@click="$emit('clicked')">
<slot name="hidden-controls" v-if="hiddenControls"></slot>
<slot name="hidden-controls" v-if="hiddenControls"/>
<span v-if="column.meta.boolean"
class="tag is-table-tag"
:class="value ? 'is-success' : 'is-danger'">
<span class="icon is-small">
<fa :icon="value ? 'check' : 'times'"></fa>
<fa :icon="value ? 'check' : 'times'"/>
</span>
</span>
<span v-else-if="column.meta.icon && value">
<fa :icon="value"></fa>
<fa :icon="value"/>
</span>
<span v-else-if="column.meta.render">
<slot name="custom-render"></slot>
<slot name="custom-render"/>
</span>
<span v-else-if="column.meta.slot">
<slot :name="column.name"></slot>
<slot :name="column.name"/>
</span>
<span v-else-if="column.meta.translation">{{ i18n(value) }}</span>
<span v-else>{{ value }}</span>
Expand Down
4 changes: 2 additions & 2 deletions src/resources/assets/js/components/enso/vuedatatable/TableFooter.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<tfoot>
<tr>
<td v-if="template.crtNo"></td>
<td v-if="template.crtNo"/>
<td class="has-text-centered has-text-weight-bold"
v-if="
template.columns[0].meta.visible
Expand Down Expand Up @@ -33,7 +33,7 @@
</span>
</span>
</td>
<td v-if="template.actions"></td>
<td v-if="template.actions"/>
</tr>
</tfoot>

Expand Down
7 changes: 3 additions & 4 deletions src/resources/assets/js/components/enso/vuedatatable/TableHeader.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,19 +15,18 @@
<span class="icon is-small has-text-info"
v-if="column.tooltip"
v-tooltip="i18n(column.tooltip)">
<fa icon="info" size="xs"></fa>
<fa icon="info" size="xs"/>
</span>
<span class="sorter"
@click="toggleSort($event, column)"
v-if="column.meta.sortable">
<span class="icon is-small">
<fa :icon="sortIcon(column.meta.sort)" size="xs"></fa>
<fa :icon="sortIcon(column.meta.sort)" size="xs"/>
</span>
</span>
<a class="delete is-small"
v-if="column.meta.sort"
@click="clearColumnSort(column)">
</a>
@click="clearColumnSort(column)"/>
</span>
</th>
<th :class="template.align"
Expand Down
29 changes: 12 additions & 17 deletions src/resources/assets/js/components/enso/vuedatatable/TopControls.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<div class="column has-padding-small is-half is-hidden-mobile">
<h5 class="title is-5">
<span class="icon">
<fa :icon="template.icon"></fa>
<fa :icon="template.icon"/>
</span>
{{ i18n(template.name) }}
</h5>
Expand All @@ -21,43 +21,38 @@
{{ i18n(button.label) }}
</span>
<span class="icon is-small">
<fa :icon="button.icon"></fa>
</span>
<span class="is-hidden-mobile">
<fa :icon="button.icon"/>
</span>
<span class="is-hidden-mobile"/>
</button>
</div>
<div class="column has-padding-small is-two-thirds-desktop has-text-centered-mobile">
<length-menu :template="template"
:length="length"
v-on="$listeners">
</length-menu>
v-on="$listeners"/>
<column-visibility :template="template"
v-on="$listeners">
</column-visibility>
v-on="$listeners"/>
<style-selector :template="template"
class="is-hidden-mobile">
</style-selector>
class="is-hidden-mobile"/>
<alignment :template="template"
class="is-hidden-mobile">
</alignment>
class="is-hidden-mobile"/>
<button class="button"
@click="$emit('reload')">
<span class="icon is-small">
<fa icon="sync"></fa>
<fa icon="sync"/>
</span>
</button>
<button class="button"
@click="$emit('reset')">
<span class="icon is-small">
<fa icon="undo"></fa>
<fa icon="undo"/>
</span>
</button>
<button class="button"
@click="$emit('request-full-info')"
v-if="info">
<span class="icon is-small has-text-info">
<fa icon="info-circle"></fa>
<fa icon="info-circle"/>
</span>
</button>
</div>
Expand All @@ -69,12 +64,12 @@
@input="$emit('input', $event.target.value)"
:placeholder="i18n('Search')">
<span class="icon is-small is-left">
<fa icon="search"></fa>
<fa icon="search"/>
</span>
<span class="icon is-small is-right clear-button"
v-if="value && !loading"
@click="$emit('input', '')">
<a class="delete is-small"></a>
<a class="delete is-small"/>
</span>
</p>
</div>
Expand Down
17 changes: 6 additions & 11 deletions src/resources/assets/js/components/enso/vuedatatable/VueTable.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,15 @@
@reset="resetPreferences"
@request-full-info="forceInfo = true; getData()"
v-on="$listeners"
v-model="search">
</top-controls>
v-model="search"/>
<div class="table-responsive"
v-responsive>
<table class="table is-fullwidth vue-data-table"
:class="template.style"
id="id">
<table-header :template="template"
:i18n="i18n"
@sort-update="getData">
</table-header>
@sort-update="getData"/>
<table-body :template="template"
v-on="$listeners"
:body="body"
Expand All @@ -48,18 +46,16 @@
<table-footer v-if="template.total && hasContent && body.fullRecordInfo"
:template="template"
:body="body"
:i18n="i18n">
</table-footer>
:i18n="i18n"/>
</table>
<overlay v-if="loading"></overlay>
<overlay v-if="loading"/>
</div>
<div class="columns table-bottom-controls"
v-if="hasContent">
<div class="column">
<records-info :body="body"
:i18n="i18n"
:start="start">
</records-info>
:start="start"/>
</div>
<div class="column is-narrow has-text-right">
<pagination :loading="loading"
Expand All @@ -69,8 +65,7 @@
:i18n="i18n"
:extended="body.fullRecordInfo"
@jump-to="start = $event;getData()"
v-if="body.data.length > 0">
</pagination>
v-if="body.data.length > 0"/>
</div>
</div>
<div v-if="body && !body.count"
Expand Down
4 changes: 2 additions & 2 deletions src/resources/assets/js/components/enso/vuedatatable/topControls/Alignment.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@
<dropdown>
<span slot="label"
class="icon is-small">
<fa icon="align-justify"></fa>
<fa icon="align-justify"/>
</span>
<a v-for="(value, key) in template.aligns"
:key="key"
class="dropdown-item"
:class="{ 'is-active': template.align === value }"
@click="template.align = value">
<span class="icon is-small">
<fa :icon="icons[key]"></fa>
<fa :icon="icons[key]"/>
</span>
</a>
</dropdown>
Expand Down
2 changes: 1 addition & 1 deletion src/resources/assets/js/components/enso/vuedatatable/topControls/ColumnVisibility.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<dropdown>
<span slot="label"
class="icon is-small">
<fa icon="eye"></fa>
<fa icon="eye"/>
</span>
<a v-for="(column, index) in template.columns"
:key="index"
Expand Down
6 changes: 3 additions & 3 deletions src/resources/assets/js/components/enso/vuedatatable/topControls/Dropdown.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
<div class="dropdown-trigger"
@click="show=!show">
<button class="button">
<slot name="label"></slot>
<slot name="label"/>
<span class="icon is-small angle"
:aria-hidden="!show">
<fa icon="angle-down"></fa>
<fa icon="angle-down"/>
</span>
</button>
</div>
Expand All @@ -20,7 +20,7 @@
:style="widthStyle">
<div class="dropdown-content has-text-centered"
:style="[widthStyle, heightStyle]">
<slot></slot>
<slot/>
</div>
</div>
</transition>
Expand Down
2 changes: 1 addition & 1 deletion src/resources/assets/js/components/enso/vuedatatable/topControls/StyleSelector.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<dropdown class="is-right">
<span slot="label"
class="icon is-small">
<fa icon="table"></fa>
<fa icon="table"/>
</span>
<a v-for="(style, key) in template.styles"
:key="key"
Expand Down

0 comments on commit bf7d157

Please sign in to comment.