vertumnus
/
primevue-mirror
mirror of https://github.com/primefaces/primevue.git
1
0
Fork 0
Code Packages Releases Activity

Merge branch 'master' of https://github.com/primefaces/primevue

pull/160/head
cagataycivici 2020-01-20 13:27:54 +03:00
parent e6a126d4c8 6ec4f453cc
commit 97d7441585
3 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/calendar/Calendar.vue
View File

@ -1809,9 +1809,9 @@ export default {
else { else {
cell = DomHandler.findSingle(this.$refs.overlay, 'span.p-highlight'); cell = DomHandler.findSingle(this.$refs.overlay, 'span.p-highlight');
if (!cell) { if (!cell) {
let todayCell = DomHandler.findSingle(this.$refs.overlay, 'td.p-datepicker-today'); let todayCell = DomHandler.findSingle(this.$refs.overlay, 'td.p-datepicker-today span:not(.p-disabled)');
if (todayCell) if (todayCell)
cell = todayCell.children[0]; cell = todayCell;
else else
cell = DomHandler.findSingle(this.$refs.overlay, '.p-datepicker-calendar td span:not(.p-disabled)'); cell = DomHandler.findSingle(this.$refs.overlay, '.p-datepicker-calendar td span:not(.p-disabled)');
} }

28
src/components/dialog/Dialog.vue
View File

@ -1,7 +1,7 @@
<template> <template>
<div ref="mask" :class="wrapperClass" v-if="visible"> <div ref="mask" :class="wrapperClass" v-if="d_visible || blockScroll">
<transition name="p-dialog" @enter="onEnter" @leave="onLeave" @appear="onAppear"> <transition name="p-dialog" @enter="onEnter" @leave="onLeave" @appear="onAppear">
<div ref="container" :class="containerClass" :style="containerStyle" v-if="visible" v-bind="$attrs" v-on="listeners" role="dialog" :aria-labelledby="ariaLabelledById" :aria-modal="modal"> <div ref="container" :class="containerClass" :style="containerStyle" v-if="d_visible" v-bind="$attrs" v-on="listeners" role="dialog" :aria-labelledby="ariaLabelledById" :aria-modal="modal">
<div class="p-dialog-titlebar" v-if="showHeader"> <div class="p-dialog-titlebar" v-if="showHeader">
<slot name="header"> <slot name="header">
<span :id="ariaLabelledById" class="p-dialog-title" v-if="header" >{{header}}</span> <span :id="ariaLabelledById" class="p-dialog-title" v-if="header" >{{header}}</span>
@ -60,7 +60,21 @@ export default {
data() { data() {
return { return {
dialogClasses: null, dialogClasses: null,
dialogStyles: null dialogStyles: null,
d_visible: this.visible,
blockScroll: false,
}
},
watch: {
visible(newValue) {
this.d_visible = newValue;
if(this.d_visible && this.modal) {
this.blockScroll = true;
}
else {
Promise.resolve(null).then(() => this.blockScroll = false);
}
} }
}, },
documentKeydownListener: null, documentKeydownListener: null,
@ -82,7 +96,9 @@ export default {
}, },
methods: { methods: {
close() { close() {
this.$emit('update:visible', false); this.d_visible = false;
this.$emit('update:visible', this.d_visible);
}, },
onEnter() { onEnter() {
this.$emit('show'); this.$emit('show');
@ -100,7 +116,7 @@ export default {
this.disableModality(); this.disableModality();
}, },
onAppear() { onAppear() {
if (this.visible) { if (this.d_visible) {
this.onEnter(); this.onEnter();
} }
}, },
@ -341,4 +357,4 @@ export default {
-webkit-transition: height .3s; -webkit-transition: height .3s;
transition: height .3s; transition: height .3s;
} }
</style> </style>

2
src/views/Home.vue
View File

@ -56,7 +56,7 @@
<img alt="accesibility" src="../assets/images/home/vue-accesibility.png" /> <img alt="accesibility" src="../assets/images/home/vue-accesibility.png" />
<div class="feature-card-detail"> <div class="feature-card-detail">
<span class="feature-name">ACCESSIBILITY</span> <span class="feature-name">ACCESSIBILITY</span>
<p>Fully accessible and in complaince with Section 508 standards.</p> <p>Fully accessible and in compliance with Section 508 standards.</p>
</div> </div>
</div> </div>
</div> </div>