From 6659b938b5329208191c2f2b77422b5b49c45a6d Mon Sep 17 00:00:00 2001
From: Matias Pando <mpando@bitpay.com>
Date: Fri, 5 Dec 2014 11:56:26 -0300
Subject: [PATCH] Simple fixes

---
 js/controllers/head.js            | 18 ++++++++++--------
 js/controllers/unsupported.js     |  7 -------
 js/models/Compatibility.js        |  9 ---------
 js/services/applicationService.js |  2 --
 4 files changed, 10 insertions(+), 26 deletions(-)

diff --git a/js/controllers/head.js b/js/controllers/head.js
index e5244e867..4d32b7331 100644
--- a/js/controllers/head.js
+++ b/js/controllers/head.js
@@ -4,6 +4,8 @@ angular.module('copayApp.controllers').controller('HeadController', function($sc
   $scope.username = $rootScope.iden.getName();
   $scope.hoverMenu = false;
 
+  var isChromeApp = typeof window !== "undefined" && window.chrome && chrome.runtime && chrome.runtime.id;
+
   $scope.hoverIn = function() {
     this.hoverMenu = true;
   };
@@ -31,15 +33,15 @@ angular.module('copayApp.controllers').controller('HeadController', function($sc
   };
 
 
-  //mpando  restore after solve some chrome app error
-  // Ensures a graceful disconnect
-  // window.onbeforeunload = function() {
-  //   $scope.signout();
-  // };
+  //Ensures a graceful disconnect
+  window.onbeforeunload = function() {
+    $scope.signout();
+  };
 
-  // $scope.$on('$destroy', function() {
-  //   window.onbeforeunload = undefined;
-  // });
+  $scope.$on('$destroy', function() {
+    if (isChromeApp) return;
+    window.onbeforeunload = undefined;
+  });
 
   $scope.init = function() {
     if (!$rootScope.wallet) return;
diff --git a/js/controllers/unsupported.js b/js/controllers/unsupported.js
index 3f6e000b7..2617a81df 100644
--- a/js/controllers/unsupported.js
+++ b/js/controllers/unsupported.js
@@ -2,13 +2,6 @@
 
 angular.module('copayApp.controllers').controller('UnsupportedController',
   function($scope, $location) {
-
-    var localStorage;
-    if (window.chrome && chrome.runtime && chrome.runtime.id) {
-      localStorage = chrome.storage.local;
-    } else {
-      localStorage = window.localStorage;
-    }
     if (localStorage && localStorage.length > 0) {
       $location.path('/');
     }
diff --git a/js/models/Compatibility.js b/js/models/Compatibility.js
index 7a7c733d3..bab4f5b57 100644
--- a/js/models/Compatibility.js
+++ b/js/models/Compatibility.js
@@ -76,15 +76,6 @@ Compatibility._decrypt = function(base64, passphrase) {
 Compatibility._read = function(k, passphrase, cb) {
   preconditions.checkArgument(cb);
 
-  var localStorage;
-  if (window.chrome && chrome.runtime && chrome.runtime.id) {
-    console.log('Is a chrome app!..Compatibility.js');
-    localStorage = chrome.storage.local;
-  } else {
-    console.log('Is web!');
-    localStorage = window.localStorage;
-  }
-
   var ret = localStorage.getItem(k);
   if (!ret) return cb(null);
   var ret = self._decrypt(ret, passphrase);
diff --git a/js/services/applicationService.js b/js/services/applicationService.js
index 6b7f581a1..4c3bade19 100644
--- a/js/services/applicationService.js
+++ b/js/services/applicationService.js
@@ -6,8 +6,6 @@ angular.module('copayApp.services')
 
     root.restart = function() {
 
-      console.log('RESTART');
-
       // Go home reloading the application
       var hashIndex = window.location.href.indexOf('#!/');
       if (isChromeApp) {