Skip to content

Commit 5e45483

Browse files
pdanpdanrstoenescu
authored andcommitted
QSlider|QRange: fixes for ring (quasarframework#2564)
1 parent 9e7fd8e commit 5e45483

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

src/components/range/QRange.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,7 @@ export default {
291291
edge ? 'handle-at-minimum' : null,
292292
{ dragging: this.dragging }
293293
],
294-
attrs: { tabindex: this.editable ? 0 : -1 },
294+
attrs: { tabindex: this.$q.platform.is.desktop ? (this.editable ? 0 : -1) : void 0 },
295295
on: {
296296
keydown: ev => this.__onKeyDown(ev, lower),
297297
keyup: ev => this.__onKeyUp(ev, lower)

src/components/slider/QSlider.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ export default {
147147
dragging: this.dragging,
148148
'handle-at-minimum': !this.fillHandleAlways && this.model === this.min
149149
},
150-
attrs: { tabindex: this.editable ? 0 : -1 },
150+
attrs: { tabindex: this.$q.platform.is.desktop ? (this.editable ? 0 : -1) : void 0 },
151151
on: {
152152
keydown: this.__onKeyDown,
153153
keyup: this.__onKeyUp

src/components/slider/slider.ios.styl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,8 @@ $slider-label-transform = translateX(-50%) translateY(-139%) scale(1)
8181
transition all .2s ease-in
8282
background currentColor
8383

84-
.q-slider:not(.disabled)
85-
.q-slider-handle:focus, &:focus, &:hover
84+
.q-slider:not(.disabled):not(.readonly)
85+
.q-slider-handle.dragging, .q-slider-handle:focus, body.desktop &:hover
8686
.q-slider-ring
8787
opacity .4
8888
transform scale(1)

src/components/slider/slider.mat.styl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ $slider-label-transform = translateX(-50%) translateY(-139%) scale(1)
9494
background currentColor
9595

9696
.q-slider:not(.disabled):not(.readonly)
97-
.q-slider-handle:focus, &:focus, &:hover
97+
.q-slider-handle.dragging, .q-slider-handle:focus, body.desktop &:hover
9898
.q-slider-ring
9999
opacity .4
100100
transform scale(1)

0 commit comments

Comments
 (0)