Hopiu/vue-material
1
0
Fork 0
mirror of https://github.com/Hopiu/vue-material.git synced 2026-03-16 22:10:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #854 from lucasfernog/develop

Browse source 
Small fixes on mdChips, mdTablePagination (issue #830) and mdInputContainer buttons
This commit is contained in:
Pablo Henrique 2017-06-23 08:45:25 -03:00 committed by GitHub
commit 3a9f793633
3 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/components/mdChips/mdChips.vue
View file

@ -23,6 +23,7 @@
@keydown.native.prevent.enter="addChip"
@keydown.native.prevent.186="addChip"
tabindex="0"
:debounce="0"
ref="input">
</md-input>

4
src/components/mdInputContainer/mdInputContainer.vue
View file

@ -4,11 +4,11 @@
<span class="md-count" v-if="enableCounter">{{ inputLength }} / {{ counterLength }}</span>
<md-button class="md-icon-button md-toggle-password" @click="togglePasswordType" v-if="mdHasPassword">
<md-button tabindex="-1" class="md-icon-button md-toggle-password" @click="togglePasswordType" v-if="mdHasPassword">
<md-icon>{{ showPassword ? 'visibility_off' : 'visibility' }}</md-icon>
</md-button>
<md-button class="md-icon-button md-clear-input" @click="clearInput" v-if="mdClearable && hasValue">
<md-button tabindex="-1" class="md-icon-button md-clear-input" @click="clearInput" v-if="mdClearable && hasValue">
<md-icon>clear</md-icon>
</md-button>
</div>

14
src/components/mdTable/mdTablePagination.vue
View file

@ -2,7 +2,7 @@
<div class="md-table-pagination">
<span class="md-table-pagination-label">{{ mdLabel }}:</span>
<md-select v-model="currentSize" md-menu-class="md-pagination-select" @change="changeSize" v-if="mdPageOptions">
<md-select v-model="currentSize" md-menu-class="md-pagination-select" @change="changeSize" v-if="mdPageOptions !== false">
<md-option v-for="amount in mdPageOptions" :key="amount" :value="amount">{{ amount }}</md-option>
</md-select>
@ -26,7 +26,10 @@
type: [Number, String],
default: 10
},
mdPageOptions: [Array, Boolean],
mdPageOptions: {
type: [Array, Boolean],
default: () => [10, 25, 50, 100]
},
mdPage: {
type: [Number, String],
default: 1
@ -110,8 +113,11 @@
},
mounted() {
this.$nextTick(() => {
this.mdPageOptions = this.mdPageOptions || [10, 25, 50, 100];
this.currentSize = this.mdPageOptions.includes(this.currentSize) ? this.currentSize : this.mdPageOptions[0];
if (this.mdPageOptions) {
this.currentSize = this.mdPageOptions.includes(this.currentSize) ? this.currentSize : this.mdPageOptions[0];
} else {
this.currentSize = 0;
}
this.canFireEvents = true;
});
}