Merge pull request #962 from zupzup/master

ryanflorence · ryanflorence · commit 06ed4f1019e2 · 2015-03-21T11:03:36.000-06:00
[fixed] actionType missing from HashLocation redirect
diff --git a/modules/locations/HashLocation.js b/modules/locations/HashLocation.js
@@ -36,8 +36,9 @@ function onHashChange() {
     // changed. It was probably caused by the user clicking the Back
     // button, but may have also been the Forward button or manual
     // manipulation. So just guess 'pop'.
-    notifyChange(_actionType || LocationActions.POP);
+    var curActionType = _actionType;
     _actionType = null;
+    notifyChange(curActionType || LocationActions.POP);
   }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -36,8 +36,9 @@ function onHashChange() {`
`36`	`36`	`// changed. It was probably caused by the user clicking the Back`
`37`	`37`	`// button, but may have also been the Forward button or manual`
`38`	`38`	`// manipulation. So just guess 'pop'.`
`39`		`- notifyChange(_actionType \|\| LocationActions.POP);`
	`39`	`+ var curActionType = _actionType;`
`40`	`40`	`_actionType = null;`
	`41`	`+ notifyChange(curActionType \|\| LocationActions.POP);`
`41`	`42`	`}`
`42`	`43`	`}`
`43`	`44`