Skip to content

Commit 3a4da56

Browse files
pdanpdanrstoenescu
authored andcommitted
QInputFrame marginalia: don't focus and fix icon on disable (quasarframework#2515)
close quasarframework#2512
1 parent 5117282 commit 3a4da56

File tree

3 files changed

+1
-5
lines changed

3 files changed

+1
-5
lines changed

src/components/input-frame/QInputFrame.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ export default {
6262
this.$emit('click', e)
6363
},
6464
__onMouseDown (e) {
65-
this.$nextTick(() => this.$emit('focus', e))
65+
!this.disable && this.$nextTick(() => this.$emit('focus', e))
6666
},
6767
__additionalHidden (item, hasError, hasWarning, length) {
6868
if (item.condition !== void 0) {

src/components/input-frame/input-frame.ios.styl

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,8 +135,6 @@ $margin-top-box
135135
margin-left $input-control-margin
136136
&:hover
137137
opacity .7
138-
&.q-icon
139-
cursor pointer
140138

141139
.q-if-baseline
142140
line-height $input-control-size

src/components/input-frame/input-frame.mat.styl

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,8 +137,6 @@ $margin-top-box
137137
margin-left $input-control-margin
138138
&:hover
139139
opacity .7
140-
&.q-icon
141-
cursor pointer
142140

143141
.q-if-baseline
144142
line-height $input-control-size

0 commit comments

Comments
 (0)