From e384312e2cdb9d2d820691f07db80defbfeac6ed Mon Sep 17 00:00:00 2001 From: Robin Linus Date: Thu, 31 Dec 2015 02:23:39 +0100 Subject: [PATCH] Rename app.p2p to app.conn --- app/elements/buddy-finder/buddy-avatar.html | 14 +++++++------- app/elements/buddy-finder/buddy-finder.html | 2 +- app/elements/file-sharing/file-receiver.html | 14 +++++++------- app/scripts/app.js | 2 +- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/app/elements/buddy-finder/buddy-avatar.html b/app/elements/buddy-finder/buddy-avatar.html index ec4ab6e..086f38f 100644 --- a/app/elements/buddy-finder/buddy-avatar.html +++ b/app/elements/buddy-finder/buddy-avatar.html @@ -89,37 +89,37 @@ }, attached: function() { this.async(function() { - app.p2p.addEventListener('file-offered', function(e) { + app.conn.addEventListener('file-offered', function(e) { if (e.detail.to === this.contact.peerId) { this.status = 'Waiting to accept...'; } }.bind(this), false); - app.p2p.addEventListener('upload-started', function(e) { + app.conn.addEventListener('upload-started', function(e) { if (e.detail.to === this.contact.peerId) { this.status = 'Uploading...'; } }.bind(this), false); - app.p2p.addEventListener('download-started', function(e) { + app.conn.addEventListener('download-started', function(e) { if (e.detail.from === this.contact.peerId) { this.status = 'Downloading...'; } }.bind(this), false); - app.p2p.addEventListener('upload-complete', function(e) { + app.conn.addEventListener('upload-complete', function(e) { if (e.detail.from === this.contact.peerId) { this.status = ''; } }.bind(this), false); - app.p2p.addEventListener('download-complete', function(e) { + app.conn.addEventListener('download-complete', function(e) { if (e.detail.from === this.contact.peerId) { this.status = ''; } }.bind(this), false); - app.p2p.addEventListener('file-declined', function(e) { + app.conn.addEventListener('file-declined', function(e) { if (e.detail.from === this.contact.peerId) { this.status = ''; } }.bind(this), false); - app.p2p.addEventListener('upload-error', function(e) { + app.conn.addEventListener('upload-error', function(e) { this.status = ''; }.bind(this), false); }, 200); diff --git a/app/elements/buddy-finder/buddy-finder.html b/app/elements/buddy-finder/buddy-finder.html index 6165f34..47b0412 100644 --- a/app/elements/buddy-finder/buddy-finder.html +++ b/app/elements/buddy-finder/buddy-finder.html @@ -88,7 +88,7 @@ _fileSelected: function(e) { var peerId = e.model.item.peerId; var file = e.detail; - app.p2p.sendFile(peerId, file); + app.conn.sendFile(peerId, file); } }); diff --git a/app/elements/file-sharing/file-receiver.html b/app/elements/file-sharing/file-receiver.html index e28d317..8d6c7a1 100644 --- a/app/elements/file-sharing/file-receiver.html +++ b/app/elements/file-sharing/file-receiver.html @@ -48,20 +48,20 @@ is: 'file-receiver', attached: function() { this.async(function() { - app.p2p.addEventListener('file-offer', function(e) { + app.conn.addEventListener('file-offer', function(e) { this.file = e.detail; this.$.dialog.open(); }.bind(this), false); - app.p2p.addEventListener('file-received', function(e) { + app.conn.addEventListener('file-received', function(e) { this._fileReceived(e.detail); }.bind(this), false); - app.p2p.addEventListener('file-declined', function(e) { + app.conn.addEventListener('file-declined', function(e) { app.displayToast('User declined file ' + e.detail.name); }.bind(this), false); - app.p2p.addEventListener('upload-complete', function(e) { + app.conn.addEventListener('upload-complete', function(e) { app.displayToast('User received file ' + e.detail.name); }.bind(this), false); - app.p2p.addEventListener('upload-error', function(e) { + app.conn.addEventListener('upload-error', function(e) { app.displayToast('The other device did not respond. Please try again.'); }.bind(this), false); }, 200); @@ -70,10 +70,10 @@ this.downloadURI(file); }, _decline: function() { - app.p2p.decline(this.file); + app.conn.decline(this.file); }, _accept: function() { - app.p2p.accept(this.file); + app.conn.accept(this.file); }, downloadURI: function(file) { var link = document.createElement('a'); diff --git a/app/scripts/app.js b/app/scripts/app.js index 75db89c..627fd5b 100644 --- a/app/scripts/app.js +++ b/app/scripts/app.js @@ -31,7 +31,7 @@ // have resolved and content has been stamped to the page app.addEventListener('dom-change', function() { console.log('Our app is ready to rock!'); - app.p2p = document.querySelector('connection-wrapper'); + app.conn = document.querySelector('connection-wrapper'); }); // See https://github.com/Polymer/polymer/issues/1381