Skip to content

Commit 9f1dc24

Browse files
committed
Use once: true for related listeners #6573
1 parent 213ff8f commit 9f1dc24

7 files changed

Lines changed: 20 additions & 34 deletions

File tree

src/calendar/view/SettingsContainer.mjs

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -159,16 +159,14 @@ class SettingsContainer extends Container {
159159
onCardIndexChange(data) {
160160
let me = this,
161161
container = data.item,
162-
mainContainer = me.getMainContainer(),
163-
listenerId;
162+
mainContainer = me.getMainContainer();
164163

165164
if (mainContainer) {
166165
if (Neo.isFunction(container.createContent) && container.items.length < 1) {
167166
if (Neo.typeOf(mainContainer[`${container.flag}Component`]) !== 'NeoInstance') {
168-
listenerId = mainContainer.on('cardLoaded', () => {
169-
mainContainer.un('cardLoaded', listenerId);
167+
mainContainer.on('cardLoaded', () => {
170168
me.timeout(30).then(() => {container.createContent()})
171-
})
169+
}, me, {once: true})
172170
} else {
173171
me.timeout(30).then(() => {container.createContent()})
174172
}

src/component/Base.mjs

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2662,8 +2662,7 @@ class Component extends Base {
26622662
*/
26632663
updateVdom(resolve, reject) {
26642664
let me = this,
2665-
{app, mounted, parentId, vnode} = me,
2666-
listenerId;
2665+
{app, mounted, parentId, vnode} = me;
26672666

26682667
if (me.isVdomUpdating || me.silentVdomUpdate) {
26692668
resolve && me.resolveUpdateCache.push(resolve);
@@ -2672,13 +2671,11 @@ class Component extends Base {
26722671
if (!mounted && me.isConstructed && !me.hasRenderingListener && app?.rendering === true) {
26732672
me.hasRenderingListener = true;
26742673

2675-
listenerId = app.on('mounted', () => {
2676-
app.un('mounted', listenerId);
2677-
2674+
app.on('mounted', () => {
26782675
me.timeout(50).then(() => {
26792676
me.vnode && me.updateVdom(resolve, reject)
26802677
})
2681-
})
2678+
}, me, {once: true})
26822679
} else {
26832680
if (resolve && (!mounted || !vnode)) {
26842681
me.resolveUpdateCache.push(resolve)

src/component/Helix.mjs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -546,12 +546,11 @@ class Helix extends Component {
546546
angle, item, matrixItems, transformStyle, vdomItem, c, s, x, y, z;
547547

548548
if (!me.mounted) {
549-
const listenerId = me.on('mounted', () => {
550-
me.un('mounted', listenerId);
549+
me.on('mounted', () => {
551550
me.timeout(100).then(() => {
552551
me.createItems(startIndex)
553552
})
554-
})
553+
}, me, {once: true})
555554
} else {
556555
for (; i < len; i++) {
557556
item = me.store.items[i];

src/controller/Component.mjs

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,18 +45,16 @@ class Component extends Base {
4545
super.construct(config);
4646

4747
let me = this,
48-
{component} = me,
49-
listenerId;
48+
{component} = me;
5049

5150
me.references = {};
5251

5352
if (component.isConstructed) {
5453
me.onComponentConstructed()
5554
} else {
56-
listenerId = component.on('constructed', () => {
57-
component.un('constructed', listenerId);
55+
component.on('constructed', () => {
5856
me.onComponentConstructed()
59-
})
57+
}, me, {once: true})
6058
}
6159
}
6260

src/plugin/Base.mjs

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,16 +38,14 @@ class Plugin extends Base {
3838
super.construct(config);
3939

4040
let me = this,
41-
{owner} = me,
42-
listenerId;
41+
{owner} = me;
4342

4443
if (owner.isConstructed) {
4544
me.onOwnerConstructed()
4645
} else {
47-
listenerId = owner.on('constructed', () => {
48-
owner.un('constructed', listenerId);
46+
owner.on('constructed', () => {
4947
me.onOwnerConstructed()
50-
})
48+
}, me, {once: true})
5149
}
5250

5351
if (owner.mounted) {

src/selection/HelixModel.mjs

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -223,22 +223,19 @@ class HelixModel extends Model {
223223
isSelected = toggleSelection === false ? false : me.items.includes(itemId),
224224
items = me.items,
225225
oldItems = [...items],
226-
deltas = [],
227-
listenerId;
226+
deltas = [];
228227

229228
// a select() call can happen before the view is registered
230229
if (!view) {
231230
return;
232231
}
233232

234233
if (!view.mounted) {
235-
listenerId = view.on('mounted', () => {
236-
view.un('mounted', listenerId);
237-
234+
view.on('mounted', () => {
238235
me.timeout(300).then(() => {
239236
me.select(itemId, toggleSelection)
240237
})
241-
})
238+
}, me, {once: true})
242239
}
243240

244241
if (me.singleSelect) {

src/tab/Container.mjs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -524,7 +524,7 @@ class Container extends BaseContainer {
524524
i = 0,
525525
len = tabBar.items.length,
526526
index = -1,
527-
card, listenerId;
527+
card;
528528

529529
for (; i < len; i++) {
530530
if (tabBar.items[i].id === buttonId) {
@@ -537,10 +537,9 @@ class Container extends BaseContainer {
537537
card = cardContainer.items[index];
538538

539539
if (me.vnode && !card.mounted) {
540-
listenerId = card.on('mounted', () => {
541-
card.un('mounted', listenerId);
540+
card.on('mounted', () => {
542541
me.activeIndex = index
543-
})
542+
}, me, {once: true})
544543
} else {
545544
me.activeIndex = index
546545
}

0 commit comments

Comments
 (0)