Merge pull request #1076 from matiu/bug/02-open-wallet

Bug/02 open wallet

js/controllers/sidebar.js

@@ -1,77 +1,77 @@
 'use strict';
 
-angular.module('copayApp.controllers').controller('SidebarController', 
-    function($scope, $rootScope, $sce, $location, $http, notification, controllerUtils) {
+angular.module('copayApp.controllers').controller('SidebarController', function($scope, $rootScope, $sce, $location, $http, notification, controllerUtils) {
 
-    $scope.menu = [{
-      'title': 'Receive',
-      'icon': 'fi-arrow-left',
-      'link': 'receive'
-    }, {
-      'title': 'Send',
-      'icon': 'fi-arrow-right',
-      'link': 'send'
-    }, {
-      'title': 'History',
-      'icon': 'fi-clipboard-pencil',
-      'link': 'history'
-    }, {
-      'title': 'More',
-      'icon': 'fi-download',
-      'link': 'backup'
-    }];
+  $scope.menu = [{
+    'title': 'Receive',
+    'icon': 'fi-arrow-left',
+    'link': 'receive'
+  }, {
+    'title': 'Send',
+    'icon': 'fi-arrow-right',
+    'link': 'send'
+  }, {
+    'title': 'History',
+    'icon': 'fi-clipboard-pencil',
+    'link': 'history'
+  }, {
+    'title': 'More',
+    'icon': 'fi-download',
+    'link': 'backup'
+  }];
 
-    $scope.signout = function() {
-      logout();
-    };
+  $scope.signout = function() {
+    logout();
+  };
 
-    // Ensures a graceful disconnect
-    window.onbeforeunload = logout;
+  // Ensures a graceful disconnect
+  window.onbeforeunload = function() {
+    controllerUtils.logout();
+  };
 
-    $scope.$on('$destroy', function() {
-      window.onbeforeunload = undefined;
+  $scope.$on('$destroy', function() {
+    window.onbeforeunload = undefined;
+  });
+
+
+  $scope.refresh = function() {
+    var w = $rootScope.wallet;
+    w.connectToAll();
+    if ($rootScope.addrInfos.length > 0) {
+      controllerUtils.updateBalance(function() {
+        $rootScope.$digest();
+      });
+    }
+  };
+
+  $scope.isActive = function(item) {
+    return item.link && item.link == $location.path().split('/')[1];
+  };
+
+  function logout() {
+    var w = $rootScope.wallet;
+    if (w) {
+      w.disconnect();
+      controllerUtils.logout();
+    }
+  }
+
+  // ng-repeat defined number of times instead of repeating over array?
+  $scope.getNumber = function(num) {
+    return new Array(num);
+  }
+
+  // Init socket handlers (with no wallet yet)
+  controllerUtils.setSocketHandlers();
+
+  if ($rootScope.wallet) {
+    $scope.$on('$idleStart', function(a) {
+      notification.warning('Session will be closed', 'Your session is about to expire due to inactivity');
     });
 
-
-    $scope.refresh = function() {
-      var w = $rootScope.wallet;
-      w.connectToAll();
-      if ($rootScope.addrInfos.length > 0) {
-        controllerUtils.updateBalance(function() {
-          $rootScope.$digest();
-        });
-      }
-    };
-
-    $scope.isActive = function(item) {
-      return item.link && item.link == $location.path().split('/')[1];
-    };
-
-    function logout() {
-      var w = $rootScope.wallet;
-      if (w) {
-        w.disconnect();
-        controllerUtils.logout();
-      }
-    }
-
-    // ng-repeat defined number of times instead of repeating over array?
-    $scope.getNumber = function(num) {
-      return new Array(num);
-    }
-
-    // Init socket handlers (with no wallet yet)
-    controllerUtils.setSocketHandlers();
-
-    if ($rootScope.wallet) {
-      $scope.$on('$idleStart', function(a) {
-        notification.warning('Session will be closed', 'Your session is about to expire due to inactivity');
-      });
-
-      $scope.$on('$idleTimeout', function() {
-        $scope.signout();
-        notification.warning('Session closed', 'Session closed because a long time of inactivity');
-      });
-    }
-
-  });
+    $scope.$on('$idleTimeout', function() {
+      $scope.signout();
+      notification.warning('Session closed', 'Session closed because a long time of inactivity');
+    });
+  }
+});

js/controllers/warning.js

@@ -0,0 +1,28 @@
+'use strict';
+angular.module('copayApp.controllers').controller('WarningController', function($scope, $rootScope, $location, controllerUtils) {
+
+
+  $scope.checkLock = function() {
+    if (!$rootScope.tmp || !$rootScope.tmp.getLock()) {
+      controllerUtils.redirIfLogged();
+    }
+  };
+
+
+  $scope.signout = function() {
+    controllerUtils.logout();
+  };
+
+  $scope.ignoreLock = function() {
+    var w = $rootScope.tmp;
+    delete $rootScope['tmp'];
+
+    if (!w) {
+      $location.path('/');
+    } else {
+      w.ignoreLock = 1;
+      $scope.loading = true;
+      controllerUtils.startNetwork(w, $scope);
+    }
+  };
+});