Merge pull request #173 from kelbongoo/master

Fix triggers loading bug
kadirahq · Jun 22, 2015 · fc45803 · fc45803
2 parents eedfd7a + 0179f2f
commit fc45803
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/client/router.js b/client/router.js
@@ -452,15 +452,19 @@ Router.prototype._initTriggersAPI = function() {
   this.triggers = {
     enter: function(triggers, filter) {
       triggers = Triggers.applyFilters(triggers, filter);
-      _.extend(self._triggersEnter, triggers);
+      if(triggers.length) {
+        self._triggersEnter = self._triggersEnter.concat(triggers);
+      }
     },
 
     exit: function(triggers, filter) {
       triggers = Triggers.applyFilters(triggers, filter);
-      _.extend(self._triggersExit, triggers);
+      if(triggers.length) {
+        self._triggersExit = self._triggersExit.concat(triggers);
+      }
     }
   };
 };
 
 Router.prototype._page = page;
-Router.prototype._qs = qs;
+Router.prototype._qs = qs;