Skip to content

Commit 48efcd4

Browse files
pdanpdanrstoenescu
authored andcommitted
Small fixes - trailing spaces, demos (quasarframework#1752)
* fix: input-test demo * Small fixes
1 parent 6b55957 commit 48efcd4

File tree

4 files changed

+14
-18
lines changed

4 files changed

+14
-18
lines changed

dev/components/form/input-test.vue

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
@change="onChange2"
3333
placeholder="Color (RGBA)"
3434
modal
35-
:after="[ { icon: 'colorize', handler () { color = defaultColor } }]" />
35+
:after="[ { icon: 'colorize', handler () { color = null; $nextTick(() => { color = defaultColor }) } }]" />
3636

3737
<br><br>
3838
<q-color
@@ -59,7 +59,7 @@
5959
@change="onChange2"
6060
placeholder="Color (RGBA)"
6161
popover
62-
:after="[ { icon: 'colorize', handler () { color = defaultColor } }]" />
62+
:after="[ { icon: 'colorize', handler () { color = null; $nextTick(() => { color = defaultColor }) } }]" />
6363

6464
<br><br>
6565
<q-datetime
@@ -72,8 +72,8 @@
7272
@clear="donClear"
7373
v-model="date"
7474
modal
75-
placeholder="Color (RGBA)"
76-
:after="[ { icon: 'colorize', handler () { date = defaultDate } }]" />
75+
placeholder="Date"
76+
:after="[ { icon: 'today', handler () { date = defaultDate } }]" />
7777

7878
<q-datetime
7979
clearable
@@ -84,9 +84,9 @@
8484
@clear="donClear"
8585
:value="date"
8686
@change="donChange2"
87-
placeholder="Color (RGBA)"
87+
placeholder="Date"
8888
modal
89-
:after="[ { icon: 'colorize', handler () { date = defaultDate } }]" />
89+
:after="[ { icon: 'today', handler () { date = null; $nextTick(() => { date = defaultDate }) } }]" />
9090

9191
<br><br>
9292
<q-datetime
@@ -99,8 +99,8 @@
9999
@clear="donClear"
100100
v-model="date"
101101
popover
102-
placeholder="Color (RGBA)"
103-
:after="[ { icon: 'colorize', handler () { date = defaultDate } }]" />
102+
placeholder="Date"
103+
:after="[ { icon: 'today', handler () { date = defaultDate } }]" />
104104

105105
<q-datetime
106106
clearable
@@ -111,9 +111,9 @@
111111
@clear="donClear"
112112
:value="date"
113113
@change="donChange2"
114-
placeholder="Color (RGBA)"
114+
placeholder="Date"
115115
popover
116-
:after="[ { icon: 'colorize', handler () { date = defaultDate } }]" />
116+
:after="[ { icon: 'today', handler () { date = null; $nextTick(() => { date = defaultDate }) } }]" />
117117

118118
</div>
119119
</template>

i18n/tr.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ export default {
3333
noResults: 'Uyuşan kayıt bulunamadı',
3434
loading: 'Yükleniyor...',
3535
selectedRows: function (rows) {
36-
return rows + ' seçili kayıt.'
36+
return rows + ' seçili kayıt.'
3737
},
3838
rowsPerPage: 'Sayfa başına kayıt:',
3939
allRows: 'Tümü',

src/components/carousel/QCarousel.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ export default {
133133
: Promise.resolve()
134134
},
135135
goToSlide (slide, fromSwipe = false) {
136-
return new Promise((resolve, reject) => {
136+
return new Promise(resolve => {
137137
let
138138
direction = '',
139139
curSlide = this.slide,

src/mixins/model-toggle.js

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,7 @@ export default {
3333
return this.showPromise || Promise.resolve(evt)
3434
}
3535

36-
if (this.hidePromise) {
37-
this.hidePromiseReject()
38-
}
36+
this.hidePromise && this.hidePromiseReject()
3937

4038
this.showing = true
4139
if (this.value === false) {
@@ -74,9 +72,7 @@ export default {
7472
return this.hidePromise || Promise.resolve(evt)
7573
}
7674

77-
if (this.showPromise) {
78-
this.showPromiseReject()
79-
}
75+
this.showPromise && this.showPromiseReject()
8076

8177
this.showing = false
8278
if (this.value === true) {

0 commit comments

Comments
 (0)