Skip to content

Commit 78d2590

Browse files
committed
refactor(QTable): "loader" prop should be named "loading" for consistency
1 parent bbc4d19 commit 78d2590

File tree

24 files changed

+31
-31
lines changed

24 files changed

+31
-31
lines changed

dev/components/components/data-table2.vue

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
row-key="name"
1515
:pagination.sync="serverPagination"
1616
@request="request"
17-
:loader="loader"
17+
:loading="loading"
1818
>
1919
<template slot="top-right" slot-scope="props">
2020
<q-search hide-underline v-model="filter" />
@@ -68,7 +68,7 @@
6868
:data="data"
6969
:columns="columns"
7070
:filter="filter"
71-
:loader="loader"
71+
:loading="loading"
7272
row-key="name"
7373
color="primary"
7474
no-top
@@ -80,7 +80,7 @@
8080
:data="data"
8181
:columns="columns"
8282
:filter="filter"
83-
:loader="loader"
83+
:loading="loading"
8484
row-key="name"
8585
color="primary"
8686
>
@@ -251,7 +251,7 @@ export default {
251251
rowsNumber: 10
252252
},
253253
serverData: [],
254-
loader: false,
254+
loading: false,
255255
visibleColumns: ['desc', 'fat', 'carbs', 'protein', 'sodium', 'calcium', 'iron'],
256256
selected: [],
257257
@@ -378,7 +378,7 @@ export default {
378378
},
379379
methods: {
380380
request (props) {
381-
this.loader = true
381+
this.loading = true
382382
console.log('REQUEST', props)
383383
setTimeout(() => {
384384
this.serverPagination = props.pagination
@@ -404,7 +404,7 @@ export default {
404404
}
405405
406406
this.serverData = rows
407-
this.loader = false
407+
this.loading = false
408408
}, 1500)
409409
},
410410
moveRowUp (name) {

dev/components/web-tests/fast-table-test.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
:pagination.sync="pagination"
1818
:selection="selection"
1919
:selected.sync="selected"
20-
:loader="loader"
20+
:loading="loading"
2121
:visible-columns="visibleColumns"
2222
:title="title"
2323
table-style="max-height: 500px;"
@@ -32,7 +32,7 @@ export default {
3232
data () {
3333
return {
3434
selectionToggle: false,
35-
loader: false,
35+
loading: false,
3636
color: 'amber',
3737
visibleColumns: ['desc', 'fat', 'carbs', 'protein', 'sodium', 'calcium', 'iron'],
3838
separator: 'horizontal',

i18n/de.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ export default {
3030
table: {
3131
noData: 'Keine Daten vorhanden.',
3232
noResults: 'Keine Einträge gefunden',
33-
loader: 'Lade...',
33+
loading: 'Lade...',
3434
selectedRows: rows => rows > 1 ? `${rows} ausgewählte Zeilen` : `${rows === 0 ? 'Keine' : '1'} ausgewahlt.`,
3535
rowsPerPage: 'Zeilen pro Seite',
3636
allRows: 'Alle',

i18n/en-uk.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ export default {
3131
table: {
3232
noData: 'No data available',
3333
noResults: 'No matching records found',
34-
loader: 'Loading...',
34+
loading: 'Loading...',
3535
selectedRows: rows => rows > 0 ? `${rows} row${rows === 1 ? '' : 's'} selected.` : 'No selected rows.',
3636
rowsPerPage: 'Rows per page:',
3737
allRows: 'All',

i18n/en-us.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ export default {
3131
table: {
3232
noData: 'No data available',
3333
noResults: 'No matching records found',
34-
loader: 'Loading...',
34+
loading: 'Loading...',
3535
selectedRows: rows => rows > 0 ? `${rows} row${rows === 1 ? '' : 's'} selected.` : 'No selected rows.',
3636
rowsPerPage: 'Rows per page:',
3737
allRows: 'All',

i18n/es.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ export default {
3131
table: {
3232
noData: 'Sin datos disponibles',
3333
noResults: 'No se econtraron resultados',
34-
loader: 'Cargando...',
34+
loading: 'Cargando...',
3535
selectedRows: rows => rows > 1 ? `${rows} filas seleccionadas.` : `${rows === 0 ? 'Sin' : '1'} fila seleccionada.`,
3636
rowsPerPage: 'Filas por página:',
3737
allRows: 'Todas',

i18n/fr.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ export default {
3131
table: {
3232
noData: 'Aucune donnée à afficher',
3333
noResults: 'Aucune donnée trouvée',
34-
loader: 'Chargement...',
34+
loading: 'Chargement...',
3535
selectedRows: rows => rows > 0 ? `${rows} ${rows === 1 ? 'ligne sélectionnée' : 'lignes sélectionnées'}.` : 'Non lignes sélectionnées.',
3636
rowsPerPage: 'Lignes par page:',
3737
allRows: 'Tous',

i18n/hr.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ export default {
3131
table: {
3232
noData: 'Nema podataka',
3333
noResults: 'Nema odgovarajućih zapisa',
34-
loader: 'Učitavanje...',
34+
loading: 'Učitavanje...',
3535
selectedRows: rows => rows > 1 ? `${rows} izabranih redova.` : `${rows === 0 ? 'Nema' : '1'} izabranih redova.`,
3636
rowsPerPage: 'Redova po stranici:',
3737
allRows: 'Sve',

i18n/id.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ export default {
3131
table: {
3232
noData: 'Tidak ada data tersedia',
3333
noResults: 'Tidak ada yang cocok',
34-
loader: 'Memuat...',
34+
loading: 'Memuat...',
3535
selectedRows: rows => rows > 1 ? `${rows} baris terpilih.` : `${rows === 0 ? 'tidak ada' : '1'} baris terpilih.`,
3636
rowsPerPage: 'Baris per halaman:',
3737
allRows: 'Semua',

i18n/it.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ export default {
3131
table: {
3232
noData: 'Nessun dato disponibile',
3333
noResults: 'Nessuna corrispondenza trovata',
34-
loader: 'Caricamento...',
34+
loading: 'Caricamento...',
3535
selectedRows: rows => rows > 0 ? `${rows} ${rows === 1 ? 'riga selezionata' : 'righe selezionate'}.` : 'Nessuna riga selezionata.',
3636
rowsPerPage: 'Righe per pagina:',
3737
allRows: 'Tutte',

0 commit comments

Comments
 (0)