From f7631d2cea1605d4d00a97d38889005dec8f153f Mon Sep 17 00:00:00 2001 From: Szymon Nowak Date: Thu, 27 Aug 2015 21:23:47 +0200 Subject: [PATCH] More fixes... --- app/components/file-field.js | 23 ++++++++-------- app/components/ip-select.js | 28 ++++++++++++++++++++ app/components/modal-dialog.js | 7 +++-- app/helpers/is-equal.js | 5 ++++ app/index.html | 2 +- app/templates/about-room.hbs | 2 +- app/templates/about-you.hbs | 2 +- app/templates/application.hbs | 8 +++--- app/templates/components/ip-select.hbs | 7 +++++ app/templates/components/modal-dialog.hbs | 2 +- app/templates/components/peer-widget.hbs | 2 +- app/templates/components/popover-confirm.hbs | 2 +- app/templates/components/user-widget.hbs | 2 +- app/templates/index.hbs | 2 +- bower.json | 2 +- 15 files changed, 69 insertions(+), 27 deletions(-) create mode 100644 app/components/ip-select.js create mode 100644 app/helpers/is-equal.js create mode 100644 app/templates/components/ip-select.hbs diff --git a/app/components/file-field.js b/app/components/file-field.js index 784c77d..d553a2d 100644 --- a/app/components/file-field.js +++ b/app/components/file-field.js @@ -4,26 +4,25 @@ export default Ember.TextField.extend({ type: 'file', classNames: ['invisible'], - click: function (event) { + click(event) { event.stopPropagation(); }, - change: function (event) { - var input = event.target, - files = input.files, - file = files[0]; + change(event) { + const input = event.target; + const files = input.files; + const file = files[0]; this.sendAction('action', { file: file }); + this.reset() }, // Hackish way to reset file input when sender cancels file transfer, // so if sender wants later to send the same file again, // the 'change' event is triggered correctly. - fileDidChange: function () { - if (!this.get('file')) { - var field = this.$(); - field.wrap('
').closest('form').get(0).reset(); - field.unwrap(); - } - }.observes('file') + reset() { + const field = this.$(); + field.wrap('').closest('form').get(0).reset(); + field.unwrap(); + } }); diff --git a/app/components/ip-select.js b/app/components/ip-select.js new file mode 100644 index 0000000..bc49eef --- /dev/null +++ b/app/components/ip-select.js @@ -0,0 +1,28 @@ +import Ember from "ember"; + +export default Ember.Component.extend({ + content: null, + selectedValue: null, + + didInitAttrs() { + this._super(...arguments); + var content = this.get("content"); + + if (!content) { + this.set("content", []); + } + }, + + actions: { + change() { + const changeAction = this.get("action"); + const selectedEl = this.$("select")[0]; + const selectedIndex = selectedEl.selectedIndex; + const content = this.get("content"); + const selectedValue = content[selectedIndex]; + + this.set("selectedValue", selectedValue); + changeAction(selectedValue); + } + } +}); diff --git a/app/components/modal-dialog.js b/app/components/modal-dialog.js index 1899f43..be93680 100644 --- a/app/components/modal-dialog.js +++ b/app/components/modal-dialog.js @@ -2,8 +2,11 @@ import Ember from 'ember'; export default Ember.Component.extend({ actions: { - close: function() { + close() { + console.log("nop"); return this.sendAction(); - } + }, + + nop() {} } }); diff --git a/app/helpers/is-equal.js b/app/helpers/is-equal.js new file mode 100644 index 0000000..7f7a434 --- /dev/null +++ b/app/helpers/is-equal.js @@ -0,0 +1,5 @@ +import Ember from "ember"; + +export default Ember.Helper.helper(function([leftSide, rightSide]) { + return leftSide === rightSide; +}); diff --git a/app/index.html b/app/index.html index 8cb3fea..d7281f3 100644 --- a/app/index.html +++ b/app/index.html @@ -24,7 +24,7 @@ {{content-for 'body'}} - + diff --git a/app/templates/about-room.hbs b/app/templates/about-room.hbs index b806409..de01879 100644 --- a/app/templates/about-room.hbs +++ b/app/templates/about-room.hbs @@ -7,7 +7,7 @@

- {{room-url value=controller.currentUrl readonly="readonly" style="display: block; margin: auto;"}} + {{room-url value=currentUrl readonly="readonly" style="display: block; margin: auto;"}}

diff --git a/app/templates/about-you.hbs b/app/templates/about-you.hbs index a5ec437..c8fccaa 100644 --- a/app/templates/about-you.hbs +++ b/app/templates/about-you.hbs @@ -1,7 +1,7 @@ ShareDrop lets you share files with others. Other people will see you as -{{#if controller.hasCustomRoomName}} +{{#if hasCustomRoomName}} {{you.labelWithPublicIp}} {{else}} {{you.label}} diff --git a/app/templates/application.hbs b/app/templates/application.hbs index e631888..1abbecf 100644 --- a/app/templates/application.hbs +++ b/app/templates/application.hbs @@ -7,21 +7,21 @@

diff --git a/app/templates/components/ip-select.hbs b/app/templates/components/ip-select.hbs new file mode 100644 index 0000000..4e0f31f --- /dev/null +++ b/app/templates/components/ip-select.hbs @@ -0,0 +1,7 @@ + diff --git a/app/templates/components/modal-dialog.hbs b/app/templates/components/modal-dialog.hbs index 049fcc0..2f9a3cb 100644 --- a/app/templates/components/modal-dialog.hbs +++ b/app/templates/components/modal-dialog.hbs @@ -1,5 +1,5 @@
-
+
{{yield}}
diff --git a/app/templates/components/peer-widget.hbs b/app/templates/components/peer-widget.hbs index ba62c14..2770908 100644 --- a/app/templates/components/peer-widget.hbs +++ b/app/templates/components/peer-widget.hbs @@ -38,4 +38,4 @@
-{{file-field action="uploadFile" file=transfer.file}} +{{file-field action="uploadFile"}} diff --git a/app/templates/components/popover-confirm.hbs b/app/templates/components/popover-confirm.hbs index 30384ae..ae9e44b 100644 --- a/app/templates/components/popover-confirm.hbs +++ b/app/templates/components/popover-confirm.hbs @@ -1,6 +1,6 @@
- +

{{yield}}

diff --git a/app/templates/components/user-widget.hbs b/app/templates/components/user-widget.hbs index b22ff34..bb859cf 100644 --- a/app/templates/components/user-widget.hbs +++ b/app/templates/components/user-widget.hbs @@ -10,7 +10,7 @@ {{#if user.local_ip}} {{#if user.hasManyLocalIps}} - {{view Ember.Select content=localIps value=user.local_ip}} + {{ip-select content=localIps action=(action (mut user.local_ip))}} {{else}} {{user.local_ip}} {{/if}} diff --git a/app/templates/index.hbs b/app/templates/index.hbs index 2d1b18a..fea8900 100644 --- a/app/templates/index.hbs +++ b/app/templates/index.hbs @@ -1,6 +1,6 @@
- {{#each peer in model}} + {{#each model as |peer|}} {{peer-widget peer=peer hasCustomRoomName=hasCustomRoomName webrtc=webrtc}} {{/each}}
diff --git a/bower.json b/bower.json index dac0cb3..53de355 100644 --- a/bower.json +++ b/bower.json @@ -1,7 +1,7 @@ { "name": "share-drop", "dependencies": { - "ember": "1.13.8", + "ember": "1.13.9", "ember-cli-shims": "ember-cli/ember-cli-shims#0.0.3", "ember-cli-test-loader": "ember-cli-test-loader#0.1.3", "ember-load-initializers": "ember-cli/ember-load-initializers#0.1.5",