From abb153cd8902d6835f5bd6dfdcdcd450e8300248 Mon Sep 17 00:00:00 2001 From: Szymon Nowak Date: Sat, 1 Feb 2014 14:47:11 +0100 Subject: [PATCH] Add User view similar to Peer view, but without all file handling crap. --- app/index.html | 1 + app/scripts/app/templates/index.hbs | 2 +- app/scripts/app/views/peer_view.js | 6 ------ app/scripts/app/views/user_view.js | 6 ++++++ 4 files changed, 8 insertions(+), 7 deletions(-) create mode 100644 app/scripts/app/views/user_view.js diff --git a/app/index.html b/app/index.html index f498929..d10749a 100644 --- a/app/index.html +++ b/app/index.html @@ -40,6 +40,7 @@ + diff --git a/app/scripts/app/templates/index.hbs b/app/scripts/app/templates/index.hbs index 16049bb..9b9d1c3 100644 --- a/app/scripts/app/templates/index.hbs +++ b/app/scripts/app/templates/index.hbs @@ -6,6 +6,6 @@ {{#if user.uuid}}
- {{render "peer" user}} + {{render "user" user}}
{{/if}} diff --git a/app/scripts/app/views/peer_view.js b/app/scripts/app/views/peer_view.js index 6afc454..4d5faca 100644 --- a/app/scripts/app/views/peer_view.js +++ b/app/scripts/app/views/peer_view.js @@ -8,9 +8,6 @@ FileDrop.PeerView = Ember.View.extend(Ember.ViewTargetActionSupport, { var user = this.get('controller.controllers.index.user'), peer = this.get('controller.model'); - // Can't send files to yourself. - if (user.get('uuid') === peer.get('uuid')) return; - // Can't send files to disconnected user. if (!peer.get('isConnected')) return; @@ -35,9 +32,6 @@ FileDrop.PeerView = Ember.View.extend(Ember.ViewTargetActionSupport, { files = dt.files, file = files[0]; - // Can't send files to yourself. - if (user.get('uuid') === peer.get('uuid')) return; - // Can't send files to disconnected user. if (!peer.get('isConnected')) return; diff --git a/app/scripts/app/views/user_view.js b/app/scripts/app/views/user_view.js new file mode 100644 index 0000000..e9056f3 --- /dev/null +++ b/app/scripts/app/views/user_view.js @@ -0,0 +1,6 @@ +FileDrop.UserView = Ember.View.extend({ + templateName: 'peer', + isConnected: Ember.computed.alias('controller.model.isConnected'), + classNames: ['peer'], + classNameBindings: ['isConnected:connected:disconnected'] +});