anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

Fixed socke-emit-on

Browse source 
Merge branch 'master' into feature/socket-io-support

Fix conflicts:
	js/controllers/home.js
This commit is contained in:
Gustavo Cortez 2014-04-17 11:11:17 -03:00
commit 9fdb04e868
4 changed files with 21 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
js/controllers/header.js
View file

@ -1,7 +1,7 @@
'use strict';
angular.module('copay.header').controller('HeaderController',
function($scope, $rootScope, $location, walletFactory, Socket) {
function($scope, $rootScope, $location, walletFactory) {
$scope.menu = [{
'title': 'Home',
'icon': 'fi-home',
@ -40,8 +40,6 @@ angular.module('copay.header').controller('HeaderController',
if (w) {
w.disconnect();
delete $rootScope['wallet'];
var socket = Socket($scope);
socket.removeAllListeners();
$location.path('signin');
}
};