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

Merge pull request #868 from cmgustavo/bug/video-intermediate-page

Browse source 
Fixed video while waiting for copayer
This commit is contained in:
Matias Alejo Garcia 2014-07-08 15:44:25 -03:00
commit 137e9ca108
1 changed files with 19 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

20
js/controllers/header.js
View file

@ -1,7 +1,7 @@
'use strict'; 'use strict';
angular.module('copayApp.controllers').controller('HeaderController', angular.module('copayApp.controllers').controller('HeaderController',
function($scope, $rootScope, $location, notification, $http, controllerUtils, backupService) { function($scope, $rootScope, $location, notification, $http, $sce, controllerUtils, backupService) {
$scope.menu = [{ $scope.menu = [{
'title': 'Addresses', 'title': 'Addresses',
'icon': 'fi-address-book', 'icon': 'fi-address-book',
@ -93,4 +93,22 @@ angular.module('copayApp.controllers').controller('HeaderController',
backupService.download(w); backupService.download(w);
}; };
$scope.getVideoURL = function(copayer) {
if (config.disableVideo) return;
var vi = $rootScope.videoInfo[copayer]
if (!vi) return;
if ($rootScope.wallet.getOnlinePeerIDs().indexOf(copayer) === -1) {
// peer disconnected, remove his video
delete $rootScope.videoInfo[copayer]
return;
}
var encoded = vi.url;
var url = decodeURI(encoded);
var trusted = $sce.trustAsResourceUrl(url);
return trusted;
};
}); });