Skip to content

Commit 6ad4b05

Browse files
committed
feature: @cloudcmd/modal: click -> mousedown
1 parent a8b874a commit 6ad4b05

2 files changed

Lines changed: 35 additions & 2 deletions

File tree

lib/modal.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ const innerHTML = `
1818
`;
1919

2020
const addEvent = currify((el, fn, query, name) => query(el).addEventListener(name, fn));
21-
const addAllEvents = (el, fn, query, names) => names.map(addEvent(el, fn, query));
21+
const _addAllEvents = (el, fn, query, names) => names.map(addEvent(el, fn, query));
2222

2323
const {isArray} = Array;
2424

@@ -38,6 +38,7 @@ export const open = (inner, options = {}) => {
3838
query = _query,
3939
showTitle = _showTitle,
4040
parseImages = _parseImages,
41+
addAllEvents = _addAllEvents,
4142
} = options;
4243

4344
if (query('main'))
@@ -64,7 +65,7 @@ export const open = (inner, options = {}) => {
6465
dataName: 'modal-main',
6566
});
6667

67-
addAllEvents('main', onMainClick(onOverlayClick), query, ['click', 'contextmenu']);
68+
addAllEvents('main', onMainClick(onOverlayClick), query, ['mousedown', 'contextmenu']);
6869

6970
query('close').addEventListener('click', close);
7071

lib/modal.spec.js

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,38 @@ test('modal: open: main exist', (t) => {
2828
t.end();
2929
});
3030

31+
test('modal: open: addAllEvents', (t) => {
32+
const addEventListener = stub();
33+
const appendChild = stub();
34+
35+
const el = {
36+
addEventListener,
37+
appendChild,
38+
};
39+
40+
const query = (name) => {
41+
if (name !== 'main')
42+
return el;
43+
};
44+
45+
const addAllEvents = stub();
46+
47+
open({}, {
48+
query,
49+
addAllEvents,
50+
});
51+
52+
const args = [
53+
'main',
54+
stub(),
55+
query,
56+
['mousedown', 'contextmenu'],
57+
];
58+
59+
t.calledWith(addAllEvents, args);
60+
t.end();
61+
});
62+
3163
test('modal: open: beforeShow', (t) => {
3264
const beforeShow = stub();
3365
const el = create();

0 commit comments

Comments
 (0)