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

various style and wording fixes

Browse source
This commit is contained in:
Manuel Araoz 2014-04-29 18:20:44 -03:00
commit a9eb53e90f
4 changed files with 13 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
js/services/controllerUtils.js
View file

@ -12,6 +12,11 @@ angular.module('copay.controllerUtils')
return trusted;
};
$rootScope.getWalletDisplay = function() {
var w = $rootScope.wallet;
return w && (w.name || w.id);
};
root.logout = function() {
console.log('### DELETING WALLET'); //TODO
$rootScope.wallet = null;

3
js/services/video.js
View file

@ -7,6 +7,7 @@ var Video = function() {
this.mediaConnections = {};
this.localStream = null;
this.onlineSound = new Audio('../../sound/online.wav');
};
Video.prototype.setOwnPeer = function(peer, wallet, cb) {
@ -50,10 +51,12 @@ Video.prototype.callPeer = function(peerID, cb) {
};
Video.prototype._addCall = function(mediaConnection, cb) {
var self = this;
var peerID = mediaConnection.peer;
// Wait for stream on the call, then set peer video display
mediaConnection.on('stream', function(stream) {
self.onlineSound.play();
cb(null, peerID, URL.createObjectURL(stream));
});