Skip to content

Commit bd2bb01

Browse files
committed
Updates
1 parent f60191d commit bd2bb01

File tree

2 files changed

+7
-16
lines changed

2 files changed

+7
-16
lines changed

dev/components/components/scroll-area.vue

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,5 @@
11
<template>
22
<div class="layout-padding">
3-
<!--
4-
This is for fast tests.
5-
Use this page but don't add it into your commits (leave it outside
6-
of your commit).
7-
8-
For some test that you think it should be persistent,
9-
make a new *.vue file here or in another folder under /dev/components.
10-
-->
113
<div style="height: 300px"></div>
124

135
<q-scroll-area style="width: 400px; height: 500px;" class="bg-yellow">
@@ -27,8 +19,7 @@
2719
export default {
2820
data () {
2921
return {
30-
number: 10,
31-
height: 1
22+
number: 10
3223
}
3324
}
3425
}

src/utils/event.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ export function rightClick (e) {
66
e = getEvent(e)
77

88
if (e.which) {
9-
return e.which === 3 // eslint-disable-line
9+
return e.which === 3
1010
}
1111
if (e.button) {
12-
return e.button === 2 // eslint-disable-line
12+
return e.button === 2
1313
}
1414

1515
return false
@@ -68,8 +68,8 @@ const
6868

6969
export function getMouseWheelDistance (e) {
7070
var
71-
sX = 0, sY = 0, // spinX, spinY
72-
pX = 0, pY = 0 // pixelX, pixelY
71+
sX = 0, sY = 0, // spinX, spinY
72+
pX = 0, pY = 0 // pixelX, pixelY
7373

7474
// Legacy
7575
if ('detail' in e) { sY = e.detail }
@@ -90,11 +90,11 @@ export function getMouseWheelDistance (e) {
9090
if ('deltaX' in e) { pX = e.deltaX }
9191

9292
if ((pX || pY) && e.deltaMode) {
93-
if (e.deltaMode === 1) { // delta in LINE units
93+
if (e.deltaMode === 1) { // delta in LINE units
9494
pX *= LINE_HEIGHT
9595
pY *= LINE_HEIGHT
9696
}
97-
else { // delta in PAGE units
97+
else { // delta in PAGE units
9898
pX *= PAGE_HEIGHT
9999
pY *= PAGE_HEIGHT
100100
}

0 commit comments

Comments
 (0)