diff --git a/css/main.css b/css/main.css index 6ab5b4587..85da6dc5f 100644 --- a/css/main.css +++ b/css/main.css @@ -277,3 +277,9 @@ button.secondary:hover { background-color: #FFDF00 !important;} border: 2px red solid; } +.video-small { + width: 100px; + height: 100px; + border: 1px solid black; +} + diff --git a/img/satoshi.gif b/img/satoshi.gif new file mode 100644 index 000000000..0e5292df5 Binary files /dev/null and b/img/satoshi.gif differ diff --git a/index.html b/index.html index 5da820527..14af669ea 100644 --- a/index.html +++ b/index.html @@ -210,14 +210,13 @@

{{$root.wallet.publicKeyRing.requiredCopayers}} copayers needed for signing transactions -

@@ -511,6 +510,7 @@ + diff --git a/js/app.js b/js/app.js index 37da74393..f2b50d521 100644 --- a/js/app.js +++ b/js/app.js @@ -15,6 +15,7 @@ var copayApp = window.copayApp = angular.module('copay',[ 'copay.controllerUtils', 'copay.setup', 'copay.directives' + 'copay.video' ]); angular.module('copay.header', []); @@ -28,4 +29,5 @@ angular.module('copay.signin', []); angular.module('copay.setup', []); angular.module('copay.socket', []); angular.module('copay.directives', []); +angular.module('copay.video', []); diff --git a/js/models/core/Wallet.js b/js/models/core/Wallet.js index 95d0c0f98..291c7d36c 100644 --- a/js/models/core/Wallet.js +++ b/js/models/core/Wallet.js @@ -128,6 +128,7 @@ Wallet.prototype._handleNetworkChange = function(newCopayerId) { this.log('#### Setting new PEER:', newCopayerId); this.sendWalletId(newCopayerId); } + this.emit('peer', newPeerId); this.emit('refresh'); }; @@ -175,8 +176,8 @@ Wallet.prototype.netStart = function() { signingKeyHex: self.privateKey.getSigningKey(), }; - net.start(startOpts, function() { - self.emit('created'); + net.start(function() { + self.emit('created', net.getPeer()); for (var i=0; i