fix(Deploy): inject Wallet to fix lazy-load race condition

blockchain · Jun 29, 2016 · da81220 · da81220
1 parent 0555807
commit da81220
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/assets/js/controllers/authorizeApprove.controller.js b/assets/js/controllers/authorizeApprove.controller.js
@@ -2,7 +2,9 @@ angular
   .module('walletApp')
   .controller('AuthorizeApproveCtrl', AuthorizeApproveCtrl);
 
-function AuthorizeApproveCtrl ($window, $scope, WalletTokenEndpoints, $stateParams, $state, Alerts, $translate, $rootScope, MyWalletHelpers) {
+// Wallet is injected to ensure it's lazy-load before this controller is
+// initialized. Otherwise $rootScope.rootUrl will be incorrect.
+function AuthorizeApproveCtrl ($window, $scope, WalletTokenEndpoints, $stateParams, $state, Alerts, $translate, $rootScope, MyWalletHelpers, Wallet) {
   $scope.success = false;
 
   const success = (res) => {

diff --git a/assets/js/controllers/resetTwoFactorToken.controller.js b/assets/js/controllers/resetTwoFactorToken.controller.js
@@ -2,7 +2,9 @@ angular
   .module('walletApp')
   .controller('ResetTwoFactorTokenCtrl', ResetTwoFactorTokenCtrl);
 
-function ResetTwoFactorTokenCtrl ($scope, WalletTokenEndpoints, $stateParams, $state, Alerts, $translate, $rootScope) {
+// Wallet is injected to ensure it's lazy-load before this controller is
+// initialized. Otherwise $rootScope.rootUrl will be incorrect.
+function ResetTwoFactorTokenCtrl ($scope, WalletTokenEndpoints, $stateParams, $state, Alerts, $translate, $rootScope, Wallet) {
   Alerts.clear();
 
   const success = (obj) => {