Merge pull request #40 from launchdarkly/ag/ch15372/fix-history-listeners

[ch15372] Make sure we attach history listeners once we receive some goals

Author: apucacao

src/index.js

@@ -350,13 +350,33 @@ function initialize(env, user, options) {
     });
   }
 
+  function refreshGoalTracker() {
+    if (goalTracker) {
+      goalTracker.dispose();
+    }
+    if (goals && goals.length) {
+      goalTracker = GoalTracker(goals, sendGoalEvent);
+    }
+  }
+
+  function attachHistoryListeners() {
+    if (!!(window.history && history.pushState)) {
+      window.removeEventListener('popstate',refreshGoalTracker);
+      window.addEventListener('popstate', refreshGoalTracker);
+    } else {
+      window.removeEventListener('hashchange', refreshGoalTracker);
+      window.addEventListener('hashchange', refreshGoalTracker);
+    }
+  }
+
   requestor.fetchGoals(function(err, g) {
     if (err) {
       emitter.maybeReportError(new errors.LDUnexpectedResponseError('Error fetching goals: ' + err.message ? err.message : err));
     }
     if (g && g.length > 0) {
       goals = g;
       goalTracker = GoalTracker(goals, sendGoalEvent);
+      attachHistoryListeners();
     }
   });
 
@@ -379,23 +399,6 @@ function initialize(env, user, options) {
     events.flush(ident.getUser(), true);
   });
 
-  function refreshGoalTracker() {
-    if (goalTracker) {
-      goalTracker.dispose();
-    }
-    if (goals && goals.length) {
-      goalTracker = GoalTracker(goals, sendGoalEvent);
-    }
-  }
-
-  if (goals && goals.length > 0) {
-    if (!!(window.history && history.pushState)) {
-      window.addEventListener('popstate', refreshGoalTracker);
-    } else {
-      window.addEventListener('hashchange', refreshGoalTracker);
-    }
-  }
-
   window.addEventListener('message', handleMessage);
 
   var readyPromise = new Promise(function(resolve) {