Skip to content

Commit c599e62

Browse files
authored
fix: Reverted code of Fire-52 (#73)
1 parent 7e43a5a commit c599e62

File tree

1 file changed

+11
-12
lines changed

1 file changed

+11
-12
lines changed

src/js/shared/Events/index.mjs

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -143,21 +143,20 @@ const doListen = function(module, event, callback, context, once, internal=false
143143

144144
events.forEach(event => {
145145
const key = module + '.' + event + (hasContext ? `.${contextKey}` : '')
146+
146147
if (Object.values(listeners.get(key)).length === 0) {
147148
const { id, promise } = Transport.listen(module, 'on' + event[0].toUpperCase() + event.substring(1), { listen: true })
148149
keys[id] = key
149150
promises.push(promise)
150-
const setter = internal ? listeners.setInternal : listeners.set
151-
promise.then( id => {
152-
if (wildcard) {
153-
setter(key, ''+listenerId, value => callback(event, value))
154-
}
155-
else {
156-
setter(key, ''+listenerId, callback)
157-
}
158-
}).catch( error => {
159-
reject(error)
160-
})
151+
}
152+
153+
const setter = internal ? listeners.setInternal : listeners.set
154+
155+
if (wildcard) {
156+
setter(key, ''+listenerId, value => callback(event, value))
157+
}
158+
else {
159+
setter(key, ''+listenerId, callback)
161160
}
162161
})
163162

@@ -184,7 +183,7 @@ const doListen = function(module, event, callback, context, once, internal=false
184183
else {
185184
resolve(listenerId)
186185
}
187-
186+
188187
return p
189188
}
190189
}

0 commit comments

Comments
 (0)