Skip to content

Commit 4c4f4c0

Browse files
committed
feat: Remove legacy utils.event code
1 parent 897cc87 commit 4c4f4c0

File tree

5 files changed

+15
-26
lines changed

5 files changed

+15
-26
lines changed

src/components/context-menu/ContextMenuMobile.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ export default {
2020
__touchStartHandler (evt) {
2121
this.target.classList.add('non-selectable')
2222
this.touchTimer = setTimeout(() => {
23-
stopAndPrevent(evt)
23+
evt && stopAndPrevent(evt)
2424
setTimeout(() => {
2525
this.__cleanup()
2626
this.show(evt)

src/components/radio/QRadio.js

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,8 @@ export default {
2020
if (this.disable || this.readonly) {
2121
return
2222
}
23-
if (evt) {
24-
stopAndPrevent(evt)
25-
}
26-
if (blur) {
27-
this.$el.blur()
28-
}
23+
evt && stopAndPrevent(evt)
24+
blur && this.$el.blur()
2925

3026
if (!this.isTrue) {
3127
this.__update(this.val)

src/mixins/checkbox.js

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,8 @@ export default {
3535
if (this.disable || this.readonly) {
3636
return
3737
}
38-
if (evt) {
39-
stopAndPrevent(evt)
40-
}
41-
if (blur) {
42-
this.$el.blur()
43-
}
38+
evt && stopAndPrevent(evt)
39+
blur && this.$el.blur()
4440

4541
let val
4642

src/mixins/input-frame.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ export default {
8383
if (!this.editable) {
8484
return
8585
}
86-
stopAndPrevent(evt)
86+
evt && stopAndPrevent(evt)
8787
const val = this.clearValue
8888
if (this.__setModel) {
8989
this.__setModel(val, true)

src/utils/event.js

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -25,23 +25,23 @@ Object.defineProperty(listenOpts, 'passive', {
2525
}
2626
})
2727

28-
export function leftClick (e = window.event) {
28+
export function leftClick (e) {
2929
return e.button === 0
3030
}
3131

32-
export function middleClick (e = window.event) {
32+
export function middleClick (e) {
3333
return e.button === 1
3434
}
3535

36-
export function rightClick (e = window.event) {
36+
export function rightClick (e) {
3737
return e.button === 2
3838
}
3939

40-
export function getEventKey (e = window.event) {
40+
export function getEventKey (e) {
4141
return e.which || e.keyCode
4242
}
4343

44-
export function position (e = window.event) {
44+
export function position (e) {
4545
let posx, posy
4646

4747
if (e.touches && e.touches[0]) {
@@ -71,7 +71,7 @@ export function position (e = window.event) {
7171
}
7272
}
7373

74-
export function targetElement (e = window.event) {
74+
export function targetElement (e) {
7575
let target
7676

7777
if (e.target) {
@@ -89,7 +89,7 @@ export function targetElement (e = window.event) {
8989
return target
9090
}
9191

92-
export function getEventPath (e = window.event) {
92+
export function getEventPath (e) {
9393
if (e.path) {
9494
return e.path
9595
}
@@ -119,7 +119,7 @@ const
119119
LINE_HEIGHT = 40,
120120
PAGE_HEIGHT = 800
121121

122-
export function getMouseWheelDistance (e = window.event) {
122+
export function getMouseWheelDistance (e) {
123123
var
124124
sX = 0, sY = 0, // spinX, spinY
125125
pX = 0, pY = 0 // pixelX, pixelY
@@ -171,10 +171,7 @@ export function getMouseWheelDistance (e = window.event) {
171171
}
172172
}
173173

174-
export function stopAndPrevent (e = window.event) {
175-
if (!e) {
176-
return
177-
}
174+
export function stopAndPrevent (e) {
178175
e.preventDefault()
179176
e.stopPropagation()
180177
}

0 commit comments

Comments
 (0)