fix: Reverted code of Fire-52 (#73)

rdkcentral · Nov 4, 2022 · c599e62 · c599e62
1 parent 7e43a5a
commit c599e62
Showing 1 changed file with 11 additions and 12 deletions.
diff --git a/src/js/shared/Events/index.mjs b/src/js/shared/Events/index.mjs
@@ -143,21 +143,20 @@ const doListen = function(module, event, callback, context, once, internal=false
 
     events.forEach(event => {
       const key = module + '.' + event + (hasContext ? `.${contextKey}`  : '')
+
       if (Object.values(listeners.get(key)).length === 0) {
         const { id, promise } = Transport.listen(module, 'on' + event[0].toUpperCase() + event.substring(1), { listen: true })
         keys[id] = key
         promises.push(promise)
-        const setter = internal ? listeners.setInternal : listeners.set
-        promise.then( id => {
-          if (wildcard) {
-            setter(key, ''+listenerId, value => callback(event, value))
-          }
-          else {
-            setter(key, ''+listenerId, callback)
-          }
-        }).catch( error => {
-          reject(error)
-        })
+      }
+
+      const setter = internal ? listeners.setInternal : listeners.set
+
+      if (wildcard) {
+        setter(key, ''+listenerId, value => callback(event, value))
+      }
+      else {
+        setter(key, ''+listenerId, callback)
       }
     })
 
@@ -184,7 +183,7 @@ const doListen = function(module, event, callback, context, once, internal=false
     else {
       resolve(listenerId)
     }
-    
+
     return p
   }
 }