lib/hermes-bus.js: Now waits until afterHooks are resolved and then r…

…esolves the '.then' function of the trigger
jahnestacado · Apr 17, 2016 · ca70f19 · ca70f19
1 parent d618bc1
commit ca70f19
Showing 1 changed file with 4 additions and 7 deletions.
diff --git a/lib/hermes-bus.js b/lib/hermes-bus.js
@@ -65,7 +65,6 @@ HermesBus.prototype.subscribe =  function subscribe() {
 };
 
 HermesBus.prototype.unsubscribe =  function unsubscribe() {
-    var self = this;
     var subscribedObjectInfo = _utilityBelt.getSubscribedObjectInfo(arguments);
     var buslineName = subscribedObjectInfo.buslineName;
     var subscribedObject = subscribedObjectInfo.subscribedObject;
@@ -185,12 +184,10 @@ var _utilityBelt = {
                 if(eventHandlers[busline][eventName].isActive){
                     //on-event callback arguments to array
                     var args = Array.prototype.slice.call(arguments);
-                    executeBeforeHooks(args).then(function(){
-                        executeEvent(args).then(function(){
-                            defer.resolve();
-                            executeAfterHooks(args);
-                        });
-                    });
+                    executeBeforeHooks(args)
+                        .then(function(){return executeEvent(args)})
+                        .then(function(){return executeAfterHooks(args)})
+                        .then(function(){defer.resolve()});
                 } else{
                     defer.resolve();
                 }